From b4d61f0ee3485f89dd8560227c833dc948523ecf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Nov 2010 21:09:58 +0100 Subject: consolidate x86/x86_64 support use hardware profiles, instead of extra target dirs. fix dependencies. --- target/linux/config/Config.in.block | 36 +-------------------------------- target/linux/config/Config.in.kvm | 2 +- target/linux/config/Config.in.netdevice | 4 +++- target/linux/config/Config.in.usb | 3 +++ 4 files changed, 8 insertions(+), 37 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index d8b32c716..0558f536a 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -59,7 +59,7 @@ config ADK_KERNEL_SATA_AHCI select ADK_KERNEL_BLOCK select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD - depends on ADK_LINUX_X86_64_SHUTTLE + default y if ADK_HARDWARE_SHUTTLE default n config ADK_KPACKAGE_KMOD_SATA_AHCI @@ -69,44 +69,10 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI - depends on ADK_LINUX_X86_64_SHUTTLE default n help Enables support for AHCI Serial ATA. -#config ADK_KERNEL_IDE -# boolean -# default n -# -#config ADK_KPACKAGE_KMOD_BLK_DEV_IDE -# prompt "kmod-ide.......................... IDE support" -# tristate -# select ADK_KERNEL_BLOCK -# select ADK_KERNEL_IDE -# default n -# help -# If you say Y here, you will use the full-featured IDE driver to -# control up to ten ATA/IDE interfaces, each being able to serve a -# "master" and a "slave" device, for a total of up to twenty ATA/IDE -# disk/cdrom/tape/floppy drives. -# -# Useful information about large (>540 MB) IDE disks, multiple -# interfaces, what to do if ATA/IDE devices are not automatically -# detected, sound card ATA/IDE ports, module support, and other -# topics, is contained in . For detailed -# information about hard drives, consult the Disk-HOWTO and the -# Multi-Disk-HOWTO, available from -# . -# -# To fine-tune ATA/IDE drive/interface parameters for improved -# performance, look for the hdparm package at -# . -# -# To compile this driver as a module, choose M here and read -# . The module will be called ide-mod. -# Do not compile this driver as a module if your root file system (the -# one containing the directory /) is located on an IDE device. - config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP prompt "kmod-loop......................... Loop mount support" tristate diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 4fc515e0e..20aaa4f92 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -1,5 +1,5 @@ menu "Virtualization" -depends on ADK_LINUX_X86_64_SHUTTLE +depends on ADK_LINUX_X86_64 || ADK_LINUX_X86 config ADK_KERNEL_VIRTUALIZATION bool diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index ca71d554c..c3a42da09 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -83,6 +83,7 @@ config ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 tristate + default y if ADK_HARDWARE_IBMX40 default n help This driver supports Intel(R) PRO/1000 gigabit ethernet family of @@ -190,6 +191,7 @@ config ADK_KPACKAGE_KMOD_MAC80211 select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 select ADK_KERNEL_CRC32 + default y if ADK_HARDWARE_IBMX40 default n config ADK_DEBUG_MAC80211 @@ -209,6 +211,7 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KERNEL_ATH_COMMON depends on ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI + default y if ADK_HARDWARE_IBMX40 default n help Driver for Atheros 5xxx/24xx cards. @@ -309,5 +312,4 @@ config ADK_KERNEL_RT2X00_DEBUG help endmenu - endmenu diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index d9a8020b0..9f25aed81 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -31,6 +31,7 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB) select ADK_KERNEL_NLS @@ -85,6 +86,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on !ADK_LINUX_CRIS_FOXBOARD depends on ADK_KPACKAGE_KMOD_USB @@ -133,6 +135,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_HARDWARE_ALIX1C default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 + default y if ADK_HARDWARE_IBMX40 default n depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER -- cgit v1.2.3