diff options
author | Salvatore Bonaccorso <carnil@debian.org> | 2020-11-08 12:37:20 +0000 |
---|---|---|
committer | Salvatore Bonaccorso <carnil@debian.org> | 2020-11-08 12:37:20 +0000 |
commit | 9b2a53570d62cba87665354d1d1025b1e138772e (patch) | |
tree | 1ee3ec2b86c6925d1b05940cf040c0ea166f99a4 | |
parent | a29db2f0a153f7e72bba959515abb90ab4b861b1 (diff) | |
parent | 5928d556778103f4a8c6a5217c31ac4c4b00bdd0 (diff) | |
download | kernel_replicant_linux-9b2a53570d62cba87665354d1d1025b1e138772e.tar.gz kernel_replicant_linux-9b2a53570d62cba87665354d1d1025b1e138772e.tar.bz2 kernel_replicant_linux-9b2a53570d62cba87665354d1d1025b1e138772e.zip |
Merge branch 'sh4' into 'sid'
[sh4] Update kernel configuration for sh7785lcr flavor
See merge request kernel-team/linux!283
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/config/sh4/config.sh7785lcr | 41 |
2 files changed, 35 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 6e1f8f924c04..6de580cbab27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1079,6 +1079,14 @@ linux (5.9.6-1) UNRELEASED; urgency=medium [ Ben Hutchings ] * [rt] Rebase seqlock patches on top of 5.9.6 + [ John Paul Adrian Glaubitz ] + * [sh4] Update kernel configuration for sh7785lcr flavor + - Compile CONFIG_HID, CONFIG_USB_HID, CONFIG_INPUT_EVDEV and + CONFIG_R8169 as modules to reduce kernel image size + - Disable CONFIG_KEYBOARD_ATKBD, CONFIG_MOUSE_PS2*, CONFIG_SERIO* + and CONFIG_PARPORT_1284 as the SH-7785LCR board does not support + PC-style keyboards, serial and parallel ports and mice + -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Sun, 18 Oct 2020 20:07:46 +0100 linux (5.9.1-1) unstable; urgency=medium diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr index 63fb73ead2b9..02c32bf97bee 100644 --- a/debian/config/sh4/config.sh7785lcr +++ b/debian/config/sh4/config.sh7785lcr @@ -57,12 +57,12 @@ CONFIG_DMADEVICES=y ## ## file: drivers/hid/Kconfig ## -CONFIG_HID=y +CONFIG_HID=m ## ## file: drivers/hid/usbhid/Kconfig ## -CONFIG_USB_HID=y +CONFIG_USB_HID=m ## ## file: drivers/i2c/Kconfig @@ -89,31 +89,39 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVDEV=m ## ## file: drivers/input/keyboard/Kconfig ## CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_ATKBD=n ## ## file: drivers/input/mouse/Kconfig ## CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2=n +CONFIG_MOUSE_PS2_ALPS=n +CONFIG_MOUSE_PS2_BYD=n +CONFIG_MOUSE_PS2_LOGIPS2PP=n +CONFIG_MOUSE_PS2_SYNAPTICS=n +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=n +CONFIG_MOUSE_PS2_CYPRESS=n +CONFIG_MOUSE_PS2_LIFEBOOK=n +CONFIG_MOUSE_PS2_TRACKPOINT=n +CONFIG_MOUSE_PS2_ELANTECH=n +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=n +CONFIG_MOUSE_PS2_SENTELIC=n +CONFIG_MOUSE_PS2_FOCALTECH=n ## ## file: drivers/input/serio/Kconfig ## -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO=n +CONFIG_SERIO_I8042=n +CONFIG_SERIO_SERPORT=n +CONFIG_SERIO_LIBPS2=n ## ## file: drivers/mfd/Kconfig @@ -150,7 +158,12 @@ CONFIG_NETDEVICES=y ## ## file: drivers/net/ethernet/realtek/Kconfig ## -CONFIG_R8169=y +CONFIG_R8169=m + +## +## file: drivers/net/parport/Kconfig +## +CONFIG_PARPORT_1284=n ## ## file: drivers/pci/Kconfig |