Browse Source

alix1c: fix keyboard support, add SERIO symbols and cleanup aranym/lemote stuff

Waldemar Brodkorb 7 years ago
parent
commit
f4f44ca5da

+ 1 - 0
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
 

+ 22 - 0
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

+ 0 - 3
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

+ 0 - 4
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