allow to choose drivers for generic support, reported by Oliver

9 files changed, 85 insertions, 33 deletions

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 2765d0980..85d110fbc 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -14,12 +14,10 @@ source target/linux/config/Config.in.graphics
 source target/linux/config/Config.in.input
 source target/linux/config/Config.in.pcmcia
 source target/linux/config/Config.in.network
-source target/linux/config/Config.in.nfc
 source target/linux/config/Config.in.netfilter
 source target/linux/config/Config.in.audio
 source target/linux/config/Config.in.multimedia
 source target/linux/config/Config.in.crypto
-source target/linux/config/Config.in.bluetooth
 source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.mips
 source target/linux/config/Config.in.xtensa
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 33a7716c7..25f832834 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -2,7 +2,11 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Audio devices support"
-depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND || ADK_TARGET_QEMU
+depends on ADK_TARGET_WITH_PCI \
+	|| ADK_TARGET_WITH_USB \
+	|| ADK_TARGET_WITH_SOUND \
+	|| ADK_TARGET_QEMU \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_SOUND
 	tristate
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 4d7487d37..e4a0ffb03 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -5,7 +5,8 @@ config ADK_KERNEL_BLOCK
 	bool
 
 menu "Block devices support"
-depends on ADK_TARGET_WITH_BLOCK
+depends on ADK_TARGET_WITH_BLOCK \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_LBDAF
 	bool
@@ -110,7 +111,11 @@ config ADK_KERNEL_MMC_BCM2835_SDHOST
 	bool
 
 menu "SATA/PATA devices support"
-depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
+depends on ADK_TARGET_WITH_PATA \
+	|| ADK_TARGET_WITH_SATA \
+	|| ADK_TARGET_QEMU \
+	|| ADK_TARGET_VBOX \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_PATA_RB532
 	tristate "CF disk driver for Mikrotik RB532"
@@ -137,7 +142,8 @@ config ADK_KERNEL_PATA_AMD
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX \
-		 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+		|| ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
+		|| ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
@@ -165,8 +171,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_X86 || \
-		   ADK_TARGET_SYSTEM_GENERIC_X86_64 || \
+		   ADK_TARGET_GENERIC || \
 		   ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default y if ADK_TARGET_VBOX
@@ -186,8 +191,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_X86 || \
-		   ADK_TARGET_SYSTEM_GENERIC_X86_64 || \
+		   ADK_TARGET_GENERIC || \
 		   ADK_TARGET_SYSTEM_QEMU_MIPS || \
 		   ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
 		   ADK_TARGET_SYSTEM_QEMU_X86 || \
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 52f708818..42d220302 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -2,7 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Bluetooth support and drivers"
-depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_SDIO
+depends on ADK_TARGET_WITH_USB \
+	|| ADK_TARGET_WITH_MINIPCI \
+	|| ADK_TARGET_WITH_SDIO \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_BT_BREDR
 	bool
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 0d08c641f..abac3f940 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -2,7 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Ethernet network devices support"
-depends on ADK_TARGET_WITH_NETDEVICE
+depends on ADK_TARGET_WITH_NETDEVICE \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_NET_CADENCE
 	bool
@@ -229,7 +230,8 @@ config ADK_KERNEL_NE2K_PCI
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
 	select ADK_KERNEL_NET_VENDOR_8390
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	default n
 	help
 	  NE2000 PCI driver
@@ -238,7 +240,8 @@ config ADK_KERNEL_PCNET32
 	tristate "AMD PCNet32 PCI driver"
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  AMD PCnet32 driver
 
@@ -247,7 +250,9 @@ config ADK_KERNEL_8139CP
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_REALTEK
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SH
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_SYSTEM_QEMU_SH \
+		|| ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_QEMU_SH
 	default n
 	help
@@ -258,7 +263,8 @@ config ADK_KERNEL_8139TOO
 	select ADK_KERNEL_NET_VENDOR_REALTEK
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
@@ -269,7 +275,8 @@ config ADK_KERNEL_E100
 	select ADK_KERNEL_NET_VENDOR_INTEL
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  Intel(R) PRO/100+ cards kernel support
 
@@ -286,7 +293,8 @@ config ADK_KERNEL_E1000
 		ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO || \
 		ADK_TARGET_SYSTEM_QEMU_ALPHA || \
 		ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
-		ADK_TARGET_VBOX
+		ADK_TARGET_VBOX || \
+		ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_X86
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
@@ -341,7 +349,8 @@ config ADK_KERNEL_SKY2
 	tristate "Marvell Yukon SKY2 driver"
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_VENDOR_MARVELL
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	default n
 	help
 	  Marvell Yukon SKY2 driver
@@ -353,7 +362,9 @@ config ADK_KERNEL_R8169
 	select ADK_KERNEL_MII
 	select ADK_KERNEL_FW_LOADER
 	select ADK_PACKAGE_REALTEK_FIRMWARE_WIRED
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default n
 
@@ -392,7 +403,8 @@ config ADK_KERNEL_ATL1
 	select ADK_KERNEL_NET_VENDOR_ATHEROS
 	select ADK_KERNEL_MII
 	select ADK_KERNEL_CRC32
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	default n
 	help
 	  This driver supports the Atheros/Attansic L1 gigabit ethernet adapter.
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index e2e38e235..f467bd165 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -2,7 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Graphic devices support"
-depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
+depends on ADK_TARGET_WITH_VGA \
+	|| ADK_TARGET_QEMU \
+	|| ADK_TARGET_VBOX \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_VT
 	bool
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index f76a8c69d..6191b02a3 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -1,5 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+menu "Network device support"
 source "target/linux/config/Config.in.ethernet"
 source "target/linux/config/Config.in.wireless"
+source "target/linux/config/Config.in.bluetooth"
+source "target/linux/config/Config.in.nfc"
+endmenu
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 028682f1a..e924b7bb9 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -2,7 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Network support"
-depends on ADK_TARGET_WITH_NET
+depends on ADK_TARGET_WITH_NET \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_NETDEVICES
 	bool
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index f07f1c36b..55fb9145f 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -114,7 +114,15 @@ config ADK_DEBUG_MAC80211
 	select ADK_KERNEL_DEBUG_FS
 
 menu "Wireless network card support"
-depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB || ADK_TARGET_WITH_SDIO
+depends on ADK_TARGET_WITH_CARDBUS \
+	|| ADK_TARGET_WITH_PCMCIA \
+	|| ADK_TARGET_WITH_MINIPCI \
+	|| ADK_TARGET_WITH_PCI \
+	|| ADK_TARGET_WITH_USB \
+	|| ADK_TARGET_WITH_SSB \
+	|| ADK_TARGET_WITH_AHB \
+	|| ADK_TARGET_WITH_SDIO \
+	|| ADK_TARGET_GENERIC
 
 config ADK_KERNEL_BRCMFMAC_SDIO
 	bool
@@ -153,7 +161,10 @@ config ADK_KERNEL_ATH5K
 	select ADK_KERNEL_ATH_CARDS
 	select ADK_KERNEL_ATH_COMMON
 	select ADK_KERNEL_MAC80211
-	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB
+	depends on ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_WITH_AHB \
+		|| ADK_TARGET_GENERIC
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_FON_FON2100
 	default n
@@ -181,7 +192,9 @@ config ADK_KERNEL_B43
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_MAC80211
 	select ADK_PACKAGE_B43_FIRMWARE
-	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
+	depends on ADK_TARGET_WITH_SSB \
+		|| ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  Driver for Broadcom B43xx wireless chips
 
@@ -214,7 +227,8 @@ config ADK_KERNEL_RTL8187
 	tristate "Realtek RTL8187/RTL8187B wireless driver"
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_EEPROM_93CX6
-	depends on ADK_TARGET_WITH_USB
+	depends on ADK_TARGET_WITH_USB \
+		|| ADK_TARGET_GENERIC
 	help
 	  Driver for Realtek RTL8187/RTL8187B wireless chips
 
@@ -226,7 +240,8 @@ config ADK_KERNEL_P54_USB
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_CRC_CCITT
 	select ADK_PACKAGE_P54_FIRMWARE
-	depends on ADK_TARGET_WITH_USB
+	depends on ADK_TARGET_WITH_USB \
+		|| ADK_TARGET_GENERIC
 	help
 	  Driver for Prism54 USB adaptors
 
@@ -240,7 +255,8 @@ config ADK_KERNEL_RT2800USB
 	select ADK_KERNEL_RT2X00_LIB_USB
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_CRC_CCITT
-	depends on ADK_TARGET_WITH_USB
+	depends on ADK_TARGET_WITH_USB \
+		|| ADK_TARGET_GENERIC
 	help
 	  Driver for Ralink RT2800 USB
 
@@ -250,7 +266,8 @@ config ADK_KERNEL_RTL8192CU
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_FW_LOADER
 	select ADK_PACKAGE_REALTEK_FIRMWARE
-	depends on ADK_TARGET_WITH_USB
+	depends on ADK_TARGET_WITH_USB \
+		|| ADK_TARGET_GENERIC
 	help
 	  Driver for Realtek RTL8192CU USB
 
@@ -260,7 +277,9 @@ config ADK_KERNEL_RT2400PCI
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  This adds support for rt2400 wireless chipset family.
 	  Supported chips: RT2460.
@@ -271,7 +290,9 @@ config ADK_KERNEL_RT2500PCI
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  This adds support for rt2500 wireless chipset family.
 	  Supported chips: RT2560.
@@ -284,7 +305,9 @@ config ADK_KERNEL_RT61PCI
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_CRC_ITU_T
 	select ADK_PACKAGE_RT61_FIRMWARE
-	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_MINIPCI \
+		|| ADK_TARGET_WITH_PCI \
+		|| ADK_TARGET_GENERIC
 	help
 	  This adds support for rt2501 wireless chipset family.
 	  Supported chips: RT2561, RT2561S & RT2661.