From 68bb17312be33ae09255737dde26a93663cfc2ba Mon Sep 17 00:00:00 2001 From: waldemar brodkorb Date: Wed, 20 Jan 2010 21:31:08 +0100 Subject: fix allmodconfig for foxboard --- target/linux/config/Config.in.aufs | 3 +-- target/linux/config/Config.in.block | 9 +++++++-- target/linux/config/Config.in.bluetooth | 2 ++ target/linux/config/Config.in.fs | 4 +++- target/linux/config/Config.in.input | 3 ++- target/linux/config/Config.in.isdn | 1 + target/linux/config/Config.in.multimedia | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs index fb63ac931..7956f31c1 100644 --- a/target/linux/config/Config.in.aufs +++ b/target/linux/config/Config.in.aufs @@ -1,8 +1,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS prompt "Aufs (Advanced multi layered unification filesystem) support" + depends on !ADK_LINUX_CRIS_FOXBOARD tristate - select ADK_KERNEL_EXPERIMENTAL - select FWRT_KPACKAGE_KMOD_EXPORTFS if ADK_KERNEL_AUFS_EXPORT help Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index d9c997b8d..cf5e7a270 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -46,6 +46,7 @@ config ADK_KERNEL_DM_CRYPT config ADK_KERNEL_BLK_DEV_DM select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD boolean default n @@ -214,12 +215,14 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR config ADK_KERNEL_BLK_DEV_MD tristate select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD prompt "kmod-md........................... RAID support" tristate depends on !ADK_KERNEL_BLK_DEV_MD + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_MD help @@ -254,7 +257,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456 config ADK_KPACKAGE_KMOD_BLK_DEV_DM prompt "kmod-dm........................... Device Mapper support" select ADK_KERNEL_MD - depends on !ADK_KERNEL_BLK_DEV_DM + depends on !(ADK_KERNEL_BLK_DEV_DM || ADK_LINUX_CRIS_FOXBOARD) tristate help Device-mapper is a low level volume manager. It works by allowing @@ -266,8 +269,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt................... Crypt target support" + depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD) select ADK_KPACKAGE_KMOD_BLK_DEV_DM - depends on !ADK_KERNEL_DM_CRYPT select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO select ADK_KPACKAGE_KMOD_CRYPTO_CBC @@ -285,6 +288,7 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot................ Snapshot target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to take writable snapshots of a device. @@ -292,6 +296,7 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................. Mirror target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to mirror logical volumes, also diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 5f4dca821..748a6b280 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -68,6 +68,8 @@ config ADK_KPACKAGE_KMOD_BT_HIDP prompt "kmod-bluetooth-hidp............... HIDP protocol support" tristate default n + depends on !ADK_LINUX_CRIS_FOXBOARD + select ADK_KERNEL_INPUT select ADK_KERNEL_HID depends on ADK_KPACKAGE_KMOD_BT depends on ADK_KPACKAGE_KMOD_BT_L2CAP diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 3721c7584..8541065f0 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -70,12 +70,14 @@ config ADK_KPACKAGE_KMOD_EXT3_FS config ADK_KERNEL_EXT4_FS boolean select ADK_KERNEL_CRC16 + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_EXT4_FS prompt "kmod-fs-ext4...................... EXT4 filesystem support" tristate - depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KPACKAGE_KMOD_CRC16 default n help diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index e281290a2..c320c43a7 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -14,7 +14,7 @@ config ADK_KERNEL_HID_SUPPORT default n config ADK_KERNEL_HID - tristate + bool select ADK_KERNEL_HID_SUPPORT default n @@ -25,6 +25,7 @@ config ADK_KPACKAGE_KMOD_USB_HID select ADK_KERNEL_HID select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD diff --git a/target/linux/config/Config.in.isdn b/target/linux/config/Config.in.isdn index 596160e54..e876fd5ef 100644 --- a/target/linux/config/Config.in.isdn +++ b/target/linux/config/Config.in.isdn @@ -38,6 +38,7 @@ config ADK_KPACKAGE_KMOD_ISDN_CAPI tristate select ADK_KERNEL_ISDN_CAPI_CAPI20 select ADK_KERNEL_ISDN + depends on !ADK_LINUX_CRIS_FOXBOARD default n help Kernel support for CAPI 2.0 and /dev/capi20 diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 6c0e91517..b24ac2fa3 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -1,5 +1,5 @@ menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD config ADK_KERNEL_SND_TIMER boolean -- cgit v1.2.3