diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-06-12 15:57:45 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-06-12 15:57:45 +0200 |
commit | 2ca840b83ddd797f872bd6cc282991ec2b60e3ed (patch) | |
tree | 0b6d4703e7861329111049a85ce88234afc44c81 /target/linux/config | |
parent | 7109403c1d38cd863782417855775562a6e56b2f (diff) |
update default kernel to 2.6.39
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.flash | 17 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 14 | ||||
-rw-r--r-- | target/linux/config/Config.in.fsnet | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.mips | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.pm | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.systems | 8 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 4 |
9 files changed, 38 insertions, 15 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 91cfc9140..4d9bf6828 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -19,6 +19,13 @@ config ADK_KERNEL_MTD_BLOCK config ADK_KERNEL_MTD_PARTITIONS boolean +config ADK_KERNEL_MTD_REDBOOT_PARTS + boolean + +config ADK_KERNEL_MTD_REDBOOT_DIRECTORY_BLOCK + int + default "-3" + config ADK_KERNEL_MTD_ROOTFS_ROOT_DEV boolean @@ -31,6 +38,9 @@ config ADK_KERNEL_MTD_GEN_PROBE config ADK_KERNEL_MTD_PHYSMAP boolean +config ADK_KERNEL_MTD_CFI_ADV_OPTIONS + boolean + config ADK_KERNEL_MTD_NAND_RB4XX boolean default y if ADK_TARGET_SYSTEM_MIKROTIK_RB411 @@ -47,6 +57,13 @@ config ADK_KERNEL_MTD_CFI_INTELEXT default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n +config ADK_KERNEL_MTD_AR2315 + boolean + select ADK_KERNEL_MTD_REDBOOT_PARTS + select ADK_KERNEL_MTD_CFI_ADV_OPTIONS + default y if ADK_TARGET_SYSTEM_FON_FON2100 + default n + config ADK_TARGET_NAND boolean select ADK_KERNEL_MISC_FILESYSTEMS diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index a895225f0..ede84a73a 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -1,5 +1,8 @@ menu "Filesystems support" +config ADK_KERNEL_EXPORTFS + boolean + config ADK_KERNEL_YAFFS_FS tristate @@ -36,12 +39,6 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET string default "iso8859-1" -config ADK_KPACKAGE_KMOD_EXPORTFS - tristate - depends on !ADK_KERNEL_EXPORTFS - default n - help - config ADK_KERNEL_SQUASHFS prompt ".................................. SquashFS filesystem" boolean @@ -177,9 +174,6 @@ config ADK_KPACKAGE_KMOD_VFAT_FS The VFAT support enlarges your kernel by about 10 KB Please read the file <file:Documentation/filesystems/vfat.txt> for details. -config ADK_KERNEL_EXPORTFS - boolean - default n config ADK_KERNEL_XFS_FS boolean @@ -189,7 +183,7 @@ config ADK_KERNEL_XFS_FS config ADK_KPACKAGE_KMOD_XFS_FS prompt "kmod-fs-xfs....................... XFS filesystem support" tristate - select ADK_KPACKAGE_KMOD_EXPORTFS + select ADK_KERNEL_EXPORTFS depends on !ADK_KERNEL_XFS_FS default n help diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 756ffaa18..301a988f2 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -102,7 +102,7 @@ config ADK_KPACKAGE_KMOD_NFSD prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" tristate default n - select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS + select ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 select ADK_KERNEL_NFSD_V4 select ADK_KERNEL_DNOTIFY diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 1aafdf85f..00c06eb8b 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -42,6 +42,7 @@ config ADK_KERNEL_AGP_INTEL boolean menu "Graphic devices support" +depends on ADK_TARGET_WITH_VGA config ADK_KERNEL_FB_GEODE_LX prompt "................................ Framebuffer support for ALIX boards with VGA" diff --git a/target/linux/config/Config.in.mips b/target/linux/config/Config.in.mips index 0b0d1ea4f..2d9a2e661 100644 --- a/target/linux/config/Config.in.mips +++ b/target/linux/config/Config.in.mips @@ -1,4 +1,5 @@ menu "MIPS devices support" +depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_KERNEL_MIPS_PLATFORM_DEVICES boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 590a466c4..b45e17ccd 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -308,7 +308,7 @@ config ADK_DEBUG_MAC80211 select ADK_KERNEL_DEBUG_FS menu "Wireless card support" -depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB +depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB config ADK_KPACKAGE_KMOD_ATH5K prompt "kmod-ath5k................... Atheros 5xxx wireless cards" @@ -316,8 +316,9 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KERNEL_MAC80211_LEDS select ADK_KERNEL_ATH_COMMON select ADK_KPACKAGE_KMOD_MAC80211 - depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI + depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_FON_FON2100 default n help Driver for Atheros 5xxx/24xx cards. diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 45bf12f37..2f90df20c 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -23,6 +23,7 @@ config ADK_KERNEL_ACPI_DOCK boolean menu "Power Management support" +depends on ADK_TARGET_WITH_ACPI config ADK_HARDWARE_ACPI prompt "Enable ACPI support" diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index d744e45a1..8750ac281 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -34,8 +34,14 @@ config ADK_KERNEL_ARCH_AT91 config ADK_KERNEL_ARCH_AT91SAM9G20 boolean -config ADK_KERNEL_MACH_FOXG20 +config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean config ADK_KERNEL_AEABI boolean + +config ADK_KERNEL_CPU_BIG_ENDIAN + boolean + +config ADK_KERNEL_CPU_LITTLE_ENDIAN + boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b1375ac05..2be0c4f31 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -30,6 +30,7 @@ config ADK_KPACKAGE_KMOD_USB tristate select ADK_KERNEL_NLS depends on !ADK_KERNEL_USB + #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 @@ -93,12 +94,13 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB - depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n help The Open Host Controller Interface (OHCI) is a standard for accessing |