diff options
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.aufs | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 12 | ||||
-rw-r--r-- | target/linux/config/Config.in.bluetooth | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 19 | ||||
-rw-r--r-- | target/linux/config/Config.in.fsnet | 12 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.isdn | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 26 | ||||
-rw-r--r-- | target/linux/config/Config.in.misc | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.multimedia | 2 |
10 files changed, 31 insertions, 50 deletions
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 96f211e0a..d8b32c716 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 @@ -175,6 +176,7 @@ config ADK_KPACKAGE_KMOD_SCSI select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_SATA_AHCI tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or @@ -190,8 +192,8 @@ config ADK_KPACKAGE_KMOD_SCSI config ADK_KPACKAGE_KMOD_BLK_DEV_SD prompt "kmod-scsi-disk.................... SCSI disk support" + select ADK_KPACKAGE_KMOD_SCSI depends on !ADK_KERNEL_BLK_DEV_SD - depends on ADK_KPACKAGE_KMOD_SCSI tristate help If you want to use SCSI hard disks, Fibre Channel disks, @@ -215,12 +217,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 @@ -255,7 +259,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 @@ -267,8 +271,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 @@ -286,6 +290,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. @@ -293,6 +298,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..dc417c146 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -14,6 +14,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET config ADK_KPACKAGE_KMOD_EXPORTFS tristate + depends on !ADK_KERNEL_EXPORTFS default n help @@ -70,12 +71,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 @@ -174,20 +177,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS for complete details. This implementation is on-disk compatible with the IRIX version of XFS. -#config ADK_KPACKAGE_KMOD_YAFFS_FS -# prompt "kmod-fs-yaffs..................... YAFFS1/2 filesystem support" -# tristate -# default n -# select ADK_KERNEL_YAFFS_FS -# select ADK_KERNEL_YAFFS_YAFFS1 -# select ADK_KERNEL_YAFFS_YAFFS2 -# select ADK_KERNEL_YAFFS_AUTO_YAFFS2 -# select ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM -# help -# Support for the YAFFS1 and YAFFS2 filesystems for the rb532 NAND -# internal flash (for example). Say 'yes' here if you want to build -# an initramfs for the Routerboard with access to internal flash. -# config ADK_KPACKAGE_KMOD_FUSE_FS prompt "kmod-fs-fuse...................... Filesystem in Userspace support" tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 71236c47f..1db9d72b6 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -49,6 +49,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS default n select ADK_KERNEL_NFS_V3 select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_LOCKD depends on !ADK_TARGET_ROOTFS_NFSROOT help If you are connected to some other (usually local) Unix computer @@ -92,9 +93,10 @@ config ADK_KPACKAGE_KMOD_NFSD prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" tristate default n - select ADK_KPACKAGE_KMOD_EXPORTFS + select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 - depends on ADK_KPACKAGE_KMOD_NFS_FS + select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_LOCKD help If you want your Linux box to act as an NFS *server*, so that other computers on your local network which support NFS can access certain @@ -126,14 +128,20 @@ config ADK_KERNEL_NFSD_V4 help NFSv4 with Kerberos authentication. +config ADK_KPACKAGE_KMOD_LOCKD + tristate + default n + config ADK_KPACKAGE_KMOD_SUNRPC tristate default n config ADK_KPACKAGE_KMOD_SUNRPC_GSS tristate + select ADK_KPACKAGE_KMOD_SUNRPC default n config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5 tristate + select ADK_KPACKAGE_KMOD_SUNRPC_GSS default n 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.kernel b/target/linux/config/Config.in.kernel index e61eb46df..abc7364df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -87,29 +87,3 @@ config ADK_KERNEL_NFS_COMMON config ADK_KERNEL_SUNRPC boolean default n - -#config ADK_KERNEL_YAFFS_FS -# tristate -# default n - -#config ADK_KERNEL_YAFFS_YAFFS1 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_YAFFS2 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_AUTO_YAFFS2 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_CHECKPOINT_RESERVED_BLOCKS -# int -# default 0 - -#config ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM -# boolean -# default n - - diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index fd62e69a1..7ed83c79e 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -9,6 +9,7 @@ menu "Miscellaneous devices support" config ADK_KERNEL_WATCHDOG boolean + default y if ADK_TARGET_WITH_WATCHDOG default n config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG 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 |