Browse Source

generic-pc: better handling of ATA/serial drivers

Waldemar Brodkorb 8 years ago
parent
commit
ff3e6ae831

+ 2 - 0
target/linux/config/Config.in.block

@@ -165,6 +165,7 @@ config ADK_KERNEL_SATA_AHCI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_PCENGINES_APU || \
+		   ADK_TARGET_SYSTEM_GENERIC_PC || \
 		   ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default y if ADK_TARGET_VBOX
@@ -184,6 +185,7 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_IBM_X40 || \
+		ADK_TARGET_SYSTEM_GENERIC_PC || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
 		ADK_TARGET_SYSTEM_QEMU_X86 || \

+ 2 - 0
target/linux/config/Config.in.serial

@@ -54,6 +54,7 @@ config ADK_KERNEL_SERIAL_8250
 		|| ADK_TARGET_SYSTEM_OR1K_SIM \
 		|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
 		|| ADK_TARGET_SYSTEM_IBM_X40 \
+		|| ADK_TARGET_SYSTEM_GENERIC_PC \
 		|| ADK_TARGET_SYSTEM_MIKROTIK_RB532 \
 		|| ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
@@ -63,6 +64,7 @@ config ADK_KERNEL_SERIAL_8250
 	default y if ADK_TARGET_SYSTEM_OR1K_SIM
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
 	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_GENERIC_PC
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	default n

+ 0 - 6
target/x86/kernel/generic-pc

@@ -1,8 +1,2 @@
 CONFIG_X86=y
 CONFIG_X86_32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_ATA=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_ATA_PIIX=y

+ 2 - 0
target/x86/systems/generic-pc

@@ -9,6 +9,8 @@ config ADK_TARGET_SYSTEM_GENERIC_PC
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
+	select ADK_TARGET_WITH_PATA
+	select ADK_TARGET_WITH_SATA
 	select ADK_PACKAGE_GRUB
 	help
 	  Example config for generic i686 based PC.