diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-29 05:27:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-29 05:27:11 +0200 |
| commit | f4f44ca5da8cf53507db5610f1ad947a76a6d7b6 (patch) | |
| tree | fc094f853ae48d768c1e5158bd80cce56c42e9f8 | |
| parent | 7c774e7509c05fbfd9726e378fff0bbeda35f75e (diff) | |
alix1c: fix keyboard support, add SERIO symbols and cleanup aranym/lemote stuff
| -rw-r--r-- | target/config/Config.in.subsystem | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 22 | ||||
| -rw-r--r-- | target/m68k/kernel/aranym-m68k | 3 | ||||
| -rw-r--r-- | target/mips64/kernel/lemote-yeelong | 4 |
4 files changed, 23 insertions, 7 deletions
diff --git a/target/config/Config.in.subsystem b/target/config/Config.in.subsystem index 322612ae5..ce43f391c 100644 --- a/target/config/Config.in.subsystem +++ b/target/config/Config.in.subsystem @@ -12,6 +12,7 @@ config ADK_TARGET_MODEL_PCENGINES_ALIX1C bool "PCengines Alix 1C" select ADK_TARGET_WITH_SOUND select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT endchoice diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index c91865849..5560e22a5 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -8,6 +8,26 @@ depends on ADK_TARGET_WITH_USB \ || ADK_TARGET_QEMU \ || ADK_TARGET_VBOX +config ADK_KERNEL_SERIO + bool + select ADK_KERNEL_SERIO_SERPORT + select ADK_KERNEL_SERIO_LIBPS2 + select ADK_KERNEL_SERIO_I8042 if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + select ADK_KERNEL_SERIO_I8042 if ADK_TARGET_MODEL_PCENGINES_ALIX1C + default y if ADK_TARGET_SYSTEM_ARANYM_M68K + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C + default n + +config ADK_KERNEL_SERIO_SERPORT + bool + +config ADK_KERNEL_SERIO_LIBPS2 + bool + +config ADK_KERNEL_SERIO_I8042 + bool + config ADK_KERNEL_INPUT bool default y if ADK_TARGET_VBOX @@ -146,6 +166,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_VBOX default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C default n config ADK_KERNEL_MOUSE_PS2 @@ -157,6 +178,7 @@ config ADK_KERNEL_MOUSE_PS2 default y if ADK_TARGET_VBOX default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C default n config ADK_KERNEL_INPUT_EVDEV diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k index ac513fdc6..fb084e4b9 100644 --- a/target/m68k/kernel/aranym-m68k +++ b/target/m68k/kernel/aranym-m68k @@ -6,6 +6,3 @@ CONFIG_FPU=y CONFIG_ATARI=y CONFIG_NATFEAT=y CONFIG_NFETH=y -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y diff --git a/target/mips64/kernel/lemote-yeelong b/target/mips64/kernel/lemote-yeelong index 84a672ee9..c314edb75 100644 --- a/target/mips64/kernel/lemote-yeelong +++ b/target/mips64/kernel/lemote-yeelong @@ -12,8 +12,4 @@ CONFIG_MIPS32_COMPAT=y CONFIG_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y CONFIG_CMDLINE_BOOL=y |