aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/adm5120/router_be/config-2.6.2826
-rw-r--r--target/linux/adm5120/router_be/config-2.6.3028
-rw-r--r--target/linux/adm5120/router_be/config-2.6.3128
-rw-r--r--target/linux/adm5120/router_le/config-2.6.2844
-rw-r--r--target/linux/adm5120/router_le/config-2.6.3046
-rw-r--r--target/linux/adm5120/router_le/config-2.6.3146
-rw-r--r--target/linux/amazon/config-2.6.2116
-rw-r--r--target/linux/ar7/config-2.6.2710
-rw-r--r--target/linux/ar7/config-default14
-rw-r--r--target/linux/ar71xx/config-2.6.2820
-rw-r--r--target/linux/ar71xx/config-2.6.3024
-rw-r--r--target/linux/ar71xx/config-2.6.3126
-rw-r--r--target/linux/at91/config-2.6.2534
-rw-r--r--target/linux/atheros/config-2.6.3014
-rw-r--r--target/linux/atheros/config-2.6.3116
-rw-r--r--target/linux/au1000/au1500/config-default14
-rw-r--r--target/linux/au1000/au1550/config-default54
-rw-r--r--target/linux/avr32/config-default4
-rw-r--r--target/linux/brcm-2.4/config-default72
-rw-r--r--target/linux/brcm47xx/config-2.6.2824
-rw-r--r--target/linux/brcm47xx/config-2.6.3028
-rw-r--r--target/linux/brcm47xx/config-2.6.3130
-rw-r--r--target/linux/brcm63xx/config-2.6.3038
-rw-r--r--target/linux/cobalt/config-default36
-rw-r--r--target/linux/coldfire/config-default16
-rw-r--r--target/linux/etrax/config-2.6.3020
-rw-r--r--target/linux/gemini/config-default16
-rw-r--r--target/linux/generic-2.4/config-default116
-rw-r--r--target/linux/generic-2.6/config-2.6.3010
-rw-r--r--target/linux/generic-2.6/config-2.6.3110
-rw-r--r--target/linux/goldfish/config-2.6.3036
-rw-r--r--target/linux/ifxmips/config-2.6.3016
-rw-r--r--target/linux/ifxmips/nfs/config-2.6.264
-rw-r--r--target/linux/ifxmips/nfs/config-2.6.274
-rw-r--r--target/linux/ifxmips/nfs/config-2.6.2810
-rw-r--r--target/linux/iop32x/config-default40
-rw-r--r--target/linux/ixp4xx/config-2.6.2828
-rw-r--r--target/linux/ixp4xx/config-2.6.3022
-rw-r--r--target/linux/ixp4xx/config-2.6.3122
-rw-r--r--target/linux/ixp4xx/config-2.6.3222
-rw-r--r--target/linux/ixp4xx/config-default42
-rw-r--r--target/linux/ixp4xx/harddisk/config-default18
-rw-r--r--target/linux/mpc52xx/config-2.6.3056
-rw-r--r--target/linux/mpc83xx/config-default32
-rw-r--r--target/linux/octeon/config-default50
-rw-r--r--target/linux/olpc/config-2.6.30104
-rw-r--r--target/linux/orion/config-default50
-rw-r--r--target/linux/orion/harddisk/config-default44
-rw-r--r--target/linux/ppc40x/config-default26
-rw-r--r--target/linux/ppc44x/config-default36
-rw-r--r--target/linux/ps3/config-2.6.3074
-rw-r--r--target/linux/pxa/config-default56
-rw-r--r--target/linux/pxcab/config-2.6.30104
-rw-r--r--target/linux/pxcab/config-2.6.31110
-rw-r--r--target/linux/ramips/rt288x/config-2.6.3012
-rw-r--r--target/linux/ramips/rt305x/config-2.6.3010
-rw-r--r--target/linux/rb532/config-default22
-rw-r--r--target/linux/rdc/ar525w/config-2.6.302
-rw-r--r--target/linux/rdc/config-2.6.2834
-rw-r--r--target/linux/rdc/config-2.6.3032
-rw-r--r--target/linux/s3c24xx/config-2.6.30104
-rw-r--r--target/linux/s3c24xx/config-2.6.31100
-rw-r--r--target/linux/sibyte/config-default6
-rwxr-xr-xtarget/linux/ubicom32/config-2.6.2836
-rw-r--r--target/linux/x86/config-2.6.2876
-rw-r--r--target/linux/x86/config-2.6.3080
-rw-r--r--target/linux/x86/config-2.6.3184
-rw-r--r--target/linux/x86/olpc/config-2.6.30104
-rw-r--r--target/linux/x86/olpc/config-2.6.31114
69 files changed, 1351 insertions, 1351 deletions
diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28
index dac488f5da..153421d1f7 100644
--- a/target/linux/adm5120/router_be/config-2.6.28
+++ b/target/linux/adm5120/router_be/config-2.6.28
@@ -1,6 +1,5 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
# CONFIG_ADM5120_MACH_5GXI is not set
CONFIG_ADM5120_MACH_P_334WT=y
@@ -15,6 +14,7 @@ CONFIG_ADM5120_MACH_P_335=y
CONFIG_ADM5120_OEM_ZYXEL=y
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -37,9 +37,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -71,8 +71,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
@@ -87,28 +87,28 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HID=m
CONFIG_HID_COMPAT=y
+CONFIG_HID=m
CONFIG_HID_SUPPORT=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
@@ -119,7 +119,6 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -129,6 +128,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_BLOCK2MTD=y
@@ -142,9 +142,9 @@ CONFIG_MTD_TRXSPLIT=y
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -154,18 +154,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -191,10 +191,10 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_DEBUG=y
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30
index e954c7af32..71e4688c72 100644
--- a/target/linux/adm5120/router_be/config-2.6.30
+++ b/target/linux/adm5120/router_be/config-2.6.30
@@ -1,6 +1,5 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
CONFIG_ADM5120_MACH_5GXI=y
CONFIG_ADM5120_MACH_P_334WT=y
@@ -15,6 +14,7 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
CONFIG_ADM5120_OEM_ZYXEL=y
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -31,8 +31,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -41,9 +41,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -65,8 +65,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -77,8 +77,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -99,22 +99,22 @@ CONFIG_HID=m
CONFIG_HID_SUPPORT=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
@@ -124,7 +124,6 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -134,6 +133,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_BLOCK2MTD=y
@@ -147,9 +147,9 @@ CONFIG_MTD_TRXSPLIT=y
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -159,18 +159,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -198,10 +198,10 @@ CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_DEBUG=y
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/adm5120/router_be/config-2.6.31 b/target/linux/adm5120/router_be/config-2.6.31
index cd7b7e9848..0413c962ea 100644
--- a/target/linux/adm5120/router_be/config-2.6.31
+++ b/target/linux/adm5120/router_be/config-2.6.31
@@ -1,6 +1,5 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
CONFIG_ADM5120_MACH_5GXI=y
CONFIG_ADM5120_MACH_P_334WT=y
@@ -15,6 +14,7 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
CONFIG_ADM5120_OEM_ZYXEL=y
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
# CONFIG_AR7 is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -33,8 +33,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -43,9 +43,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -67,8 +67,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -79,8 +79,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -101,22 +101,22 @@ CONFIG_HID=m
CONFIG_HID_SUPPORT=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_ALCHEMY is not set
@@ -127,7 +127,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -137,6 +136,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_BLOCK2MTD=y
@@ -151,9 +151,9 @@ CONFIG_NLS=m
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -163,18 +163,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -200,10 +200,10 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_DEBUG=y
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/adm5120/router_le/config-2.6.28 b/target/linux/adm5120/router_le/config-2.6.28
index 287feaa96e..214294222f 100644
--- a/target/linux/adm5120/router_le/config-2.6.28
+++ b/target/linux/adm5120/router_le/config-2.6.28
@@ -1,11 +1,10 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
# CONFIG_8139TOO is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_6104KP=y
+CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_61X4WG=y
CONFIG_ADM5120_MACH_CAS_771=y
CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -17,8 +16,8 @@ CONFIG_ADM5120_MACH_NP27G=y
CONFIG_ADM5120_MACH_NP28G=y
CONFIG_ADM5120_MACH_PMUGW=y
CONFIG_ADM5120_MACH_RB_11X=y
-CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_133C=y
+CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_150=y
CONFIG_ADM5120_MACH_RB_153=y
CONFIG_ADM5120_MACH_RB_192=y
@@ -33,6 +32,7 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
# CONFIG_ADM5120_OEM_ZYXEL is not set
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -58,9 +58,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -83,15 +83,15 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_ALGAPI=m
CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_ALGAPI=m
CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_MANAGER=m
CONFIG_CRYPTO_MANAGER2=m
+CONFIG_CRYPTO_MANAGER=m
CONFIG_CRYPTO_RNG2=m
CONFIG_CSRC_R4K=y
CONFIG_DEVPORT=y
@@ -103,8 +103,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
@@ -120,36 +120,36 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HID=m
CONFIG_HID_COMPAT=y
+CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_IDE is not set
-CONFIG_IEEE80211=m
CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211=m
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_KEXEC=y
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
@@ -160,7 +160,6 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -170,6 +169,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
@@ -177,8 +177,8 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_TRXSPLIT=y
# CONFIG_NATSEMI is not set
CONFIG_NO_HZ=y
@@ -188,9 +188,9 @@ CONFIG_NO_HZ=y
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PATA_RB153_CF=m
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -201,18 +201,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_SCSI=m
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -239,9 +239,9 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/adm5120/router_le/config-2.6.30 b/target/linux/adm5120/router_le/config-2.6.30
index 394b85ae29..2b8ab3431d 100644
--- a/target/linux/adm5120/router_le/config-2.6.30
+++ b/target/linux/adm5120/router_le/config-2.6.30
@@ -1,10 +1,9 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_6104KP=y
+CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_61X4WG=y
CONFIG_ADM5120_MACH_CAS_771=y
CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -16,8 +15,8 @@ CONFIG_ADM5120_MACH_NP27G=y
CONFIG_ADM5120_MACH_NP28G=y
CONFIG_ADM5120_MACH_PMUGW=y
CONFIG_ADM5120_MACH_RB_11X=y
-CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_133C=y
+CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_150=y
CONFIG_ADM5120_MACH_RB_153=y
CONFIG_ADM5120_MACH_RB_192=y
@@ -32,6 +31,7 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
# CONFIG_ADM5120_OEM_ZYXEL is not set
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -51,8 +51,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -61,9 +61,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -88,18 +88,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -110,8 +110,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -131,35 +131,35 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_KEXEC=y
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
-CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_CCMP=m
CONFIG_LIB80211_CRYPT_TKIP=m
CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211=m
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -168,7 +168,6 @@ CONFIG_LIB80211_CRYPT_WEP=m
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -178,6 +177,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
@@ -185,8 +185,8 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_TRXSPLIT=y
# CONFIG_NATSEMI is not set
CONFIG_NO_HZ=y
@@ -196,9 +196,9 @@ CONFIG_NO_HZ=y
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PATA_RB153_CF=m
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -208,18 +208,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_SCSI=m
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -248,9 +248,9 @@ CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/adm5120/router_le/config-2.6.31 b/target/linux/adm5120/router_le/config-2.6.31
index 05926f1bdf..612fbf0dd0 100644
--- a/target/linux/adm5120/router_le/config-2.6.31
+++ b/target/linux/adm5120/router_le/config-2.6.31
@@ -1,10 +1,9 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_ADM5120=y
CONFIG_ADM5120_ENET=y
CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_6104KP=y
+CONFIG_ADM5120_MACH_BR_6104K=y
CONFIG_ADM5120_MACH_BR_61X4WG=y
CONFIG_ADM5120_MACH_CAS_771=y
CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -16,8 +15,8 @@ CONFIG_ADM5120_MACH_NP27G=y
CONFIG_ADM5120_MACH_NP28G=y
CONFIG_ADM5120_MACH_PMUGW=y
CONFIG_ADM5120_MACH_RB_11X=y
-CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_133C=y
+CONFIG_ADM5120_MACH_RB_133=y
CONFIG_ADM5120_MACH_RB_150=y
CONFIG_ADM5120_MACH_RB_153=y
CONFIG_ADM5120_MACH_RB_192=y
@@ -32,6 +31,7 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
# CONFIG_ADM5120_OEM_ZYXEL is not set
CONFIG_ADM5120_SOC_BGA=y
CONFIG_ADM5120_WDT=y
+CONFIG_ADM5120=y
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
# CONFIG_AR7 is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -52,8 +52,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -62,9 +62,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -89,18 +89,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -111,8 +111,8 @@ CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -132,35 +132,35 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=m
+CONFIG_INOTIFY=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT=m
# CONFIG_INPUT_YEALINK is not set
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
CONFIG_KEXEC=y
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
-CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_CCMP=m
CONFIG_LIB80211_CRYPT_TKIP=m
CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211=m
CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
@@ -170,7 +170,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_VR41XX is not set
CONFIG_MII=m
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -180,6 +179,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ADM5120=y
CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
@@ -187,8 +187,8 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_TRXSPLIT=y
# CONFIG_NATSEMI is not set
CONFIG_NLS=m
@@ -199,9 +199,9 @@ CONFIG_NO_HZ=y
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PATA_RB153_CF=m
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -211,18 +211,18 @@ CONFIG_PCI_DOMAINS=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_SCSI=m
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
+CONFIG_SERIAL_AMBA_PL010=y
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIO=y
# CONFIG_SERIO_AMBAKMI is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -249,9 +249,9 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_TICK_ONESHOT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_USB=m
CONFIG_USB_ADM5120_HCD=m
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
diff --git a/target/linux/amazon/config-2.6.21 b/target/linux/amazon/config-2.6.21
index 6d830e1d76..af8d1efca1 100644
--- a/target/linux/amazon/config-2.6.21
+++ b/target/linux/amazon/config-2.6.21
@@ -2,12 +2,12 @@ CONFIG_32BIT=y
# CONFIG_64BIT is not set
# CONFIG_64BIT_PHYS_ADDR is not set
CONFIG_ADM6996_SUPPORT=y
-CONFIG_AMAZON=y
CONFIG_AMAZON_ASC_UART=y
CONFIG_AMAZON_MTD=y
CONFIG_AMAZON_NET_SW=y
CONFIG_AMAZON_PCI=y
CONFIG_AMAZON_WDT=y
+CONFIG_AMAZON=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_BASE_SMALL=0
@@ -18,9 +18,9 @@ CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -59,12 +59,11 @@ CONFIG_HW_RANDOM=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_KALLSYMS=y
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
# CONFIG_MACH_VR41XX is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_BOSPORUS is not set
# CONFIG_MIPS_COBALT is not set
@@ -78,10 +77,10 @@ CONFIG_MIPS=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MALTA is not set
# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_MTX1 is not set
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
+# CONFIG_MIPS_MTX1 is not set
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_MIPS_PB1200 is not set
@@ -91,11 +90,12 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_SIM is not set
# CONFIG_MIPS_VPE_LOADER is not set
# CONFIG_MIPS_XXS1500 is not set
+CONFIG_MIPS=y
# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
# CONFIG_MOMENCO_OCELOT_3 is not set
# CONFIG_MOMENCO_OCELOT_C is not set
# CONFIG_MOMENCO_OCELOT_G is not set
+# CONFIG_MOMENCO_OCELOT is not set
CONFIG_MTD_AMAZON_BUS_WIDTH_16=y
# CONFIG_MTD_AMAZON_BUS_WIDTH_32 is not set
# CONFIG_MTD_AMAZON_BUS_WIDTH_8 is not set
@@ -107,13 +107,13 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_GEOMETRY is not set
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_OBSOLETE_CHIPS is not set
-CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_BANKWIDTH=0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NET_PCI is not set
CONFIG_NET_SCH_FIFO=y
# CONFIG_NET_VENDOR_3COM is not set
diff --git a/target/linux/ar7/config-2.6.27 b/target/linux/ar7/config-2.6.27
index a64a00afc4..2d74680c8b 100644
--- a/target/linux/ar7/config-2.6.27
+++ b/target/linux/ar7/config-2.6.27
@@ -1,8 +1,8 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_AR7=y
CONFIG_AR7_GPIO=y
CONFIG_AR7_WDT=y
+CONFIG_AR7=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -23,9 +23,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -52,8 +52,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
CONFIG_FIXED_PHY=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -89,7 +89,6 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
@@ -98,12 +97,13 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR7_PARTS=y
CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
CONFIG_MTD_PHYSMAP_LEN=0
CONFIG_MTD_PHYSMAP_START=0x10000000
+CONFIG_MTD_PHYSMAP=y
CONFIG_NO_EXCEPT_FILL=y
# CONFIG_NO_IOPORT is not set
CONFIG_PAGEFLAGS_EXTENDED=y
diff --git a/target/linux/ar7/config-default b/target/linux/ar7/config-default
index 00d898e717..9cd78ca2d2 100644
--- a/target/linux/ar7/config-default
+++ b/target/linux/ar7/config-default
@@ -1,8 +1,9 @@
+
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_AR7=y
CONFIG_AR7_GPIO=y
CONFIG_AR7_WDT=y
+CONFIG_AR7=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -16,8 +17,8 @@ CONFIG_BITREVERSE=y
CONFIG_BOOT_ELF32=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
CONFIG_CPMAC=y
# CONFIG_CPU_BIG_ENDIAN is not set
@@ -27,9 +28,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -51,16 +52,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
CONFIG_FIXED_PHY=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -90,7 +91,6 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -100,6 +100,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR7_PARTS=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y
@@ -115,7 +116,6 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set
-
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index 539396ff6a..885a04b57e 100644
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -1,9 +1,9 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
# CONFIG_8139TOO is not set
-CONFIG_AG71XX=y
CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG is not set
+CONFIG_AG71XX=y
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y
@@ -43,9 +43,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -73,8 +73,8 @@ CONFIG_DEVPORT=y
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
@@ -92,10 +92,10 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
+CONFIG_I2C=y
CONFIG_ICPLUS_PHY=y
# CONFIG_IDE is not set
CONFIG_IMAGE_CMDLINE_HACK=y
@@ -116,7 +116,6 @@ CONFIG_IRQ_CPU=y
# CONFIG_MACH_VR41XX is not set
CONFIG_MICREL_PHY=y
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -126,20 +125,20 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR91XX_FLASH=y
-# CONFIG_MTD_CFI is not set
# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI is not set
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_RB4XX=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y
CONFIG_MYLOADER=y
# CONFIG_NATSEMI is not set
-CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
# CONFIG_NET_DSA_MV88E6131 is not set
@@ -148,13 +147,14 @@ CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_TAG_DSA is not set
# CONFIG_NET_DSA_TAG_EDSA is not set
CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA=y
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -183,7 +183,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
-CONFIG_SPI=y
CONFIG_SPI_AP83=y
CONFIG_SPI_AR71XX=y
CONFIG_SPI_BITBANG=y
@@ -192,6 +191,7 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_PB44=y
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_VSC7385 is not set
+CONFIG_SPI=y
CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 7e925b4b65..4434633f4c 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -1,8 +1,8 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_AG71XX=y
CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG is not set
+CONFIG_AG71XX=y
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y
@@ -36,8 +36,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -46,9 +46,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -70,16 +70,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -99,10 +99,10 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
+CONFIG_I2C=y
CONFIG_ICPLUS_PHY=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_ROOT_GID=0
@@ -121,7 +121,6 @@ CONFIG_IRQ_CPU=y
# CONFIG_MACH_VR41XX is not set
CONFIG_MICREL_PHY=y
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -131,20 +130,20 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR91XX_FLASH=y
-# CONFIG_MTD_CFI is not set
# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI is not set
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_RB4XX=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y
CONFIG_MYLOADER=y
# CONFIG_NATSEMI is not set
-CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
# CONFIG_NET_DSA_MV88E6131 is not set
@@ -153,13 +152,14 @@ CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_TAG_DSA is not set
# CONFIG_NET_DSA_TAG_EDSA is not set
CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA=y
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -188,7 +188,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y
-CONFIG_SPI=y
CONFIG_SPI_AP83=y
CONFIG_SPI_AR71XX=y
CONFIG_SPI_BITBANG=y
@@ -197,6 +196,7 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_PB44=y
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_VSC7385 is not set
+CONFIG_SPI=y
CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index bc817fdc34..1c7809e2c4 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -1,10 +1,9 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-CONFIG_AG71XX=y
CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG is not set
+CONFIG_AG71XX=y
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y
@@ -23,6 +22,7 @@ CONFIG_AR71XX_MACH_WP543=y
CONFIG_AR71XX_MACH_WRT160NL=y
CONFIG_AR71XX_MACH_WRT400N=y
CONFIG_AR71XX_WDT=y
+# CONFIG_AR7 is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -38,8 +38,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -48,9 +48,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -72,8 +72,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -81,8 +81,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -101,10 +101,10 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
+CONFIG_I2C=y
CONFIG_ICPLUS_PHY=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_ROOT_GID=0
@@ -124,7 +124,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_VR41XX is not set
CONFIG_MICREL_PHY=y
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -134,20 +133,20 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR91XX_FLASH=y
-# CONFIG_MTD_CFI is not set
# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI is not set
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_RB4XX=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y
CONFIG_MYLOADER=y
# CONFIG_NATSEMI is not set
-CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
# CONFIG_NET_DSA_MV88E6131 is not set
@@ -156,13 +155,14 @@ CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_TAG_DSA is not set
# CONFIG_NET_DSA_TAG_EDSA is not set
CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA=y
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -190,7 +190,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
-CONFIG_SPI=y
CONFIG_SPI_AP83=y
CONFIG_SPI_AR71XX=y
CONFIG_SPI_BITBANG=y
@@ -199,6 +198,7 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_PB44=y
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_VSC7385 is not set
+CONFIG_SPI=y
CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index edac29badf..5d16c2f00b 100644
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -1,23 +1,23 @@
# CONFIG_AEABI is not set
CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_AT91=y
# CONFIG_ARCH_AT91CAP9 is not set
-CONFIG_ARCH_AT91RM9200=y
# CONFIG_ARCH_AT91RM9200DK is not set
+CONFIG_ARCH_AT91RM9200=y
# CONFIG_ARCH_AT91SAM9260 is not set
# CONFIG_ARCH_AT91SAM9261 is not set
# CONFIG_ARCH_AT91SAM9263 is not set
# CONFIG_ARCH_AT91SAM9RL is not set
# CONFIG_ARCH_AT91X40 is not set
+CONFIG_ARCH_AT91=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_SUPPORTS_AOUT=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
CONFIG_ARM_AT91_ETHER=y
CONFIG_ARM_THUMB=y
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_AT91_EARLY_DBGU=y
@@ -29,8 +29,8 @@ CONFIG_AT91_EARLY_DBGU=y
# CONFIG_AT91_EARLY_USART5 is not set
CONFIG_AT91_PMC_UNIT=y
# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
-CONFIG_AT91_SPI=y
# CONFIG_AT91_SPIDEV is not set
+CONFIG_AT91_SPI=y
CONFIG_AT91_TIMER_HZ=128
CONFIG_AT91_VLIO=y
# CONFIG_ATMEL_PWM is not set
@@ -38,23 +38,23 @@ CONFIG_AT91_VLIO=y
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_BONDING is not set
CONFIG_BOUNCE=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_CLASSIC_RCU=y
-CONFIG_CPU_32=y
CONFIG_CPU_32v4T=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV4T=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_CACHE_V4WT=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
@@ -67,12 +67,12 @@ CONFIG_DAVICOM_PHY=y
CONFIG_DUMMY_CONSOLE=y
# CONFIG_E1000E_ENABLED is not set
# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
+CONFIG_FPE_NWFPE=y
CONFIG_FRAME_POINTER=y
CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_GPIO=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
@@ -92,10 +92,10 @@ CONFIG_HZ=128
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
-CONFIG_LEDS=y
CONFIG_LEDS_CPU=y
-CONFIG_LEGACY_PTYS=y
+CONFIG_LEDS=y
CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_LEGACY_PTYS=y
# CONFIG_LLC2 is not set
# CONFIG_LZO_COMPRESS is not set
# CONFIG_LZO_DECOMPRESS is not set
@@ -136,21 +136,21 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_OUTER_CACHE is not set
# CONFIG_PCI_SYSCALL is not set
CONFIG_PHYLIB=y
+# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPPOATM is not set
# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_SCSI_WAIT_SCAN is not set
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y
CONFIG_SERIAL_ATMEL_PDC=y
# CONFIG_SERIAL_ATMEL_TTYAT is not set
-CONFIG_SERIO=y
+CONFIG_SERIAL_ATMEL=y
# CONFIG_SERIO_LIBPS2 is not set
CONFIG_SERIO_RAW=y
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
CONFIG_SLABINFO=y
# CONFIG_SMC91X is not set
# CONFIG_SPI_AT91 is not set
@@ -159,8 +159,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_ONESHOT=y
CONFIG_UID16=y
-# CONFIG_USB is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
CONFIG_USB_LIBUSUAL=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -207,12 +207,12 @@ CONFIG_USB_LIBUSUAL=y
CONFIG_USB_SUPPORT=y
# CONFIG_USB_UEAGLEATM is not set
CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VGASTATE is not set
# CONFIG_VGA_CONSOLE is not set
+# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_DEV is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
# CONFIG_WLAN_80211 is not set
diff --git a/target/linux/atheros/config-2.6.30 b/target/linux/atheros/config-2.6.30
index 7c9b881d68..8cbe05f75b 100644
--- a/target/linux/atheros/config-2.6.30
+++ b/target/linux/atheros/config-2.6.30
@@ -9,8 +9,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR2315_PCI=y
+CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR231X=y
CONFIG_ATHEROS_AR5312=y
CONFIG_ATHEROS_WDT=y
@@ -20,8 +20,8 @@ CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
# CONFIG_COMPAT_NET_DEV_OPS is not set
CONFIG_CPU_BIG_ENDIAN=y
@@ -31,9 +31,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -55,15 +55,15 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -95,7 +95,6 @@ CONFIG_IRQ_CPU=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -105,6 +104,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR2315=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_GEOMETRY is not set
@@ -119,8 +119,8 @@ CONFIG_MVSWITCH_PHY=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
diff --git a/target/linux/atheros/config-2.6.31 b/target/linux/atheros/config-2.6.31
index 2b3d0bdfa8..2961fded4d 100644
--- a/target/linux/atheros/config-2.6.31
+++ b/target/linux/atheros/config-2.6.31
@@ -12,8 +12,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR2315_PCI=y
+CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR231X=y
CONFIG_ATHEROS_AR5312=y
CONFIG_ATHEROS_WDT=y
@@ -23,8 +23,8 @@ CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
CONFIG_CONSTRUCTORS=y
CONFIG_CPU_BIG_ENDIAN=y
@@ -34,9 +34,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -58,16 +58,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -81,8 +81,8 @@ CONFIG_HAS_IOPORT=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_IDE=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
@@ -101,7 +101,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -111,6 +110,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_AR2315=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_GEOMETRY is not set
@@ -125,8 +125,8 @@ CONFIG_MVSWITCH_PHY=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
diff --git a/target/linux/au1000/au1500/config-default b/target/linux/au1000/au1500/config-default
index 4a2c78c6ab..64aa6c03c0 100644
--- a/target/linux/au1000/au1500/config-default
+++ b/target/linux/au1000/au1500/config-default
@@ -23,9 +23,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -64,8 +64,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_DUMMY=m
CONFIG_ELF_CORE=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -84,15 +84,15 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
-CONFIG_I2C=m
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=m
+CONFIG_I2C=m
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQ_CPU=y
CONFIG_KEXEC=y
@@ -106,7 +106,6 @@ CONFIG_MACH_ALCHEMY=y
# CONFIG_MACH_VR41XX is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
CONFIG_MIPS_AU1X00_ENET=y
# CONFIG_MIPS_BOSPORUS is not set
# CONFIG_MIPS_COBALT is not set
@@ -120,10 +119,10 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
# CONFIG_MIPS_MALTA is not set
# CONFIG_MIPS_MIRAGE is not set
-CONFIG_MIPS_MTX1=y
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
+CONFIG_MIPS_MTX1=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_MIPS_PB1200 is not set
@@ -131,6 +130,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_SIM is not set
# CONFIG_MIPS_XXS1500 is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MTD_ALCHEMY is not set
# CONFIG_MTD_CFI_INTELEXT is not set
@@ -142,8 +142,8 @@ CONFIG_MTD_PHYSMAP=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
diff --git a/target/linux/au1000/au1550/config-default b/target/linux/au1000/au1550/config-default
index a3623adfe0..d18be4cbaa 100644
--- a/target/linux/au1000/au1550/config-default
+++ b/target/linux/au1000/au1550/config-default
@@ -22,9 +22,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -61,8 +61,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_DUMMY=m
CONFIG_ELF_CORE=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -82,20 +82,20 @@ CONFIG_HAVE_IDE=y
# CONFIG_HAVE_KPROBES is not set
# CONFIG_HAVE_KRETPROBES is not set
CONFIG_HAVE_OPROFILE=y
-CONFIG_HOSTAP=m
CONFIG_HOSTAP_CS=m
+CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_IDE is not set
-CONFIG_IEEE80211=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211=m
CONFIG_IFB=m
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
@@ -126,7 +126,6 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MFD_CORE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
CONFIG_MIPS_AU1X00_ENET=y
# CONFIG_MIPS_BOSPORUS is not set
# CONFIG_MIPS_COBALT is not set
@@ -139,10 +138,10 @@ CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MALTA is not set
# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_MTX1 is not set
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
+# CONFIG_MIPS_MTX1 is not set
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_MIPS_PB1200 is not set
@@ -150,16 +149,29 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_SIM is not set
# CONFIG_MIPS_XXS1500 is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MTD_ALCHEMY is not set
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
CONFIG_MTD_PHYSMAP_LEN=0
CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP=y
# CONFIG_NATSEMI is not set
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_U32=m
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -180,27 +192,15 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
CONFIG_NET_SCH_CBQ=m
-CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_NAT=m
CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT=m
CONFIG_NF_NAT_TFTP=m
# CONFIG_NO_IOPORT is not set
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -210,24 +210,24 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
CONFIG_PCCARD=m
CONFIG_PCCARD_NONSTATIC=m
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
-CONFIG_PCMCIA=m
+CONFIG_PCI=y
CONFIG_PCMCIA_AU1X00=m
CONFIG_PCMCIA_IOCTL=y
CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA=m
CONFIG_PCSPKR_PLATFORM=y
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
-CONFIG_PPP=m
-CONFIG_PPPOE=m
-CONFIG_PPPOL2TP=m
CONFIG_PPP_ASYNC=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
+CONFIG_PPP=m
+CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_PROBE_INITRD_HEADER is not set
# CONFIG_R6040 is not set
diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default
index b267c94f86..640cddb11e 100644
--- a/target/linux/avr32/config-default
+++ b/target/linux/avr32/config-default
@@ -58,10 +58,10 @@ CONFIG_LEDS_GPIO=y
CONFIG_LOAD_ADDRESS=0x10000000
CONFIG_LOADER_U_BOOT=y
CONFIG_MACB=y
-CONFIG_MMC=m
-CONFIG_MMC_ATMELMCI=m
# CONFIG_MMC_ATMELMCI_DMA is not set
+CONFIG_MMC_ATMELMCI=m
CONFIG_MMC_BLOCK=m
+CONFIG_MMC=m
# CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
diff --git a/target/linux/brcm-2.4/config-default b/target/linux/brcm-2.4/config-default
index ca963df4f4..263e079481 100644
--- a/target/linux/brcm-2.4/config-default
+++ b/target/linux/brcm-2.4/config-default
@@ -1,24 +1,24 @@
# CONFIG_60XX_WDT is not set
# CONFIG_6PACK is not set
# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
+# CONFIG_8139_OLD_RX_RESET is not set
# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139TOO is not set
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139_OLD_RX_RESET is not set
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_ADVANTECH_WDT is not set
-# CONFIG_AIRO is not set
# CONFIG_AIRO_CS is not set
+# CONFIG_AIRO is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_AMD74XX_OVERRIDE is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_APRICOT is not set
# CONFIG_ATM is not set
-CONFIG_AX25=m
# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_AX25=m
CONFIG_B44=y
# CONFIG_BAYCOM_EPP is not set
# CONFIG_BAYCOM_PAR is not set
@@ -34,14 +34,14 @@ CONFIG_BCM947XX=y
CONFIG_BLK_DEV_AEC62XX=m
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
+# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_SII is not set
# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CY82C693 is not set
@@ -50,25 +50,25 @@ CONFIG_BLK_DEV_AEC62XX=m
# CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
-CONFIG_BLK_DEV_IDE=m
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDE=m
CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_IDESCSI is not set
# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_ISAPNP is not set
# CONFIG_BLK_DEV_NS87415 is not set
CONFIG_BLK_DEV_OFFBOARD=y
# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
CONFIG_BLK_DEV_PDC202XX_OLD=m
+CONFIG_BLK_DEV_PDC202XX=y
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_SC1200 is not set
@@ -79,7 +79,6 @@ CONFIG_BLK_DEV_PDC202XX_OLD=m
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLUEZ=m
CONFIG_BLUEZ_BNEP=m
CONFIG_BLUEZ_BNEP_MC_FILTER=y
CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
@@ -88,21 +87,22 @@ CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
# CONFIG_BLUEZ_HCIBT3C is not set
# CONFIG_BLUEZ_HCIBTUART is not set
# CONFIG_BLUEZ_HCIDTL1 is not set
-CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIUART_BCSP=y
CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART=m
CONFIG_BLUEZ_HCIUSB=m
CONFIG_BLUEZ_HCIUSB_SCO=y
# CONFIG_BLUEZ_HCIVHCI is not set
CONFIG_BLUEZ_L2CAP=m
+CONFIG_BLUEZ=m
CONFIG_BLUEZ_RFCOMM=m
CONFIG_BLUEZ_RFCOMM_TTY=y
CONFIG_BLUEZ_SCO=m
# CONFIG_BPQETHER is not set
CONFIG_CARDBUS=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
CONFIG_CRC32=y
# CONFIG_CS89x0 is not set
# CONFIG_DE4X5 is not set
@@ -123,8 +123,8 @@ CONFIG_HAMRADIO=y
# CONFIG_HP100 is not set
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2O is not set
# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O is not set
# CONFIG_I2O_LAN is not set
# CONFIG_I2O_PCI is not set
# CONFIG_I2O_PROC is not set
@@ -133,7 +133,7 @@ CONFIG_HAMRADIO=y
# CONFIG_I82092 is not set
# CONFIG_I82365 is not set
# CONFIG_IB700_WDT is not set
-CONFIG_IDE=m
+# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_IDEDISK_STROKE=y
CONFIG_IDEDMA_AUTO=y
@@ -141,8 +141,8 @@ CONFIG_IDEDMA_IVB=y
# CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_PCI_WIP is not set
+CONFIG_IDE=m
# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDE_TASK_IOCTL is not set
# CONFIG_IEEE1394 is not set
# CONFIG_IP_VS is not set
@@ -159,38 +159,38 @@ CONFIG_MIPS_BRCM=y
CONFIG_MKISS=m
CONFIG_MSDOS_FS=m
CONFIG_MTD_BCM947XX=y
-CONFIG_MTD_CFI_SSTSTD=y
CONFIG_MTD_CFI_B1=y
+CONFIG_MTD_CFI_SSTSTD=y
CONFIG_MTD_SFLASH=y
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
-# CONFIG_NETROM is not set
CONFIG_NET_PCI=y
# CONFIG_NET_PCMCIA is not set
+# CONFIG_NETROM is not set
CONFIG_NET_SCH_ESFQ=m
CONFIG_NET_WIRELESS=y
CONFIG_NEW_IRQ=y
CONFIG_NEW_TIME_C=y
-CONFIG_PARPORT=m
# CONFIG_PARPORT_1284 is not set
# CONFIG_PARPORT_AMIGA is not set
# CONFIG_PARPORT_ATARI is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_IP22 is not set
+CONFIG_PARPORT=m
# CONFIG_PARPORT_MFC3 is not set
# CONFIG_PARPORT_OTHER is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARPORT_SPLINK=m
# CONFIG_PARPORT_SUNBPP is not set
-CONFIG_PCI=y
CONFIG_PCI_AUTO=y
# CONFIG_PCI_HERMES is not set
# CONFIG_PCI_NAMES is not set
# CONFIG_PCI_NEW is not set
-CONFIG_PCMCIA=m
+CONFIG_PCI=y
# CONFIG_PCMCIA_ATMEL is not set
# CONFIG_PCMCIA_HERMES is not set
+CONFIG_PCMCIA=m
CONFIG_PCMCIA_SERIAL_CS=m
# CONFIG_PCNET32 is not set
# CONFIG_PCWATCHDOG is not set
@@ -218,13 +218,11 @@ CONFIG_PRINTER=m
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_SYM53C8XX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_SYM53C8XX is not set
# CONFIG_SCx200_WDT is not set
# CONFIG_SIS900 is not set
CONFIG_SOFT_WATCHDOG=m
-CONFIG_SOUND=m
-# CONFIG_SOUNDMODEM is not set
# CONFIG_SOUND_AD1980 is not set
# CONFIG_SOUND_ALI5455 is not set
# CONFIG_SOUND_BT878 is not set
@@ -237,8 +235,10 @@ CONFIG_SOUND=m
# CONFIG_SOUND_FORTE is not set
# CONFIG_SOUND_FUSION is not set
# CONFIG_SOUND_ICH is not set
-# CONFIG_SOUND_MAESTRO is not set
+CONFIG_SOUND=m
# CONFIG_SOUND_MAESTRO3 is not set
+# CONFIG_SOUND_MAESTRO is not set
+# CONFIG_SOUNDMODEM is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
# CONFIG_SOUND_OSS is not set
@@ -257,7 +257,6 @@ CONFIG_SOUND=m
# CONFIG_TMD_HERMES is not set
# CONFIG_TULIP is not set
# CONFIG_TUNER_3036 is not set
-CONFIG_USB=m
CONFIG_USB_ACM=m
# CONFIG_USB_AIPTEK is not set
CONFIG_USB_AUDIO=m
@@ -273,9 +272,9 @@ CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DSBR is not set
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_HID is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_HIDINPUT is not set
+# CONFIG_USB_HID is not set
# CONFIG_USB_HPUSBSCSI is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_KAWETH is not set
@@ -283,6 +282,7 @@ CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_LCD is not set
+CONFIG_USB=m
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
# CONFIG_USB_MIDI is not set
@@ -297,7 +297,6 @@ CONFIG_USB_PWC=m
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_SCANNER is not set
# CONFIG_USB_SE401 is not set
-CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_BELKIN=m
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -313,18 +312,19 @@ CONFIG_USB_SERIAL_KEYSPAN=m
CONFIG_USB_SERIAL_KEYSPAN_MPR=y
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_OMNINET is not set
CONFIG_USB_SERIAL_PL2303=m
@@ -332,7 +332,6 @@ CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_VISOR=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
-CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE_DATAFAB=y
# CONFIG_USB_STORAGE_DEBUG is not set
CONFIG_USB_STORAGE_DPCM=y
@@ -340,12 +339,13 @@ CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_STORAGE_HP8200e=y
# CONFIG_USB_STORAGE_ISD200 is not set
CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE_SDDR09=y
CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_STV680 is not set
# CONFIG_USB_TIGL is not set
-CONFIG_USB_UHCI=m
CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_UHCI=m
# CONFIG_USB_USS720 is not set
# CONFIG_USB_VICAM is not set
# CONFIG_USB_W9968CF is not set
@@ -362,9 +362,9 @@ CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_PROC_FS=y
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_ZORAN_BUZ is not set
# CONFIG_VIDEO_ZORAN_DC10 is not set
+# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_ZORAN_LML33 is not set
# CONFIG_VIDEO_ZR36120 is not set
# CONFIG_W83877F_WDT is not set
diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 3c0d165069..389ae5e181 100644
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -8,13 +8,13 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
-CONFIG_B44=y
-CONFIG_B44_PCI=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_B44=y
CONFIG_BASE_SMALL=0
-CONFIG_BCM47XX=y
CONFIG_BCM47XX_WDT=y
+CONFIG_BCM47XX=y
CONFIG_BITREVERSE=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_BSD_PROCESS_ACCT is not set
@@ -28,9 +28,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -57,8 +57,8 @@ CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
@@ -74,8 +74,8 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_IDE is not set
@@ -94,7 +94,6 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
@@ -103,14 +102,15 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_BCM47XX=y
# CONFIG_NATSEMI is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -139,20 +139,20 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_DEBUG=y
CONFIG_SSB_DRIVER_EXTIF=y
CONFIG_SSB_DRIVER_GIGE=y
CONFIG_SSB_DRIVER_MIPS=y
-CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_EMBEDDED=y
CONFIG_SSB_PCICORE_HOSTMODE=y
-CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
CONFIG_SSB_SERIAL=y
CONFIG_SSB_SPROM=y
+CONFIG_SSB=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
diff --git a/target/linux/brcm47xx/config-2.6.30 b/target/linux/brcm47xx/config-2.6.30
index a6a16c6d16..8305f26e58 100644
--- a/target/linux/brcm47xx/config-2.6.30
+++ b/target/linux/brcm47xx/config-2.6.30
@@ -7,20 +7,20 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
-CONFIG_B44=y
-CONFIG_B44_PCI=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_B44=y
CONFIG_BASE_SMALL=0
-CONFIG_BCM47XX=y
CONFIG_BCM47XX_WDT=y
+CONFIG_BCM47XX=y
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CFE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
# CONFIG_CPU_BIG_ENDIAN is not set
@@ -30,9 +30,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -60,15 +60,15 @@ CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -86,8 +86,8 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
@@ -104,7 +104,6 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
@@ -113,14 +112,15 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_BCM47XX=y
# CONFIG_NATSEMI is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -149,20 +149,20 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLOW_WORK is not set
-CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_DEBUG=y
CONFIG_SSB_DRIVER_EXTIF=y
CONFIG_SSB_DRIVER_GIGE=y
CONFIG_SSB_DRIVER_MIPS=y
-CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_EMBEDDED=y
CONFIG_SSB_PCICORE_HOSTMODE=y
-CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
CONFIG_SSB_SERIAL=y
CONFIG_SSB_SPROM=y
+CONFIG_SSB=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
diff --git a/target/linux/brcm47xx/config-2.6.31 b/target/linux/brcm47xx/config-2.6.31
index 5bcf60cccc..e5bfa7e486 100644
--- a/target/linux/brcm47xx/config-2.6.31
+++ b/target/linux/brcm47xx/config-2.6.31
@@ -10,20 +10,20 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
-CONFIG_B44=y
-CONFIG_B44_PCI=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_B44=y
CONFIG_BASE_SMALL=0
-CONFIG_BCM47XX=y
CONFIG_BCM47XX_WDT=y
+CONFIG_BCM47XX=y
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CFE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
CONFIG_CONSTRUCTORS=y
@@ -34,9 +34,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -58,16 +58,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -81,13 +81,13 @@ CONFIG_HAS_IOPORT=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_IDE=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
@@ -105,7 +105,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -115,14 +114,15 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_BCM47XX=y
# CONFIG_NATSEMI is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -151,20 +151,20 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLOW_WORK is not set
-CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_DEBUG=y
CONFIG_SSB_DRIVER_EXTIF=y
CONFIG_SSB_DRIVER_GIGE=y
CONFIG_SSB_DRIVER_MIPS=y
-CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_EMBEDDED=y
CONFIG_SSB_PCICORE_HOSTMODE=y
-CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
CONFIG_SSB_SERIAL=y
CONFIG_SSB_SPROM=y
+CONFIG_SSB=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
diff --git a/target/linux/brcm63xx/config-2.6.30 b/target/linux/brcm63xx/config-2.6.30
index 3e692652fe..f02683b85a 100644
--- a/target/linux/brcm63xx/config-2.6.30
+++ b/target/linux/brcm63xx/config-2.6.30
@@ -7,11 +7,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_AUDIT=y
CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT=y
CONFIG_BASE_SMALL=0
# CONFIG_BCM47XX is not set
-CONFIG_BCM63XX=y
CONFIG_BCM63XX_CPU_6338=y
CONFIG_BCM63XX_CPU_6345=y
CONFIG_BCM63XX_CPU_6348=y
@@ -19,6 +18,7 @@ CONFIG_BCM63XX_CPU_6358=y
CONFIG_BCM63XX_ENET=y
CONFIG_BCM63XX_PHY=y
CONFIG_BCM63XX_WDT=y
+CONFIG_BCM63XX=y
CONFIG_BINARY_PRINTF=y
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_IO_TRACE=y
@@ -28,8 +28,8 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -38,9 +38,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -69,8 +69,8 @@ CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
@@ -80,15 +80,15 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDWARE_WATCHPOINTS=y
@@ -102,13 +102,13 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
+CONFIG_INOTIFY=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_IRQ_CPU=y
@@ -126,7 +126,6 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_VR41XX is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -136,6 +135,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_BCM963XX=y
@@ -148,33 +148,33 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_CONCAT=y
CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NATSEMI is not set
# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_NOP_TRACER=y
# CONFIG_NO_IOPORT is not set
+CONFIG_NOP_TRACER=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
-CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RELAY=y
CONFIG_RING_BUFFER=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_BCM63XX=y
CONFIG_SERIAL_BCM63XX_CONSOLE=y
+CONFIG_SERIAL_BCM63XX=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -189,14 +189,14 @@ CONFIG_SERIAL_BCM63XX_CONSOLE=y
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
CONFIG_SSB_SPROM=y
+CONFIG_SSB=y
CONFIG_STACKTRACE=y
CONFIG_SWAP_IO_SPACE=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
@@ -207,8 +207,8 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
# CONFIG_TC35815 is not set
CONFIG_TICK_ONESHOT=y
CONFIG_TRACEPOINTS=y
-CONFIG_TRACING=y
CONFIG_TRACING_SUPPORT=y
+CONFIG_TRACING=y
CONFIG_TRAD_SIGNALS=y
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default
index 2396808b95..bab68e2192 100644
--- a/target/linux/cobalt/config-default
+++ b/target/linux/cobalt/config-default
@@ -7,10 +7,10 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
-CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
+CONFIG_ATA=y
CONFIG_BASE_SMALL=0
# CONFIG_BCM47XX is not set
# CONFIG_BINARY_PRINTF is not set
@@ -25,10 +25,10 @@ CONFIG_BLOCK_COMPAT=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CEVT_GT641XX=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
-CONFIG_COMPAT=y
+CONFIG_CEVT_R4K=y
CONFIG_COMPAT_BRK=y
+CONFIG_COMPAT=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -59,8 +59,8 @@ CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
CONFIG_CRC16=y
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DE2104X=y
# CONFIG_DE4X5 is not set
# CONFIG_DEBUG_FS is not set
@@ -75,15 +75,15 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FB=y
CONFIG_FB_COBALT=y
+CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -104,18 +104,18 @@ CONFIG_HID_SUPPORT=y
CONFIG_HW_CONSOLE=y
CONFIG_HW_HAS_PCI=y
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_I8253=y
CONFIG_I8259=y
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_COBALT_BTNS=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_POLLDEV=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_MULTICAST is not set
@@ -129,8 +129,8 @@ CONFIG_LEDS_COBALT_RAQ=y
# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
# CONFIG_LEDS_TRIGGER_TIMER is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
# CONFIG_LOGO is not set
# CONFIG_MACH_ALCHEMY is not set
@@ -141,7 +141,6 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_MACH_VR41XX is not set
# CONFIG_MII is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_N32=y
CONFIG_MIPS32_O32=y
@@ -154,11 +153,12 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
# CONFIG_MISC_DEVICES is not set
# CONFIG_MTD_BLOCK is not set
# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_MTD_CFI is not set
# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_PHYSMAP=y
@@ -172,11 +172,11 @@ CONFIG_NET_TULIP=y
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PATA_VIA=y
-CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_GT64XXX_PCI0=y
CONFIG_PCI_LEGACY=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PMC_MSP is not set
@@ -190,9 +190,9 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_SATA_PMP=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI=y
CONFIG_SECCOMP=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_NR_UARTS=4
@@ -212,28 +212,28 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y
-CONFIG_SYSVIPC_COMPAT=y
CONFIG_SYS_HAS_CPU_NEVADA=y
CONFIG_SYS_HAS_EARLY_PRINTK=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_SYSVIPC_COMPAT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRACING_SUPPORT=y
-CONFIG_TULIP=y
CONFIG_TULIP_MMIO=y
CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI=y
CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP=y
# CONFIG_ULI526X is not set
CONFIG_USB_SUPPORT=y
# CONFIG_VGA_CONSOLE is not set
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_WLAN_80211 is not set
diff --git a/target/linux/coldfire/config-default b/target/linux/coldfire/config-default
index 5596fa9956..c26ec6738e 100644
--- a/target/linux/coldfire/config-default
+++ b/target/linux/coldfire/config-default
@@ -15,13 +15,13 @@ CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
CONFIG_CFV4E=y
CONFIG_CLASSIC_RCU=y
-CONFIG_COLDFIRE=y
# CONFIG_COLDFIRE_EDMA is not set
# CONFIG_COLDFIRE_WATCHDOG is not set
+CONFIG_COLDFIRE=y
# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_FEC_548x=y
CONFIG_FEC_548x_AUTO_NEGOTIATION=y
CONFIG_FEC_548x_ENABLE_FEC2=y
+CONFIG_FEC_548x=y
# CONFIG_GENERIC_CLOCKEVENTS is not set
CONFIG_GENERIC_IOMAP=y
# CONFIG_GENERIC_TIME is not set
@@ -46,8 +46,8 @@ CONFIG_INITRAMFS_SOURCE=""
# CONFIG_M5475DFE is not set
# CONFIG_M5475EFE is not set
# CONFIG_M5475FFE is not set
-# CONFIG_M547X is not set
CONFIG_M547X_8X=y
+# CONFIG_M547X is not set
# CONFIG_M5485AFE is not set
# CONFIG_M5485BFE is not set
CONFIG_M5485CFE=y
@@ -59,8 +59,8 @@ CONFIG_M548X=y
# CONFIG_M68030 is not set
# CONFIG_M68040 is not set
# CONFIG_M68060 is not set
-CONFIG_M68K=y
# CONFIG_M68KFPU_EMU is not set
+CONFIG_M68K=y
# CONFIG_MAC is not set
CONFIG_MCD_DMA=y
CONFIG_MCFCLK=200000000
@@ -74,12 +74,12 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_NEED_MULTIPLE_NODES=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NOR_FLASH_BASE=0xE0000000
# CONFIG_NO_DMA is not set
# CONFIG_NO_IOPORT is not set
-CONFIG_PCI=y
-# CONFIG_PCIPCWATCHDOG is not set
+CONFIG_NOR_FLASH_BASE=0xE0000000
CONFIG_PCI_LEGACY=y
+# CONFIG_PCIPCWATCHDOG is not set
+CONFIG_PCI=y
# CONFIG_PROC_HARDWARE is not set
# CONFIG_Q40 is not set
# CONFIG_R6040 is not set
@@ -88,8 +88,8 @@ CONFIG_PCI_LEGACY=y
CONFIG_SDRAM_BASE=0x00000000
CONFIG_SDRAM_SIZE=0x04000000
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_COLDFIRE=y
# CONFIG_SERIAL_COLDFIRE_IRDA is not set
+CONFIG_SERIAL_COLDFIRE=y
# CONFIG_SERIAL_CONSOLE is not set
# CONFIG_SERIAL_MCF is not set
CONFIG_SINGLE_MEMORY_CHUNK=y
diff --git a/target/linux/etrax/config-2.6.30 b/target/linux/etrax/config-2.6.30
index 17aeeee91e..e288d6217d 100644
--- a/target/linux/etrax/config-2.6.30
+++ b/target/linux/etrax/config-2.6.30
@@ -7,11 +7,10 @@ CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
# CONFIG_BRIDGE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CRIS=y
# CONFIG_CRIS_MACH_ARTPEC3 is not set
+CONFIG_CRIS=y
# CONFIG_ETRAX100LX is not set
CONFIG_ETRAX100LX_V2=y
-# CONFIG_ETRAXFS is not set
CONFIG_ETRAX_ARCH_V10=y
# CONFIG_ETRAX_ARCH_V32 is not set
CONFIG_ETRAX_AXISFLASHMAP=y
@@ -37,9 +36,10 @@ CONFIG_ETRAX_ETHERNET=y
CONFIG_ETRAX_FAST_TIMER=y
CONFIG_ETRAX_FLASH1_SIZE=0
CONFIG_ETRAX_FLASH_BUSWIDTH=2
+# CONFIG_ETRAXFS is not set
CONFIG_ETRAX_GPIO=y
-# CONFIG_ETRAX_I2C is not set
# CONFIG_ETRAX_I2C_GVC is not set
+# CONFIG_ETRAX_I2C is not set
# CONFIG_ETRAX_KMALLOCED_MODULES is not set
CONFIG_ETRAX_LED1G=2
CONFIG_ETRAX_LED1R=2
@@ -101,25 +101,23 @@ CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE=y
# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set
CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1
CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1
-CONFIG_ETRAX_SERIAL=y
# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
-CONFIG_ETRAX_SERIAL_PORT0=y
# CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set
# CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set
# CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set
# CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set
CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y
+CONFIG_ETRAX_SERIAL_PORT0=y
# CONFIG_ETRAX_SERIAL_PORT1 is not set
-CONFIG_ETRAX_SERIAL_PORT2=y
CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
# CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set
# CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set
# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set
-CONFIG_ETRAX_SERIAL_PORT3=y
+CONFIG_ETRAX_SERIAL_PORT2=y
# CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set
# CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set
CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y
@@ -128,7 +126,9 @@ CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN=y
# CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set
# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set
# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set
+CONFIG_ETRAX_SERIAL_PORT3=y
CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5
+CONFIG_ETRAX_SERIAL=y
# CONFIG_ETRAX_SOFT_SHUTDOWN is not set
# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
# CONFIG_ETRAX_USB_HOST is not set
@@ -147,12 +147,12 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_MLOCK=y
# CONFIG_HW_RANDOM is not set
# CONFIG_I2C is not set
-CONFIG_MTDRAM_ABS_POS=0
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTDRAM_TOTAL_SIZE=0
# CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CONCAT=y
CONFIG_MTD_MTDRAM=y
+CONFIG_MTDRAM_ABS_POS=0
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTDRAM_TOTAL_SIZE=0
# CONFIG_NETDEV_1000 is not set
CONFIG_NO_IOPORT=y
# CONFIG_OOM_REBOOT is not set
diff --git a/target/linux/gemini/config-default b/target/linux/gemini/config-default
index 238720e127..c8c885640f 100644
--- a/target/linux/gemini/config-default
+++ b/target/linux/gemini/config-default
@@ -18,15 +18,15 @@ CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M"
-CONFIG_CPU_32=y
CONFIG_CPU_32v4=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV4=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_CPU_CACHE_FA=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_FA=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
CONFIG_CPU_FA526=y
# CONFIG_CPU_ICACHE_DISABLE is not set
@@ -71,25 +71,25 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
+CONFIG_HDLC=m
CONFIG_HDLC_PPP=m
CONFIG_HDLC_RAW=m
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_HWMON=y
CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
+CONFIG_I2C=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
# CONFIG_LEDS_GPIO is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LIB80211 is not set
# CONFIG_MACH_NAS4220B is not set
# CONFIG_MACH_RUT100 is not set
@@ -105,9 +105,9 @@ CONFIG_NLATTR=y
# CONFIG_OUTER_CACHE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
# CONFIG_PCI_STUB is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYLIB=y
CONFIG_SCSI=m
# CONFIG_SCSI_MULTI_LUN is not set
@@ -117,8 +117,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TRACING_SUPPORT=y
CONFIG_UID16=y
-CONFIG_USB=m
# CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB=m
CONFIG_USB_SUPPORT=y
# CONFIG_USB_UHCI_HCD is not set
CONFIG_VECTORS_BASE=0xffff0000
diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index c35d75a999..a087bb9dd9 100644
--- a/target/linux/generic-2.4/config-default
+++ b/target/linux/generic-2.4/config-default
@@ -24,9 +24,9 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_ELF32 is not set
# CONFIG_BINFMT_ELF_AOUT is not set
+CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_CPQ_DA is not set
@@ -88,7 +88,6 @@ CONFIG_CPU_MIPS32=y
# CONFIG_CPU_VR41XX is not set
# CONFIG_CRAMFS is not set
CONFIG_CROSSCOMPILE=y
-CONFIG_CRYPTO=y
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
@@ -111,6 +110,7 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO=y
# CONFIG_DDB5074 is not set
# CONFIG_DDB5476 is not set
# CONFIG_DDB5477 is not set
@@ -139,27 +139,27 @@ CONFIG_FAT_FS=m
# CONFIG_FDDI is not set
# CONFIG_FTAPE is not set
# CONFIG_FTL is not set
-# CONFIG_FUSION is not set
# CONFIG_FUSION_BOOT is not set
# CONFIG_FUSION_CTL is not set
# CONFIG_FUSION_ISENSE is not set
+# CONFIG_FUSION is not set
# CONFIG_FUSION_LAN is not set
# CONFIG_FW_LOADER is not set
# CONFIG_GDB_CONSOLE is not set
# CONFIG_HAMACHI is not set
# CONFIG_HERMES is not set
-CONFIG_HFSPLUS_FS=m
# CONFIG_HFS_FS is not set
+CONFIG_HFSPLUS_FS=m
# CONFIG_HIGHMEM is not set
# CONFIG_HIPPI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HOTPLUG_PCI is not set
# CONFIG_HOTPLUG_PCI_COMPAQ is not set
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+# CONFIG_HOTPLUG_PCI is not set
# CONFIG_HOTPLUG_PCI_PCIE is not set
# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
# CONFIG_HOTPLUG_PCI_SHPC is not set
# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
+CONFIG_HOTPLUG=y
# CONFIG_HPFS_FS is not set
# CONFIG_HP_LASERJET is not set
# CONFIG_I2C is not set
@@ -174,11 +174,11 @@ CONFIG_HOTPLUG=y
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_VIDEO1394 is not set
CONFIG_IMQ=m
-CONFIG_INET=y
# CONFIG_INET_ECN is not set
-# CONFIG_INPUT is not set
+CONFIG_INET=y
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_GAMEPORT is not set
+# CONFIG_INPUT is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_KEYBDEV is not set
# CONFIG_INPUT_MOUSEDEV is not set
@@ -195,7 +195,6 @@ CONFIG_IP6_NF_MATCH_FRAG=m
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
CONFIG_IP6_NF_MATCH_LENGTH=m
CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP6_NF_MATCH_MAC=m
CONFIG_IP6_NF_MATCH_MARK=m
CONFIG_IP6_NF_MATCH_MULTIPORT=m
@@ -208,22 +207,19 @@ CONFIG_IP6_NF_TARGET_IMQ=m
CONFIG_IP6_NF_TARGET_LOG=m
CONFIG_IP6_NF_TARGET_MARK=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IPMI_DEVICE_INTERFACE is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_IPMI_KCS is not set
# CONFIG_IPMI_PANIC_EVENT is not set
# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-CONFIG_IPV6=m
-# CONFIG_IPX is not set
-CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MROUTE=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_IP_NF_ARPTABLES=m
# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
CONFIG_IP_NF_CONNTRACK=m
@@ -245,8 +241,9 @@ CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_IPP2P=m
-CONFIG_IP_NF_MATCH_LAYER7=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
+CONFIG_IP_NF_MATCH_LAYER7=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_LIMIT=m
CONFIG_IP_NF_MATCH_MAC=m
@@ -266,11 +263,11 @@ CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MMS=m
-CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_H323=m
CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_MMS=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_NAT_PPTP=m
@@ -281,19 +278,19 @@ CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_RTSP=m
-CONFIG_IP_NF_SET=m
CONFIG_IP_NF_SET_HASHSIZE=1024
CONFIG_IP_NF_SET_IPHASH=m
CONFIG_IP_NF_SET_IPMAP=m
CONFIG_IP_NF_SET_IPTREE=m
+CONFIG_IP_NF_SET=m
CONFIG_IP_NF_SET_MACIPMAP=m
CONFIG_IP_NF_SET_MAX=256
CONFIG_IP_NF_SET_NETHASH=m
CONFIG_IP_NF_SET_PORTMAP=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
CONFIG_IP_NF_TARGET_CONNMARK=m
CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_MARK=m
@@ -317,20 +314,23 @@ CONFIG_IP_ROUTE_NAT=y
CONFIG_IP_ROUTE_TOS=y
# CONFIG_IP_ROUTE_VERBOSE is not set
# CONFIG_IP_SCTP is not set
+CONFIG_IPSEC_NAT_TRAVERSAL=y
+CONFIG_IPV6=m
+# CONFIG_IPX is not set
# CONFIG_IRDA is not set
# CONFIG_ISA is not set
# CONFIG_ISAPNP is not set
# CONFIG_ISDN is not set
CONFIG_ISO9660_FS=m
-CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD=m
# CONFIG_JFFS2_BBC_ARMLIB is not set
CONFIG_JFFS2_BBC_LZARI=y
# CONFIG_JFFS2_BBC_LZHD is not set
# CONFIG_JFFS2_BBC_LZO is not set
# CONFIG_JFFS2_BBC_LZSS is not set
-CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=y
# CONFIG_JFFS_FS is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_FS is not set
@@ -356,13 +356,12 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MD_RAID0 is not set
# CONFIG_MD_RAID1 is not set
# CONFIG_MD_RAID5 is not set
-# CONFIG_MINIX_SUBPARTITION is not set
CONFIG_MINI_FO=y
-CONFIG_MIPS=y
-CONFIG_MIPS32=y
+# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_MIPS32_COMPAT is not set
# CONFIG_MIPS32_N32 is not set
# CONFIG_MIPS32_O32 is not set
+CONFIG_MIPS32=y
# CONFIG_MIPS64 is not set
# CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_AU1000 is not set
@@ -391,21 +390,20 @@ CONFIG_MIPS32=y
# CONFIG_MIPS_SEAD is not set
# CONFIG_MIPS_UNCACHED is not set
# CONFIG_MIPS_XXS1500 is not set
+CONFIG_MIPS=y
CONFIG_MODULES=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
# CONFIG_MOMENCO_OCELOT_C is not set
# CONFIG_MOMENCO_OCELOT_G is not set
+# CONFIG_MOMENCO_OCELOT is not set
# CONFIG_MOUSE is not set
CONFIG_MSDOS_PARTITION=y
-CONFIG_MTD=y
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AMDSTD is not set
# CONFIG_MTD_BLKMTD is not set
CONFIG_MTD_BLOCK=y
# CONFIG_MTD_BOSPORUS is not set
-CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_MTD_CFI_AMDSTD=y
# CONFIG_MTD_CFI_B1 is not set
@@ -422,6 +420,7 @@ CONFIG_MTD_CFI_INTELEXT=y
# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
CONFIG_MTD_CFI_NOSWAP=y
# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI=y
CONFIG_MTD_CHAR=y
# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_CONCAT is not set
@@ -458,51 +457,51 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_SHARP is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_XXS1500 is not set
+CONFIG_MTD=y
# CONFIG_MYRI_SBUS is not set
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCP_FS is not set
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_SMALLDOS is not set
# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCP_FS is not set
# CONFIG_NEC_EAGLE is not set
# CONFIG_NEC_OSPREY is not set
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETLINK_DEV=m
-CONFIG_NET_CLS=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_POLICE=y
-CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS=y
+CONFIG_NETDEVICES=y
# CONFIG_NET_DIVERT is not set
CONFIG_NET_ESTIMATOR=y
CONFIG_NET_ETHERNET=y
# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_FC is not set
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER=y
# CONFIG_NET_HW_FLOWCONTROL is not set
-CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_NET_IPGRE=m
CONFIG_NET_IPIP=m
# CONFIG_NET_ISA is not set
+CONFIG_NETLINK_DEV=m
# CONFIG_NET_PKTGEN is not set
# CONFIG_NET_POCKET is not set
CONFIG_NET_QOS=y
CONFIG_NET_RADIO=y
CONFIG_NET_RANDOM=y
-CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_CSZ=m
CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCHED=y
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_HTB=m
@@ -516,15 +515,15 @@ CONFIG_NET_SCH_TEQL=m
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NET=y
+# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
# CONFIG_NFSD_TCP is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD_V3=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFTL is not set
# CONFIG_NINO is not set
-CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_1250=m
# CONFIG_NLS_CODEPAGE_1251 is not set
CONFIG_NLS_CODEPAGE_437=m
@@ -548,10 +547,10 @@ CONFIG_NLS_CODEPAGE_850=m
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
@@ -563,6 +562,7 @@ CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
# CONFIG_NLS_KOI8_U is not set
CONFIG_NLS_UTF8=m
+CONFIG_NLS=y
CONFIG_NONCOHERENT_IO=y
# CONFIG_NS83820 is not set
CONFIG_NTFS_FS=m
@@ -571,8 +571,8 @@ CONFIG_NTFS_FS=m
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_OOM_KILLER is not set
# CONFIG_OSF_PARTITION is not set
-CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
+CONFIG_PACKET=y
# CONFIG_PAGE_SIZE_16KB is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
@@ -586,14 +586,14 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PMC_STRETCH is not set
# CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNP is not set
-CONFIG_PPP=m
-CONFIG_PPPOE=m
CONFIG_PPP_ASYNC=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_FILTER=y
+CONFIG_PPP=m
CONFIG_PPP_MPPE_MPPC=m
# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPPOE=m
CONFIG_PPP_SYNC_TTY=m
# CONFIG_PRISM54 is not set
CONFIG_PROC_FS=y
@@ -616,7 +616,6 @@ CONFIG_RAMFS=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
# CONFIG_SBUS is not set
-CONFIG_SCSI=m
# CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_ACARD is not set
@@ -636,8 +635,8 @@ CONFIG_SCSI=m
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_EATA_DMA is not set
+# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_EATA_PIO is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
@@ -646,8 +645,9 @@ CONFIG_SCSI=m
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI=m
# CONFIG_SCSI_MEGARAID2 is not set
+# CONFIG_SCSI_MEGARAID is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NCR53C7xx is not set
@@ -657,8 +657,8 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_PCI2220I is not set
# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_SATA_AHCI is not set
+# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_SATA_NV is not set
# CONFIG_SCSI_SATA_PROMISE is not set
# CONFIG_SCSI_SATA_QSTOR is not set
@@ -673,13 +673,13 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCx200 is not set
# CONFIG_SCx200_GPIO is not set
+# CONFIG_SCx200 is not set
CONFIG_SD_EXTRA_DEVS=5
-CONFIG_SERIAL=y
CONFIG_SERIAL_CONSOLE=y
# CONFIG_SERIAL_EXTENDED is not set
# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_PARTITION is not set
@@ -693,19 +693,19 @@ CONFIG_SHAPER=m
# CONFIG_SMB_NLS is not set
# CONFIG_SNI_RM200_PCI is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS=y
# CONFIG_STRIP is not set
# CONFIG_SUNBMAC is not set
# CONFIG_SUNGEM is not set
# CONFIG_SUNLANCE is not set
+# CONFIG_SUN_PARTITION is not set
# CONFIG_SUNQE is not set
CONFIG_SUNRPC=m
-# CONFIG_SUN_PARTITION is not set
CONFIG_SYN_COOKIES=y
CONFIG_SYSCTL=y
-CONFIG_SYSVIPC=y
# CONFIG_SYSV_FS is not set
+CONFIG_SYSVIPC=y
# CONFIG_TANBAC_TB0226 is not set
# CONFIG_TANBAC_TB0229 is not set
# CONFIG_TC is not set
@@ -721,23 +721,23 @@ CONFIG_TUN=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_UMSDOS_FS is not set
-CONFIG_UNIX=y
-CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=128
+CONFIG_UNIX98_PTYS=y
# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_UNIX=y
# CONFIG_USB_BLUETOOTH is not set
# CONFIG_USB_GADGET is not set
CONFIG_USB_USBNET=m
CONFIG_VFAT_FS=m
# CONFIG_VICTOR_MPC30X is not set
CONFIG_VLAN_8021Q=y
-# CONFIG_VT is not set
# CONFIG_VTAG_ICACHE is not set
+# CONFIG_VT is not set
# CONFIG_VXFS_FS is not set
# CONFIG_WAN is not set
CONFIG_WAN_ROUTER=m
-CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG=y
# CONFIG_WAVELAN is not set
# CONFIG_WDT_W83627 is not set
# CONFIG_X25 is not set
@@ -748,7 +748,7 @@ CONFIG_XFS_FS=m
# CONFIG_XFS_TRACE is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_ZAO_CAPCELLA is not set
-# CONFIG_ZISOFS is not set
# CONFIG_ZISOFS_FS is not set
+# CONFIG_ZISOFS is not set
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 6ab9a66bbf..ce1861c2d3 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -541,8 +541,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE is not set
# CONFIG_FCOE_FNIC is not set
+# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
# CONFIG_FEALNX is not set
CONFIG_FIB_RULES=y
@@ -650,10 +650,10 @@ CONFIG_HOTPLUG=y
# CONFIG_HVC_UDBG is not set
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_AMD is not set
# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
@@ -1007,10 +1007,10 @@ CONFIG_KMOD=y
# CONFIG_LASAT is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_LBD is not set
-# CONFIG_LDM_PARTITION is not set
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LDM_PARTITION is not set
# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
@@ -1832,8 +1832,8 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_LM75 is not set
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 3f71c3dfd3..ccc7adf605 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -558,8 +558,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE is not set
# CONFIG_FCOE_FNIC is not set
+# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
# CONFIG_FEALNX is not set
CONFIG_FIB_RULES=y
@@ -672,10 +672,10 @@ CONFIG_HOTPLUG=y
# CONFIG_HVC_UDBG is not set
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_AMD is not set
# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
@@ -1034,10 +1034,10 @@ CONFIG_KMOD=y
# CONFIG_LATENCYTOP is not set
# CONFIG_LBDAF is not set
# CONFIG_LBD is not set
-# CONFIG_LDM_PARTITION is not set
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LDM_PARTITION is not set
# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
@@ -1875,8 +1875,8 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_LM75 is not set
diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index 072a2413e6..7e82d8af29 100644
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -9,8 +9,8 @@ CONFIG_ARCH_GOLDFISH=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
CONFIG_ARM_THUMB=y
+CONFIG_ARM=y
# CONFIG_BACKTRACE_SELF_TEST is not set
CONFIG_BASE_SMALL=0
CONFIG_BATTERY_GOLDFISH=y
@@ -22,15 +22,15 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
CONFIG_CMDLINE="console=/dev/ttyS0 root=mtdblock0 rootdelay=1 rootfstype=yaffs2"
# CONFIG_CONSOLE_EARLYSUSPEND is not set
CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5TJ=y
CONFIG_CPU_ARM926T=y
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
CONFIG_CPU_PABRT_NOIFAR=y
@@ -51,8 +51,8 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
@@ -73,7 +73,6 @@ CONFIG_DEVKMEM=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_EARLYSUSPEND=y
# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
@@ -81,17 +80,18 @@ CONFIG_FB_EARLYSUSPEND=y
CONFIG_FB_GOLDFISH=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
+CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_POINTER=y
CONFIG_FREEZER=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_FIND_LAST_BIT=y
# CONFIG_GENERIC_GPIO is not set
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
@@ -113,22 +113,22 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HID=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_GPIO=y
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_KEYRESET=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT=y
# CONFIG_ISDN is not set
# CONFIG_JFFS2_CMODE_PRIORITY is not set
CONFIG_JFFS2_CMODE_SIZE=y
@@ -149,11 +149,11 @@ CONFIG_MACH_GOLDFISH=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_GOLDFISH_NAND=y
CONFIG_MTD_NAND=y
-CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
@@ -164,11 +164,11 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PAGE_POISONING is not set
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PDA_POWER is not set
-CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
# CONFIG_PROVE_LOCKING is not set
CONFIG_QEMU_TRACE=y
# CONFIG_RCU_TORTURE_TEST is not set
@@ -177,15 +177,15 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_CMOS is not set
CONFIG_RTC_DRV_GOLDFISH=y
# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_SCHEDSTATS is not set
CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SMC91X=y
CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_ONESHOT=y
# CONFIG_TIMER_STATS is not set
@@ -198,11 +198,11 @@ CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VFP=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WAKELOCK=y
+CONFIG_VT=y
CONFIG_WAKELOCK_STAT=y
+CONFIG_WAKELOCK=y
# CONFIG_WATCHDOG is not set
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_ZBOOT_ROM_TEXT=0
diff --git a/target/linux/ifxmips/config-2.6.30 b/target/linux/ifxmips/config-2.6.30
index 67132b65af..49befd554d 100644
--- a/target/linux/ifxmips/config-2.6.30
+++ b/target/linux/ifxmips/config-2.6.30
@@ -14,8 +14,8 @@ CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -24,9 +24,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -48,16 +48,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -76,16 +76,16 @@ CONFIG_HAVE_STD_PC_SERIAL_PORT=y
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-CONFIG_IFXMIPS=y
CONFIG_IFXMIPS_GPIO_RST_BTN=y
CONFIG_IFXMIPS_MII0=y
# CONFIG_IFXMIPS_PROM_ASC0 is not set
CONFIG_IFXMIPS_PROM_ASC1=y
CONFIG_IFXMIPS_WDT=y
+CONFIG_IFXMIPS=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQ_CPU=y
CONFIG_KALLSYMS=y
@@ -99,7 +99,6 @@ CONFIG_LEDS_IFXMIPS=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -110,6 +109,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
# CONFIG_MIPS_VPE_LOADER is not set
+CONFIG_MIPS=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_MTD_CFI_GEOMETRY=y
# CONFIG_MTD_CFI_INTELEXT is not set
@@ -122,8 +122,8 @@ CONFIG_MTD_IFXMIPS=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
diff --git a/target/linux/ifxmips/nfs/config-2.6.26 b/target/linux/ifxmips/nfs/config-2.6.26
index 137af82d44..19d7d2aa19 100644
--- a/target/linux/ifxmips/nfs/config-2.6.26
+++ b/target/linux/ifxmips/nfs/config-2.6.26
@@ -4,13 +4,13 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MD5=y
-CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP=y
CONFIG_LOCKD=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=y
diff --git a/target/linux/ifxmips/nfs/config-2.6.27 b/target/linux/ifxmips/nfs/config-2.6.27
index 137af82d44..19d7d2aa19 100644
--- a/target/linux/ifxmips/nfs/config-2.6.27
+++ b/target/linux/ifxmips/nfs/config-2.6.27
@@ -4,13 +4,13 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MD5=y
-CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP=y
CONFIG_LOCKD=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=y
diff --git a/target/linux/ifxmips/nfs/config-2.6.28 b/target/linux/ifxmips/nfs/config-2.6.28
index 097bcfd57c..8e1884211e 100644
--- a/target/linux/ifxmips/nfs/config-2.6.28
+++ b/target/linux/ifxmips/nfs/config-2.6.28
@@ -1,23 +1,23 @@
CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_RNG2=y
-CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP=y
CONFIG_LOCKD=y
# CONFIG_NETFILTER is not set
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=y
diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index be0a64ffd6..e737123d6b 100644
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -10,15 +10,15 @@ CONFIG_ARCH_IOP32X=y
CONFIG_ARCH_SUPPORTS_AOUT=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_ASYNC_CORE=y
CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATM is not set
# CONFIG_ATMEL is not set
+# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -30,12 +30,12 @@ CONFIG_BOUNCE=y
# CONFIG_CIFS_STATS is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_DISABLE is not set
CONFIG_CPU_PABRT_NOIFAR=y
CONFIG_CPU_TLB_V4WBI=y
@@ -52,11 +52,11 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_DNOTIFY=y
# CONFIG_DSCC4 is not set
-# CONFIG_E100 is not set
-CONFIG_E1000=y
-# CONFIG_E1000E_ENABLED is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_E1000E_ENABLED is not set
CONFIG_E1000_NAPI=y
+CONFIG_E1000=y
+# CONFIG_E100 is not set
# CONFIG_FARSYNC is not set
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
@@ -77,20 +77,20 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
+CONFIG_HDLC=m
CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
# CONFIG_HDLC_RAW_ETH is not set
+CONFIG_HDLC_RAW=m
# CONFIG_HERMES is not set
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_HWMON=y
CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INTEL_IOP_ADMA=y
@@ -103,8 +103,6 @@ CONFIG_INTEL_IOP_ADMA=y
# CONFIG_IP6_NF_MATCH_OPTS is not set
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_ARPTABLES is not set
@@ -120,19 +118,21 @@ CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_TARGET_ULOG is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_IWMMXT is not set
# CONFIG_LANMEDIA is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LLC2 is not set
CONFIG_LZO_COMPRESS=m
CONFIG_LZO_DECOMPRESS=m
# CONFIG_MACH_EM7210 is not set
# CONFIG_MACH_GLANTANK is not set
CONFIG_MACH_N2100=y
-CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
@@ -153,8 +153,8 @@ CONFIG_NET_DMA=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NO_IDLE_HZ is not set
# CONFIG_NO_IOPORT is not set
@@ -164,17 +164,17 @@ CONFIG_NET_DMA=y
# CONFIG_OUTER_CACHE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PC300 is not set
-CONFIG_PCI=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PLAT_IOP=y
# CONFIG_PPP is not set
# CONFIG_PRISM54 is not set
# CONFIG_R6040 is not set
-CONFIG_R8169=y
CONFIG_R8169_NAPI=y
CONFIG_R8169_VLAN=y
+CONFIG_R8169=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_X1205=y
@@ -187,12 +187,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
# CONFIG_TICK_ONESHOT is not set
CONFIG_UID16=y
-CONFIG_USB=m
# CONFIG_USB_ACM is not set
# CONFIG_USB_CATC is not set
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_KAWETH is not set
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
@@ -216,8 +216,8 @@ CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VIA_RHINE is not set
CONFIG_VIDEO_MEDIA=m
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
# CONFIG_WANXL is not set
+CONFIG_WAN=y
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_XSCALE_PMU=y
diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index 436f32ef3d..eed45f2dde 100644
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@@ -15,8 +15,8 @@ CONFIG_ARCH_SUPPORTS_AOUT=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_AT24=y
@@ -24,8 +24,8 @@ CONFIG_AT24=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
-# CONFIG_ATM is not set
# CONFIG_ATMEL is not set
+# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -35,13 +35,13 @@ CONFIG_BOUNCE=y
# CONFIG_CIFS_STATS is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
CONFIG_CPU_IXP43X=y
CONFIG_CPU_IXP46X=y
CONFIG_CPU_PABRT_NOIFAR=y
@@ -52,15 +52,15 @@ CONFIG_CRC16=y
# CONFIG_DEBUG_USER is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
-CONFIG_DMABOUNCE=y
CONFIG_DMABOUNCE_DEBUG=y
+CONFIG_DMABOUNCE=y
CONFIG_DNOTIFY=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
CONFIG_GENERIC_GPIO=y
@@ -90,18 +90,18 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HERMES is not set
# CONFIG_HID is not set
CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
# CONFIG_I2C_ISCH is not set
+CONFIG_I2C=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_INPUT is not set
@@ -121,8 +121,8 @@ CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LLC2 is not set
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
@@ -139,8 +139,8 @@ CONFIG_MACH_LOFT=y
CONFIG_MACH_MI424WR=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
+CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -165,8 +165,8 @@ CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NATSEMI is not set
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NVRAM is not set
@@ -175,8 +175,8 @@ CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_IXP4XX_CF is not set
# CONFIG_PATA_SCH is not set
-CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
# CONFIG_R6040 is not set
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1672=y
@@ -200,12 +200,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_ONESHOT=y
CONFIG_UID16=y
-# CONFIG_USB is not set
CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
# CONFIG_USB_EHCI_HCD is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
# CONFIG_USB_OHCI_HCD is not set
diff --git a/target/linux/ixp4xx/config-2.6.30 b/target/linux/ixp4xx/config-2.6.30
index cf64c60fb4..98fb4e1f82 100644
--- a/target/linux/ixp4xx/config-2.6.30
+++ b/target/linux/ixp4xx/config-2.6.30
@@ -15,20 +15,20 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
CONFIG_CPU_IXP43X=y
CONFIG_CPU_IXP46X=y
CONFIG_CPU_PABRT_NOIFAR=y
@@ -48,14 +48,14 @@ CONFIG_EEPROM_AT24=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
CONFIG_GPIO_GW_I2C_PLD=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -72,17 +72,17 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MTD_OTP=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
@@ -99,8 +99,8 @@ CONFIG_IXP4XX_WATCHDOG=y
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LIB80211 is not set
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
@@ -117,8 +117,8 @@ CONFIG_MACH_LOFT=y
CONFIG_MACH_MI424WR=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
+CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -138,9 +138,9 @@ CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_OUTER_CACHE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
# CONFIG_PCI_STUB is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYLIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1672=y
diff --git a/target/linux/ixp4xx/config-2.6.31 b/target/linux/ixp4xx/config-2.6.31
index 79bb193f62..8a600a9a53 100644
--- a/target/linux/ixp4xx/config-2.6.31
+++ b/target/linux/ixp4xx/config-2.6.31
@@ -12,20 +12,20 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
CONFIG_CPU_ENDIAN_BE32=y
# CONFIG_CPU_ENDIAN_BE8 is not set
CONFIG_CPU_IXP43X=y
@@ -45,14 +45,14 @@ CONFIG_EEPROM_AT24=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
CONFIG_GPIO_GW_I2C_PLD=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -69,17 +69,17 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MTD_OTP=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
@@ -94,8 +94,8 @@ CONFIG_IXP4XX_WATCHDOG=y
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
CONFIG_MACH_CAMBRIA=y
@@ -112,8 +112,8 @@ CONFIG_MACH_LOFT=y
CONFIG_MACH_MI424WR=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
+CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -129,8 +129,8 @@ CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NVRAM is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYLIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1672=y
diff --git a/target/linux/ixp4xx/config-2.6.32 b/target/linux/ixp4xx/config-2.6.32
index 79bb193f62..8a600a9a53 100644
--- a/target/linux/ixp4xx/config-2.6.32
+++ b/target/linux/ixp4xx/config-2.6.32
@@ -12,20 +12,20 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
CONFIG_CPU_ENDIAN_BE32=y
# CONFIG_CPU_ENDIAN_BE8 is not set
CONFIG_CPU_IXP43X=y
@@ -45,14 +45,14 @@ CONFIG_EEPROM_AT24=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
CONFIG_GPIO_GW_I2C_PLD=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -69,17 +69,17 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MTD_OTP=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
@@ -94,8 +94,8 @@ CONFIG_IXP4XX_WATCHDOG=y
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
CONFIG_MACH_CAMBRIA=y
@@ -112,8 +112,8 @@ CONFIG_MACH_LOFT=y
CONFIG_MACH_MI424WR=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
+CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -129,8 +129,8 @@ CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NVRAM is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYLIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1672=y
diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index d1e1656986..a548e666c6 100644
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -14,16 +14,16 @@ CONFIG_ARCH_SUPPORTS_AOUT=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
-# CONFIG_ATM is not set
# CONFIG_ATMEL is not set
+# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -35,13 +35,13 @@ CONFIG_BOUNCE=y
# CONFIG_CIFS_STATS is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_DISABLE is not set
CONFIG_CPU_IXP43X=y
CONFIG_CPU_IXP46X=y
@@ -55,19 +55,19 @@ CONFIG_DEVPORT=y
CONFIG_DLCI=m
CONFIG_DLCI_MAX=8
# CONFIG_DM9000 is not set
-CONFIG_DMABOUNCE=y
CONFIG_DMABOUNCE_DEBUG=y
+CONFIG_DMABOUNCE=y
CONFIG_DNOTIFY=y
# CONFIG_DSCC4 is not set
-# CONFIG_E100 is not set
# CONFIG_E1000E_ENABLED is not set
+# CONFIG_E100 is not set
# CONFIG_FARSYNC is not set
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
CONFIG_GENERIC_GPIO=y
@@ -82,30 +82,30 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
+CONFIG_HDLC=m
CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
# CONFIG_HDLC_RAW_ETH is not set
+CONFIG_HDLC_RAW=m
# CONFIG_HERMES is not set
CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_I2C=y
+CONFIG_HW_RANDOM=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=m
# CONFIG_INPUT_IXP4XX_BEEPER is not set
+CONFIG_INPUT=m
# CONFIG_IP6_NF_MANGLE is not set
# CONFIG_IP6_NF_MATCH_EUI64 is not set
# CONFIG_IP6_NF_MATCH_FRAG is not set
@@ -114,8 +114,6 @@ CONFIG_INPUT=m
# CONFIG_IP6_NF_MATCH_OPTS is not set
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_ARPTABLES is not set
@@ -131,6 +129,8 @@ CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_TARGET_ULOG is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_IWMMXT is not set
CONFIG_IXP4XX_ETH=y
@@ -143,8 +143,8 @@ CONFIG_IXP4XX_WATCHDOG=y
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LLC2 is not set
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
@@ -160,8 +160,8 @@ CONFIG_MACH_IXDPG425=y
CONFIG_MACH_LOFT=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
+CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -191,8 +191,8 @@ CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NVRAM is not set
@@ -202,10 +202,10 @@ CONFIG_PATA_ARTOP=m
CONFIG_PATA_IXP4XX_CF=m
# CONFIG_PATA_SCH is not set
# CONFIG_PC300 is not set
-CONFIG_PCI=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
# CONFIG_PRISM54 is not set
# CONFIG_R6040 is not set
CONFIG_RTC_CLASS=y
@@ -227,12 +227,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_ONESHOT=y
CONFIG_UID16=y
-CONFIG_USB=m
CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
@@ -246,8 +246,8 @@ CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VIA_VELOCITY=m
CONFIG_VIDEO_MEDIA=m
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
# CONFIG_WANXL is not set
+CONFIG_WAN=y
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_XSCALE_PMU=y
diff --git a/target/linux/ixp4xx/harddisk/config-default b/target/linux/ixp4xx/harddisk/config-default
index ba39e85f05..ef9a47c7e8 100644
--- a/target/linux/ixp4xx/harddisk/config-default
+++ b/target/linux/ixp4xx/harddisk/config-default
@@ -1,19 +1,19 @@
-CONFIG_CMDLINE="root=/dev/sda1 noinitrd console=ttyS0,115200"
CONFIG_ATA=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CMDLINE="root=/dev/sda1 noinitrd console=ttyS0,115200"
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_JBD=y
+CONFIG_REISERFS_FS=y
CONFIG_SATA_VIA=y
+CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_STORAGE=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_REISERFS_FS=y
+CONFIG_USB=y
diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-2.6.30
index b048d6d172..a74afc6043 100644
--- a/target/linux/mpc52xx/config-2.6.30
+++ b/target/linux/mpc52xx/config-2.6.30
@@ -28,20 +28,20 @@ CONFIG_BOUNCE=y
# CONFIG_BRIDGE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE="console=ttyPSC0,115200"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyPSC0,115200"
CONFIG_COMPAT_BRK=y
# CONFIG_CPU_FREQ is not set
CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
@@ -63,15 +63,15 @@ CONFIG_ELF_CORE=y
# CONFIG_EMBEDDED6xx is not set
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_EPOLL is not set
-CONFIG_FEC_MPC52xx=y
CONFIG_FEC_MPC52xx_MDIO=y
+CONFIG_FEC_MPC52xx=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FREEZER=y
# CONFIG_FSL_ULI1575 is not set
# CONFIG_FW_LOADER is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -81,8 +81,8 @@ CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_NVRAM=y
# CONFIG_GENERIC_TBSYNC is not set
CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GEN_RTC=y
# CONFIG_GEN_RTC_X is not set
+CONFIG_GEN_RTC=y
CONFIG_GPIOLIB=y
CONFIG_GROUP_SCHED=y
# CONFIG_HAMRADIO is not set
@@ -105,39 +105,39 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_LMB=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HVC_RTAS is not set
# CONFIG_HVC_UDBG is not set
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
+CONFIG_INOTIFY=y
# CONFIG_IOMMU_HELPER is not set
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_CFQ=y
-# CONFIG_IPIC is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IPIC is not set
# CONFIG_IP_MROUTE is not set
-CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_DHCP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IRQSTACKS is not set
+CONFIG_IP_PNP=y
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISDN is not set
CONFIG_KERNEL_START=0xc0000000
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
CONFIG_LOWMEM_SIZE=0x30000000
CONFIG_LXT_PHY=y
# CONFIG_MACINTOSH_DRIVERS is not set
@@ -154,29 +154,28 @@ CONFIG_MIGRATION=y
# CONFIG_NET_SCHED is not set
# CONFIG_NEW_LEDS is not set
# CONFIG_NVRAM is not set
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
+CONFIG_OF=y
# CONFIG_PACKET_MMAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_LEGACY=y
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
+CONFIG_PM=y
# CONFIG_PPC_16K_PAGES is not set
# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC32=y
CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC64 is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_82xx is not set
# CONFIG_PPC_83xx is not set
@@ -184,8 +183,8 @@ CONFIG_PPC_4K_PAGES=y
# CONFIG_PPC_86xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BESTCOMM=y
CONFIG_PPC_BESTCOMM_FEC=y
+CONFIG_PPC_BESTCOMM=y
CONFIG_PPC_BOOK3S=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
@@ -209,14 +208,15 @@ CONFIG_PPC_MPC5200_GPIO=y
# CONFIG_PPC_MPC5200_SIMPLE is not set
CONFIG_PPC_MPC52xx=y
CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF=y
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+CONFIG_PPC_OF=y
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_RTAS=y
-CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_32=y
+CONFIG_PPC_STD_MMU=y
# CONFIG_PPC_UDBG_16550 is not set
+CONFIG_PPC=y
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PROC_DEVICETREE=y
@@ -231,9 +231,9 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
CONFIG_SECCOMP=y
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx=y
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y
@@ -241,11 +241,11 @@ CONFIG_SLUB=y
# CONFIG_SPI_MPC52xx_PSC is not set
# CONFIG_SQUASHFS is not set
# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_TASK_SIZE=0xc0000000
# CONFIG_TAU is not set
# CONFIG_TCP_CONG_ADVANCED is not set
diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
index 41fb24182e..c37f3a631b 100644
--- a/target/linux/mpc83xx/config-default
+++ b/target/linux/mpc83xx/config-default
@@ -20,10 +20,10 @@ CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_ASP834x is not set
-CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
+CONFIG_ATA=y
CONFIG_AUDIT_ARCH=y
CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
@@ -32,8 +32,8 @@ CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
# CONFIG_BRIQ_PANEL is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="console=ttyS0,115200"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,115200"
# CONFIG_CPU_FREQ is not set
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER2=y
@@ -57,8 +57,8 @@ CONFIG_FSL_PQ_MDIO=y
CONFIG_FSL_SOC=y
# CONFIG_FSL_ULI1575 is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -95,17 +95,17 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HVC_RTAS is not set
# CONFIG_HVC_UDBG is not set
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IOMMU_HELPER is not set
CONFIG_IPIC=y
-# CONFIG_IRQSTACKS is not set
CONFIG_IRQ_PER_CPU=y
-# CONFIG_ISA is not set
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_JFFS2_FS is not set
CONFIG_KERNEL_START=0xc0000000
# CONFIG_LEDS_GPIO is not set
@@ -124,37 +124,36 @@ CONFIG_LOWMEM_SIZE=0x30000000
# CONFIG_MPC837x_MDS is not set
# CONFIG_MPC837x_RDB is not set
# CONFIG_MPC8xxx_GPIO is not set
-CONFIG_MPIC=y
# CONFIG_MPIC_WEIRD is not set
+CONFIG_MPIC=y
# CONFIG_MTD_CFI is not set
-CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_FSL_ELBC is not set
# CONFIG_MTD_NAND_FSL_UPM is not set
CONFIG_MTD_NAND_RB_PPC=y
+CONFIG_MTD_NAND=y
# CONFIG_MTD_OF_PARTS is not set
# CONFIG_NATSEMI is not set
# CONFIG_NVRAM is not set
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
+CONFIG_OF=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
CONFIG_PATA_RB_PPC=m
# CONFIG_PATA_SCH is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC=y
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
# CONFIG_PPC_16K_PAGES is not set
# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC32=y
CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC64 is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_82xx is not set
CONFIG_PPC_83xx=y
@@ -180,14 +179,15 @@ CONFIG_PPC_MPC106=y
# CONFIG_PPC_MPC52xx is not set
CONFIG_PPC_MPC834x=y
CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF=y
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+CONFIG_PPC_OF=y
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_RTAS=y
-CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_32=y
+CONFIG_PPC_STD_MMU=y
CONFIG_PPC_UDBG_16550=y
+CONFIG_PPC=y
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PROC_DEVICETREE=y
diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index 88960d400a..c0cf4b4241 100644
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -1,9 +1,9 @@
# CONFIG_32BIT is not set
-CONFIG_64BIT=y
CONFIG_64BIT_PHYS_ADDR=y
+CONFIG_64BIT=y
# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_ANDROID is not set
# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID is not set
# CONFIG_ANDROID_LOGGER is not set
# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
# CONFIG_ANDROID_RAM_CONSOLE is not set
@@ -31,22 +31,22 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
+CONFIG_CAVIUM_OCTEON_LOCK_L2=y
CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
# CONFIG_CGROUP_SCHED is not set
CONFIG_CMDLINE="console=ttyS0,115200"
# CONFIG_COMEDI is not set
-CONFIG_COMPAT=y
CONFIG_COMPAT_BRK=y
+CONFIG_COMPAT=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CAVIUM_OCTEON=y
CONFIG_CPU_HAS_PREFETCH=y
@@ -84,8 +84,8 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
@@ -93,8 +93,8 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_DEBUG_SPINLOCK=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
@@ -117,8 +117,8 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_FRAME_WARN=2048
# CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -133,32 +133,32 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_IDE=y
CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SYSCALL_WRAPPERS=y
# CONFIG_HECI is not set
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_OCTEON=y
-CONFIG_HZ=250
+CONFIG_HW_RANDOM=y
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_IRQ_CPU=y
+CONFIG_INOTIFY=y
CONFIG_IRQ_CPU_OCTEON=y
+CONFIG_IRQ_CPU=y
CONFIG_IRQ_PER_CPU=y
# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
CONFIG_KEXEC=y
# CONFIG_KGDB is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LEMOTE_FULONG is not set
CONFIG_LOCK_KERNEL=y
# CONFIG_LOCK_STAT is not set
@@ -172,7 +172,6 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_ME4000 is not set
# CONFIG_MEILHAUS is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_N32=y
CONFIG_MIPS32_O32=y
@@ -185,6 +184,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
# CONFIG_MISC_DEVICES is not set
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
@@ -201,9 +201,9 @@ CONFIG_OCTEON_MGMT=y
CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PAGE_POISONING is not set
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PLAN9AUTH is not set
@@ -212,20 +212,20 @@ CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_POHMELFS is not set
-CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVE_LOCKING is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RELAY=y
-# CONFIG_RTL8187SE is not set
# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_RTL8187SE is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RUNTIME_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHEDSTATS is not set
# CONFIG_SCSI_DMA is not set
CONFIG_SECCOMP=y
# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -243,16 +243,15 @@ CONFIG_SECCOMP=y
# CONFIG_SIBYTE_SWARM is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SMP=y
-CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM_STATIC=y
-CONFIG_STAGING=y
+CONFIG_SPARSEMEM=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STAGING=y
CONFIG_STOP_MACHINE=y
CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSVIPC_COMPAT=y
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON=y
CONFIG_SYS_HAS_EARLY_PRINTK=y
CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
@@ -260,13 +259,14 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_SYS_SUPPORTS_HIGHMEM=y
CONFIG_SYS_SUPPORTS_SMP=y
+CONFIG_SYSVIPC_COMPAT=y
# CONFIG_TC35815 is not set
# CONFIG_TIMER_STATS is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_UNEVICTABLE_LRU=y
CONFIG_USB_SUPPORT=y
-CONFIG_USER_SCHED=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_USER_SCHED=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_WEAK_ORDERING=y
diff --git a/target/linux/olpc/config-2.6.30 b/target/linux/olpc/config-2.6.30
index f4f32e0a9a..dac5ea2c1d 100644
--- a/target/linux/olpc/config-2.6.30
+++ b/target/linux/olpc/config-2.6.30
@@ -1,6 +1,5 @@
CONFIG_4KSTACKS=y
# CONFIG_64BIT is not set
-CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_BATTERY=y
@@ -13,15 +12,16 @@ CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_PROCFS is not set
CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_SBS is not set
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_WMI is not set
+CONFIG_ACPI=y
# CONFIG_AGP is not set
# CONFIG_APM is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -57,8 +57,8 @@ CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV is not set
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BLK_DEV_SR=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -74,7 +74,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPA_DEBUG is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -86,12 +85,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_IDLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_SUP_AMD=y
# CONFIG_CPU_SUP_CENTAUR is not set
# CONFIG_CPU_SUP_CYRIX_32 is not set
@@ -115,8 +115,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_NX_TEST is not set
@@ -142,12 +142,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEVPORT=y
CONFIG_DISPLAY_SUPPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
CONFIG_DMIID=y
+CONFIG_DMI=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EEEPC_LAPTOP is not set
@@ -156,33 +156,33 @@ CONFIG_ELF_CORE=y
CONFIG_EXT2_FS=y
CONFIG_FAST_CMPXCHG_LOCAL=y
# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_GEODE=y
-# CONFIG_FB_GEODE_GX is not set
# CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_GEODE_GX is not set
CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
+CONFIG_FB=y
# CONFIG_FCOE_FNIC is not set
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAME_POINTER is not set
CONFIG_FREEZER=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_FUJITSU_LAPTOP is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -210,8 +210,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -220,8 +220,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -229,37 +229,35 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_HIBERNATION=y
-CONFIG_HID=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
-# CONFIG_HPET is not set
CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_HPET is not set
CONFIG_HPET_TIMER=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I8K is not set
# CONFIG_IMA is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INTEL_MENLOW is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -268,17 +266,19 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_ISA is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set
-CONFIG_KEXEC=y
# CONFIG_KEXEC_JUMP is not set
+CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
@@ -316,12 +316,11 @@ CONFIG_MGEODE_LX=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
+CONFIG_MMC=y
# CONFIG_MMIOTRACE is not set
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -330,11 +329,12 @@ CONFIG_MOUSE_PS2_OLPC=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MSI_LAPTOP is not set
@@ -349,12 +349,12 @@ CONFIG_MTD_PCI=y
# CONFIG_MWINCHIP3D is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_ETHERNET is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NOHIGHMEM=y
-CONFIG_NOP_TRACER=y
CONFIG_NO_HZ=y
+CONFIG_NOP_TRACER=y
CONFIG_NR_CPUS=1
# CONFIG_NSC_GPIO is not set
CONFIG_NVRAM=y
@@ -367,32 +367,32 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PARTITION_ADVANCED is not set
# CONFIG_PC8736x_GPIO is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_GOANY is not set
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
CONFIG_PCI_GOOLPC=y
CONFIG_PCI_OLPC=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PDA_POWER is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
-CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_SLEEP=y
CONFIG_PM_STD_PARTITION=""
# CONFIG_PM_TRACE_RTC is not set
# CONFIG_PM_VERBOSE is not set
-CONFIG_PNP=y
+CONFIG_PM=y
CONFIG_PNPACPI=y
CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_TRACER is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
@@ -408,32 +408,32 @@ CONFIG_RTC=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_HRTICK=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_SCHEDSTATS=y
CONFIG_SCSI=y
# CONFIG_SCx200 is not set
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLOW_WORK is not set
# CONFIG_SMP is not set
# CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_STACKTRACE=y
CONFIG_STRICT_DEVMEM=y
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_SYSPROF_TRACER is not set
# CONFIG_TC1100_WMI is not set
# CONFIG_TELCLOCK is not set
@@ -443,10 +443,9 @@ CONFIG_TICK_ONESHOT=y
CONFIG_TIMER_STATS=y
# CONFIG_TOSHIBA is not set
CONFIG_TRACEPOINTS=y
-CONFIG_TRACING=y
CONFIG_TRACING_SUPPORT=y
+CONFIG_TRACING=y
CONFIG_UID16=y
-CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -456,35 +455,35 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_UHCI_HCD=y
+CONFIG_USB=y
CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGA_CONSOLE=y
CONFIG_VM86=y
+CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_ACPI_CPUFREQ is not set
CONFIG_X86_BSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DS is not set
# CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_INTEL_USERCOPY=y
@@ -525,4 +524,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 09d0a2cc28..842e9faf62 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -8,16 +8,16 @@ CONFIG_ARCH_ORION5X=y
CONFIG_ARCH_SUPPORTS_AOUT=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
-# CONFIG_ATM is not set
# CONFIG_ATMEL is not set
+# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -29,16 +29,16 @@ CONFIG_BOUNCE=y
# CONFIG_CIFS_STATS is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_FEROCEON=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_CPU_FEROCEON=y
CONFIG_CPU_FEROCEON_OLD_ID=y
+CONFIG_CPU_FEROCEON=y
# CONFIG_CPU_ICACHE_DISABLE is not set
CONFIG_CPU_PABRT_NOIFAR=y
CONFIG_CPU_TLB_V4WBI=y
@@ -52,15 +52,15 @@ CONFIG_DLCI_MAX=8
# CONFIG_DM9000 is not set
CONFIG_DNOTIFY=y
# CONFIG_DSCC4 is not set
-# CONFIG_E100 is not set
# CONFIG_E1000E_ENABLED is not set
+# CONFIG_E100 is not set
# CONFIG_FARSYNC is not set
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
CONFIG_GENERIC_GPIO=y
@@ -75,20 +75,20 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
+CONFIG_HDLC=m
CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
# CONFIG_HDLC_RAW_ETH is not set
+CONFIG_HDLC_RAW=m
# CONFIG_HERMES is not set
-CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_HWMON=y
CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MV64XXX=y
+CONFIG_I2C=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IP6_NF_MANGLE is not set
@@ -99,9 +99,6 @@ CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IP6_NF_MATCH_OPTS is not set
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_ARPTABLES is not set
@@ -117,11 +114,14 @@ CONFIG_IP_MROUTE=y
# CONFIG_IP_NF_TARGET_ULOG is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_LANMEDIA is not set
# CONFIG_LATENCYTOP is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
# CONFIG_LLC2 is not set
CONFIG_LZO_COMPRESS=m
CONFIG_LZO_DECOMPRESS=m
@@ -132,8 +132,8 @@ CONFIG_MACH_DT2=y
# CONFIG_MACH_KUROBOX_PRO is not set
# CONFIG_MACH_LINKSTATION_MINI is not set
# CONFIG_MACH_LINKSTATION_PRO is not set
-# CONFIG_MACH_MV2120 is not set
# CONFIG_MACH_MSS2 is not set
+# CONFIG_MACH_MV2120 is not set
# CONFIG_MACH_RD88F5181L_FXO is not set
# CONFIG_MACH_RD88F5181L_GE is not set
# CONFIG_MACH_RD88F5182 is not set
@@ -144,8 +144,8 @@ CONFIG_MACH_DT2=y
# CONFIG_MACH_TS78XX is not set
CONFIG_MACH_WNR854T=y
CONFIG_MACH_WRT350N_V2=y
-CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
@@ -155,10 +155,10 @@ CONFIG_MEDIA_TUNER_TEA5767=m
CONFIG_MEDIA_TUNER_XC2028=m
CONFIG_MEDIA_TUNER_XC5000=m
# CONFIG_MINIX_FS is not set
-CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
CONFIG_MTD_PHYSMAP_LEN=0
CONFIG_MTD_PHYSMAP_START=0xf0000000
+CONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MV643XX_ETH=y
# CONFIG_NATSEMI is not set
@@ -173,8 +173,8 @@ CONFIG_NET_DSA=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NO_IOPORT is not set
# CONFIG_NVRAM is not set
@@ -185,10 +185,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PATA_ARTOP=m
# CONFIG_PATA_SCH is not set
# CONFIG_PC300 is not set
-CONFIG_PCI=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PLAT_ORION=y
# CONFIG_PPP is not set
# CONFIG_PRISM54 is not set
@@ -206,8 +206,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_ONESHOT=y
CONFIG_UID16=y
-CONFIG_USB=m
-# CONFIG_USBPCWATCHDOG is not set
# CONFIG_USB_ACM is not set
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_CATC is not set
@@ -215,9 +213,11 @@ CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_KAWETH is not set
+CONFIG_USB=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
+# CONFIG_USBPCWATCHDOG is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_R8A66597_HCD is not set
@@ -235,17 +235,17 @@ CONFIG_USB_OHCI_HCD=m
CONFIG_USB_SUPPORT=y
CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_USBNET is not set
+# CONFIG_USB_VIDEO_CLASS is not set
# CONFIG_USB_WDM is not set
CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VFP is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_VIDEO_MEDIA=m
-CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_USB_VIDEO_CLASS is not set
-CONFIG_WAN=y
+CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_WANXL is not set
+CONFIG_WAN=y
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default
index 5f66c0312d..d170448604 100644
--- a/target/linux/orion/harddisk/config-default
+++ b/target/linux/orion/harddisk/config-default
@@ -1,35 +1,35 @@
-CONFIG_SWAP=y
-CONFIG_LBD=y
-CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
-CONFIG_SATA_MV=y
-CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_MD=y
+CONFIG_BLK_DEV_SD=y
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_ZERO is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_JBD=y
+CONFIG_LBD=y
CONFIG_MD_AUTODETECT=y
+# CONFIG_MD_FAULTY is not set
CONFIG_MD_LINEAR=y
+# CONFIG_MD_MULTIPATH is not set
CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
# CONFIG_MD_RAID10 is not set
+CONFIG_MD_RAID1=y
# CONFIG_MD_RAID456 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_FAULTY is not set
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_CRYPT is not set
-# CONFIG_DM_SNAPSHOT is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_UEVENT is not set
+CONFIG_MD=y
+CONFIG_SATA_MV=y
+CONFIG_SWAP=y
+CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_STORAGE=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
+CONFIG_USB=y
diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index 5de51b0426..7ac38dfd8c 100644
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -2,8 +2,8 @@ CONFIG_405EP=y
CONFIG_405EX=y
CONFIG_40x=y
# CONFIG_44x is not set
-CONFIG_4xx=y
CONFIG_4xx_SOC=y
+CONFIG_4xx=y
# CONFIG_6xx is not set
# CONFIG_ACADIA is not set
# CONFIG_ADVANCED_OPTIONS is not set
@@ -27,8 +27,8 @@ CONFIG_BITREVERSE=y
# CONFIG_BOOKE_WDT is not set
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
CONFIG_CONSISTENT_SIZE=0x00200000
# CONFIG_CPU_FREQ is not set
CONFIG_CRYPTO_AEAD2=y
@@ -50,8 +50,8 @@ CONFIG_EXTRA_TARGETS="uImage"
CONFIG_FORCE_MAX_ZONEORDER=11
# CONFIG_FSL_ULI1575 is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -86,11 +86,10 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HCU4 is not set
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-CONFIG_IBM_NEW_EMAC=y
# CONFIG_IBM_NEW_EMAC_DEBUG is not set
CONFIG_IBM_NEW_EMAC_EMAC4=y
CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
@@ -99,11 +98,12 @@ CONFIG_IBM_NEW_EMAC_RXB=256
CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
CONFIG_IBM_NEW_EMAC_TXB=256
+CONFIG_IBM_NEW_EMAC=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IOMMU_HELPER is not set
# CONFIG_IPIC is not set
-# CONFIG_IRQSTACKS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
CONFIG_KERNEL_START=0xc0000000
CONFIG_KILAUEA=y
@@ -125,21 +125,20 @@ CONFIG_MTD_PHYSMAP_OF=y
# CONFIG_NATSEMI is not set
CONFIG_NOT_COHERENT_CACHE=y
# CONFIG_NVRAM is not set
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
+CONFIG_OF=y
CONFIG_OPENRB=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
CONFIG_PCI_MSI=y
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC=y
CONFIG_PPC32=y
CONFIG_PPC40x_SIMPLE=y
CONFIG_PPC4xx_PCI_EXPRESS=y
@@ -150,21 +149,22 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR=y
# CONFIG_PPC_DCR_MMIO is not set
CONFIG_PPC_DCR_NATIVE=y
+CONFIG_PPC_DCR=y
# CONFIG_PPC_EARLY_DEBUG is not set
# CONFIG_PPC_I8259 is not set
# CONFIG_PPC_INDIRECT_IO is not set
CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_MMU_NOHASH=y
# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC_MMU_NOHASH=y
# CONFIG_PPC_MPC106 is not set
CONFIG_PPC_NEED_DMA_SYNC_OPS=y
CONFIG_PPC_OF=y
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_RTAS is not set
CONFIG_PPC_UDBG_16550=y
+CONFIG_PPC=y
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PROC_DEVICETREE=y
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index c9817d567a..683e699afb 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -2,15 +2,15 @@
CONFIG_440GX=y
CONFIG_44x=y
CONFIG_460EX=y
-CONFIG_4xx=y
CONFIG_4xx_SOC=y
+CONFIG_4xx=y
# CONFIG_6xx is not set
# CONFIG_8139TOO is not set
# CONFIG_ADVANCED_OPTIONS is not set
# CONFIG_AGP is not set
-# CONFIG_ARCHES is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_ARCHES is not set
CONFIG_ARCH_HAS_ILOG2_U32=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -24,14 +24,14 @@ CONFIG_AUDIT_ARCH=y
# CONFIG_BAMBOO is not set
CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
-CONFIG_BOOKE=y
# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE=y
CONFIG_BOUNCE=y
CONFIG_CANYONLANDS=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd"
CONFIG_CONSISTENT_SIZE=0x00200000
CONFIG_CONSISTENT_START=0xff100000
# CONFIG_CPU_FREQ is not set
@@ -46,8 +46,8 @@ CONFIG_EXTRA_TARGETS="uImage"
CONFIG_FORCE_MAX_ZONEORDER=11
# CONFIG_FSL_ULI1575 is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
@@ -77,11 +77,10 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HIGHMEM is not set
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-CONFIG_IBM_NEW_EMAC=y
# CONFIG_IBM_NEW_EMAC_DEBUG is not set
CONFIG_IBM_NEW_EMAC_EMAC4=y
CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
@@ -91,13 +90,14 @@ CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
CONFIG_IBM_NEW_EMAC_TAH=y
CONFIG_IBM_NEW_EMAC_TXB=128
+CONFIG_IBM_NEW_EMAC=y
CONFIG_IBM_NEW_EMAC_ZMII=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IOMMU_HELPER is not set
# CONFIG_IPIC is not set
-# CONFIG_IRQSTACKS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_KATMAI is not set
CONFIG_KERNEL_START=0xc0000000
@@ -116,23 +116,22 @@ CONFIG_MTD_PHYSMAP_OF=y
# CONFIG_NATSEMI is not set
CONFIG_NOT_COHERENT_CACHE=y
# CONFIG_NVRAM is not set
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
+CONFIG_OF=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PCI=y
+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
+CONFIG_PCI_DOMAINS=y
CONFIG_PCIEAER=y
# CONFIG_PCIEASPM is not set
CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
CONFIG_PCI_MSI=y
CONFIG_PCI_SYSCALL=y
-CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PCI=y
CONFIG_PHYS_64BIT=y
CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PPC=y
+CONFIG_PHYSICAL_START=0x00000000
CONFIG_PPC32=y
CONFIG_PPC44x_SIMPLE=y
CONFIG_PPC4xx_PCI_EXPRESS=y
@@ -143,9 +142,9 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR=y
# CONFIG_PPC_DCR_MMIO is not set
CONFIG_PPC_DCR_NATIVE=y
+CONFIG_PPC_DCR=y
# CONFIG_PPC_EARLY_DEBUG is not set
CONFIG_PPC_FPU=y
# CONFIG_PPC_I8259 is not set
@@ -157,6 +156,7 @@ CONFIG_PPC_OF=y
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_RTAS is not set
CONFIG_PPC_UDBG_16550=y
+CONFIG_PPC=y
# CONFIG_PQ2ADS is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PTE_64BIT=y
@@ -178,12 +178,12 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_TAISHAN=y
CONFIG_TASK_SIZE=0xc0000000
CONFIG_TICK_ONESHOT=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_OHCI_HCD_PCI=y
CONFIG_USB_EHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PCI=y
CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_SUPPORT=y
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_WARP is not set
diff --git a/target/linux/ps3/config-2.6.30 b/target/linux/ps3/config-2.6.30
index cd88b80993..e937cb9ea2 100644
--- a/target/linux/ps3/config-2.6.30
+++ b/target/linux/ps3/config-2.6.30
@@ -22,12 +22,12 @@ CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65535
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_BLK_DEV_SR=y
CONFIG_BLOCK_COMPAT=y
# CONFIG_BOOTX_TEXT is not set
CONFIG_BOUNCE=y
@@ -36,9 +36,9 @@ CONFIG_BOUNCE=y
# CONFIG_CGROUP_SCHED is not set
CONFIG_CMDLINE=""
CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT=y
CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_COMPAT_BRK=y
+CONFIG_COMPAT=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPU_FREQ is not set
CONFIG_CRC16=y
@@ -57,33 +57,33 @@ CONFIG_ELF_CORE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT4DEV_COMPAT is not set
-CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_XATTR is not set
+CONFIG_EXT4_FS=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_FAT_FS=y
-CONFIG_FB=y
-CONFIG_FB_PS3=y
CONFIG_FB_PS3_DEFAULT_SIZE_M=9
+CONFIG_FB_PS3=y
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_SYS_IMAGEBLIT=y
+CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
+# CONFIG_FONTS is not set
CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_WARN=2048
# CONFIG_FSL_ULI1575 is not set
CONFIG_GELIC_NET=y
# CONFIG_GELIC_WIRELESS is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -119,7 +119,6 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HID=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
@@ -129,39 +128,40 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_SONY=y
CONFIG_HID_SUNPLUS=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_INITRAMFS_ROOT_GID=500
CONFIG_INITRAMFS_ROOT_UID=500
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_IOMMU_HELPER=y
# CONFIG_IOMMU_VMERGE is not set
-# CONFIG_IPIC is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IPIC is not set
# CONFIG_IP_MULTICAST is not set
-# CONFIG_IRQSTACKS is not set
# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISDN is not set
CONFIG_ISO9660_FS=y
-CONFIG_JBD=y
CONFIG_JBD2=y
+CONFIG_JBD=y
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_ANALOG is not set
@@ -187,11 +187,11 @@ CONFIG_KERNEL_START=0xc000000000000000
CONFIG_KEXEC=y
# CONFIG_LEDS_TRIGGERS is not set
CONFIG_LOCK_KERNEL=y
-# CONFIG_LOGO is not set
CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_LOGO is not set
# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG=y
# CONFIG_MEMORY_HOTREMOVE is not set
CONFIG_MIGRATION=y
# CONFIG_MINI_FO is not set
@@ -201,35 +201,34 @@ CONFIG_MIGRATION=y
# CONFIG_MPIC_WEIRD is not set
CONFIG_MSDOS_FS=y
# CONFIG_MTD is not set
+# CONFIG_NET_ETHERNET is not set
# CONFIG_NETFILTER is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NET_ETHERNET is not set
-CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS=y
CONFIG_NR_CPUS=2
# CONFIG_NUMA is not set
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
+CONFIG_OF=y
# CONFIG_PACKET_MMAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc000000000000000
# CONFIG_PARTITION_ADVANCED is not set
# CONFIG_PCI_DOMAINS is not set
# CONFIG_PCI_SYSCALL is not set
-CONFIG_PHYSICAL_START=0x00000000
CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PHYSICAL_START=0x00000000
CONFIG_POWER3=y
-CONFIG_POWER4=y
# CONFIG_POWER4_ONLY is not set
-CONFIG_PPC=y
+CONFIG_POWER4=y
CONFIG_PPC64=y
# CONFIG_PPC_970_NAP is not set
CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_CELL=y
# CONFIG_PPC_CELLEB is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_CELL_QPACE is not set
+CONFIG_PPC_CELL=y
# CONFIG_PPC_CLOCK is not set
# CONFIG_PPC_DCR_MMIO is not set
# CONFIG_PPC_DCR_NATIVE is not set
@@ -243,17 +242,18 @@ CONFIG_PPC_FPU=y
# CONFIG_PPC_MAPLE is not set
# CONFIG_PPC_MM_SLICES is not set
# CONFIG_PPC_MPC106 is not set
-CONFIG_PPC_OF=y
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
+CONFIG_PPC_OF=y
# CONFIG_PPC_PASEMI is not set
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_PS3=y
# CONFIG_PPC_PSERIES is not set
# CONFIG_PPC_RTAS is not set
-CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_64=y
+CONFIG_PPC_STD_MMU=y
# CONFIG_PPC_UDBG_16550 is not set
+CONFIG_PPC=y
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PROC_DEVICETREE=y
@@ -277,17 +277,17 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCHED_SMT is not set
-CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI=y
# CONFIG_SERIAL_8250 is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SMP=y
-CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_SPARSEMEM_VMEMMAP is not set
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+# CONFIG_SPARSEMEM_VMEMMAP is not set
+CONFIG_SPARSEMEM=y
# CONFIG_SPU_BASE is not set
# CONFIG_SPU_FS is not set
# CONFIG_SQUASHFS is not set
@@ -299,18 +299,16 @@ CONFIG_SYSVIPC_COMPAT=y
CONFIG_TRACING_SUPPORT=y
CONFIG_TUNE_CELL=y
# CONFIG_U3_DART is not set
-CONFIG_USB=y
# CONFIG_USB_DEVICEFS is not set
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_HID=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-CONFIG_USB_STORAGE=y
+CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
@@ -319,9 +317,11 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
-CONFIG_USER_SCHED=y
+CONFIG_USB=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_USER_SCHED=y
CONFIG_VFAT_FS=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -329,9 +329,9 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VSX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
# CONFIG_WLAN_80211 is not set
diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 2bef8e3710..fb9c9d7b0f 100644
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -5,18 +5,18 @@ CONFIG_ALIGNMENT_HANDLING=0x2
CONFIG_ALIGNMENT_TRAP=y
CONFIG_APM_EMULATION=m
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-CONFIG_ARCH_GUMSTIX=y
# CONFIG_ARCH_GUMSTIX_F is not set
# CONFIG_ARCH_GUMSTIX_ORIG is not set
CONFIG_ARCH_GUMSTIX_VERDEX=y
+CONFIG_ARCH_GUMSTIX=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
# CONFIG_ARCH_LUBBOCK is not set
CONFIG_ARCH_MTD_XIP=y
-CONFIG_ARCH_PXA=y
# CONFIG_ARCH_PXA_IDP is not set
-CONFIG_ARM=y
+CONFIG_ARCH_PXA=y
# CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
# CONFIG_ARPD is not set
# CONFIG_ARTHUR is not set
CONFIG_ATA=m
@@ -27,10 +27,10 @@ CONFIG_BASE_SMALL=0
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDE=m
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDEDISK=m
# CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_BLK_DEV_IDE=m
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_BONDING is not set
# CONFIG_BSD_DISKLABEL is not set
@@ -38,12 +38,12 @@ CONFIG_BLK_DEV_IDEDISK=m
CONFIG_BT_GUMSTIX=m
# CONFIG_CIFS is not set
CONFIG_CMDLINE="console=ttyS0,115200n8"
-CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_FREQ is not set
CONFIG_CPU_TLB_V4WBI=y
@@ -55,19 +55,18 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_EPOLL is not set
# CONFIG_EXT2_FS is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_PXA=y
# CONFIG_FB_PXA_ALPS_CDOLLAR is not set
# CONFIG_FB_PXA_NONEOFTHEABOVE is not set
CONFIG_FB_PXA_PARAMETERS=y
CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C=y
# CONFIG_FB_PXA_SHARP_LQ043_PSP is not set
+CONFIG_FB_PXA=y
CONFIG_FB_TILEBLITTING=y
+CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONTS=y
# CONFIG_FONT_10x18 is not set
CONFIG_FONT_6x11=y
# CONFIG_FONT_7x14 is not set
@@ -78,10 +77,11 @@ CONFIG_FONT_6x11=y
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_SUN8x16 is not set
+CONFIG_FONTS=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_POINTER=y
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_GPIO=y
@@ -90,31 +90,31 @@ CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
# CONFIG_HERMES is not set
-# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
CONFIG_HID=m
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
# CONFIG_I2C_ALGOBIT is not set
CONFIG_I2C_CHARDEV=m
+CONFIG_I2C=m
CONFIG_I2C_PXA=m
CONFIG_I2C_PXA_SLAVE=y
-CONFIG_IDE=m
# CONFIG_IDE_ARM is not set
CONFIG_IDE_GENERIC=m
+CONFIG_IDE=m
# CONFIG_IEEE80211_SOFTMAC is not set
# CONFIG_IFB is not set
# CONFIG_INET_DIAG is not set
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_MOUSE=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_TSDEV=m
CONFIG_INPUT_TSDEV_SCREEN_X=480
CONFIG_INPUT_TSDEV_SCREEN_Y=272
+CONFIG_INPUT=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_ISDN is not set
@@ -128,18 +128,18 @@ CONFIG_KEYBOARD_ATKBD=m
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_LLC2 is not set
-CONFIG_LOGO=y
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO=y
# CONFIG_MACH_LOGICPD_PXA270 is not set
# CONFIG_MACH_MAINSTONE is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_MII=m
# CONFIG_MINIX_FS is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
+CONFIG_MMC=y
CONFIG_MOUSE_PS2=m
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
@@ -163,41 +163,41 @@ CONFIG_NO_IDLE_HZ=y
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PLATFORM is not set
CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA=m
CONFIG_PCMCIA_PXA2XX=m
-CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_PM=y
# CONFIG_PNPACPI is not set
-CONFIG_PROC_GPIO=m
# CONFIG_PROC_GPIO_DEBUG is not set
+CONFIG_PROC_GPIO=m
CONFIG_PXA27x=y
# CONFIG_PXA_SHARPSL is not set
CONFIG_SA1100_WATCHDOG=m
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_PROC_FS is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_PXA=y
CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIO=m
+CONFIG_SERIAL_PXA=y
CONFIG_SERIO_LIBPS2=m
+CONFIG_SERIO=m
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=m
-CONFIG_SMC911X=m
CONFIG_SMC911X_GUMSTIX=m
-CONFIG_SMC91X=m
+CONFIG_SMC911X=m
CONFIG_SMC91X_GUMSTIX=m
+CONFIG_SMC91X=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_PXA2XX_AC97=m
CONFIG_SND_PXA2XX_PCM=m
-CONFIG_SND_PXA2XX_SOC=m
CONFIG_SND_PXA2XX_SOC_AC97=m
CONFIG_SND_PXA2XX_SOC_GUMSTIX=m
-CONFIG_SND_SOC=m
+CONFIG_SND_PXA2XX_SOC=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC=m
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
@@ -208,7 +208,6 @@ CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_UID16=y
CONFIG_UNIX=m
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USBPCWATCHDOG is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_CATC is not set
# CONFIG_USB_GTCO is not set
@@ -216,6 +215,7 @@ CONFIG_UNIX=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
+# CONFIG_USBPCWATCHDOG is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_SERIAL is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
@@ -234,9 +234,9 @@ CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VGA_CONSOLE is not set
# CONFIG_VIDEO_DEV is not set
# CONFIG_VLAN_8021Q is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
diff --git a/target/linux/pxcab/config-2.6.30 b/target/linux/pxcab/config-2.6.30
index 912a24859a..c67ae8d9e3 100644
--- a/target/linux/pxcab/config-2.6.30
+++ b/target/linux/pxcab/config-2.6.30
@@ -25,35 +25,34 @@ CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65535
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_BLK_DEV_SR=y
CONFIG_BLOCK_COMPAT=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTX_TEXT is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_BOOTX_TEXT is not set
CONFIG_BOUNCE=y
# CONFIG_BRIDGE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CBE_CPUFREQ=y
# CONFIG_CBE_CPUFREQ_PMI_ENABLE is not set
CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=y
+CONFIG_CBE_CPUFREQ=y
CONFIG_CBE_RAS=y
CONFIG_CBE_THERM=y
# CONFIG_CGROUP_SCHED is not set
CONFIG_CMDLINE_BOOL=y
# CONFIG_CODE_PATCHING_SELFTEST is not set
-CONFIG_COMPAT=y
CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_COMPAT_BRK=y
+CONFIG_COMPAT=y
CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -65,9 +64,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CRC16=y
CONFIG_CRC_CCITT=m
# CONFIG_CRYPTO is not set
@@ -80,8 +80,8 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
@@ -112,8 +112,8 @@ CONFIG_ELF_CORE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT4DEV_COMPAT is not set
-CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_XATTR is not set
+CONFIG_EXT4_FS=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_FAT_FS=y
# CONFIG_FAULT_INJECTION is not set
@@ -121,19 +121,19 @@ CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
+# CONFIG_FONTS is not set
CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_WARN=2048
# CONFIG_FSL_ULI1575 is not set
# CONFIG_FTR_FIXUP_SELFTEST is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -169,7 +169,6 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HID=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
@@ -179,53 +178,54 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_SONY=y
CONFIG_HID_SUNPLUS=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_HUGETLBFS is not set
-# CONFIG_HVCS is not set
CONFIG_HVC_CONSOLE=y
CONFIG_HVC_DRIVER=y
CONFIG_HVC_IRQ=y
# CONFIG_HVC_RTAS is not set
+# CONFIG_HVCS is not set
# CONFIG_HVC_UDBG is not set
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-# CONFIG_IBMEBUS is not set
-CONFIG_IBMVIO=y
# CONFIG_IBM_BSR is not set
+# CONFIG_IBMEBUS is not set
CONFIG_IBM_NEW_EMAC_EMAC4=y
CONFIG_IBM_NEW_EMAC_RGMII=y
CONFIG_IBM_NEW_EMAC_TAH=y
CONFIG_IBM_NEW_EMAC_ZMII=y
+CONFIG_IBMVIO=y
CONFIG_INITRAMFS_ROOT_GID=500
CONFIG_INITRAMFS_ROOT_UID=500
CONFIG_INITRAMFS_SOURCE="/home/mita/scm/openwrt/build_dir/target-powerpc_uClibc-0.9.30.1/root-pxcab /home/mita/scm/openwrt/target/linux/generic-2.6/image/initramfs-base-files.txt"
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_IOMMU_HELPER=y
# CONFIG_IOMMU_VMERGE is not set
-# CONFIG_IPIC is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IPIC is not set
# CONFIG_IP_MULTICAST is not set
-# CONFIG_IRQSTACKS is not set
# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISDN is not set
CONFIG_ISO9660_FS=y
-CONFIG_JBD=y
CONFIG_JBD2=y
+CONFIG_JBD=y
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_ANALOG is not set
@@ -247,78 +247,77 @@ CONFIG_JBD2=y
# CONFIG_JOYSTICK_WARRIOR is not set
# CONFIG_JOYSTICK_XPAD is not set
# CONFIG_JOYSTICK_ZHENHUA is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
CONFIG_KERNEL_START=0xc000000000000000
CONFIG_KEXEC=y
# CONFIG_KGDB is not set
# CONFIG_LEDS_TRIGGERS is not set
CONFIG_LOCK_KERNEL=y
# CONFIG_LOCK_STAT is not set
-# CONFIG_LOGO is not set
CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_LOGO is not set
# CONFIG_LPARCFG is not set
# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG=y
# CONFIG_MEMORY_HOTREMOVE is not set
CONFIG_MIGRATION=y
# CONFIG_MINI_FO is not set
# CONFIG_MISC_DEVICES is not set
CONFIG_MMIO_NVRAM=y
-CONFIG_MPIC=y
# CONFIG_MPIC_WEIRD is not set
+CONFIG_MPIC=y
CONFIG_MSDOS_FS=y
# CONFIG_MSI_BITMAP_SELFTEST is not set
CONFIG_MTD_OF_PARTS=y
CONFIG_MTD_PHYSMAP_OF=y
CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_NET_ETHERNET is not set
# CONFIG_NETFILTER is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NET_ETHERNET is not set
-CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS=y
CONFIG_NODES_SHIFT=4
CONFIG_NODES_SPAN_OTHER_NODES=y
CONFIG_NR_CPUS=2
CONFIG_NUMA=y
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
+CONFIG_OF=y
# CONFIG_PACKET_MMAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc000000000000000
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
CONFIG_PHYLIB=y
# CONFIG_PHYP_DUMP is not set
-CONFIG_PHYSICAL_START=0x00000000
CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PHYSICAL_START=0x00000000
CONFIG_POWER3=y
-CONFIG_POWER4=y
# CONFIG_POWER4_ONLY is not set
-CONFIG_PPC=y
-CONFIG_PPC64=y
+CONFIG_POWER4=y
# CONFIG_PPC_16K_PAGES is not set
# CONFIG_PPC_256K_PAGES is not set
CONFIG_PPC_4K_PAGES=y
# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC64=y
# CONFIG_PPC_970_NAP is not set
CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_CELL=y
-# CONFIG_PPC_CELLEB is not set
CONFIG_PPC_CELL_COMMON=y
+# CONFIG_PPC_CELLEB is not set
CONFIG_PPC_CELL_NATIVE=y
# CONFIG_PPC_CELL_QPACE is not set
+CONFIG_PPC_CELL=y
# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR=y
CONFIG_PPC_DCR_MMIO=y
# CONFIG_PPC_DCR_NATIVE is not set
+CONFIG_PPC_DCR=y
# CONFIG_PPC_EARLY_DEBUG is not set
CONFIG_PPC_FPU=y
# CONFIG_PPC_HAS_HASH_64K is not set
@@ -333,9 +332,9 @@ CONFIG_PPC_INDIRECT_IO=y
# CONFIG_PPC_MM_SLICES is not set
# CONFIG_PPC_MPC106 is not set
CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF=y
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
CONFIG_PPC_OF_PLATFORM_PCI=y
+CONFIG_PPC_OF=y
# CONFIG_PPC_PASEMI is not set
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_PMAC is not set
@@ -344,12 +343,13 @@ CONFIG_PPC_PSERIES=y
CONFIG_PPC_RTAS=y
# CONFIG_PPC_SMLPAR is not set
# CONFIG_PPC_SPLPAR is not set
-CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_64=y
+CONFIG_PPC_STD_MMU=y
CONFIG_PPC_UDBG_16550=y
+CONFIG_PPC=y
+CONFIG_PPP_ASYNC=m
CONFIG_PPP=m
CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PROC_DEVICETREE=y
@@ -364,14 +364,14 @@ CONFIG_RTAS_PROC=y
# CONFIG_RT_MUTEX_TESTER is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_SCANLOG is not set
-# CONFIG_SCHEDSTATS is not set
CONFIG_SCHED_DEBUG=y
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCHED_SMT is not set
-CONFIG_SCSI=y
+# CONFIG_SCHEDSTATS is not set
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI=y
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SERIAL_ICOM is not set
# CONFIG_SERIAL_OF_PLATFORM is not set
@@ -382,11 +382,11 @@ CONFIG_SLHC=m
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y
CONFIG_SMP=y
-CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_SPARSEMEM_VMEMMAP is not set
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+# CONFIG_SPARSEMEM_VMEMMAP is not set
+CONFIG_SPARSEMEM=y
# CONFIG_SPIDER_NET is not set
CONFIG_SPU_BASE=y
CONFIG_SPU_FS=y
@@ -403,17 +403,15 @@ CONFIG_TUNE_CELL=y
# CONFIG_U3_DART is not set
CONFIG_UDBG_RTAS_CONSOLE=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug2"
-CONFIG_USB=y
# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_HID=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-CONFIG_USB_STORAGE=y
+CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
@@ -422,10 +420,12 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
# CONFIG_USB_UHCI_HCD is not set
-CONFIG_USER_SCHED=y
+CONFIG_USB=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_USER_SCHED=y
CONFIG_VFAT_FS=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -433,9 +433,9 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VSX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
# CONFIG_WLAN_80211 is not set
diff --git a/target/linux/pxcab/config-2.6.31 b/target/linux/pxcab/config-2.6.31
index d5c4c9bd0b..a2289ce043 100644
--- a/target/linux/pxcab/config-2.6.31
+++ b/target/linux/pxcab/config-2.6.31
@@ -25,12 +25,12 @@ CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65535
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_BLK_DEV_SR=y
CONFIG_BLOCK_COMPAT=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
@@ -39,21 +39,20 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTX_TEXT is not set
CONFIG_BOUNCE=y
# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CBE_CPUFREQ=y
# CONFIG_CBE_CPUFREQ_PMI_ENABLE is not set
CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=y
+CONFIG_CBE_CPUFREQ=y
CONFIG_CBE_RAS=y
CONFIG_CBE_THERM=y
# CONFIG_CGROUP_SCHED is not set
CONFIG_CMDLINE_BOOL=y
# CONFIG_CNIC is not set
# CONFIG_CODE_PATCHING_SELFTEST is not set
-CONFIG_COMPAT=y
CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_COMPAT_BRK=y
+CONFIG_COMPAT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONSTRUCTORS=y
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -65,9 +64,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CRC16=y
CONFIG_CRC_CCITT=m
# CONFIG_CRYPTO is not set
@@ -80,8 +80,8 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
@@ -113,8 +113,8 @@ CONFIG_ELF_CORE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT4DEV_COMPAT is not set
-CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_XATTR is not set
+CONFIG_EXT4_FS=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_FAT_FS=y
# CONFIG_FAULT_INJECTION is not set
@@ -122,20 +122,20 @@ CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
+# CONFIG_FONTS is not set
CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_WARN=2048
# CONFIG_FSL_ULI1575 is not set
CONFIG_FSNOTIFY=y
# CONFIG_FTR_FIXUP_SELFTEST is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -168,13 +168,12 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_LMB=y
CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_COUNTERS=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HID=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
@@ -192,54 +191,55 @@ CONFIG_HID_SUNPLUS=y
CONFIG_HID_SUPPORT=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_TOPSEED is not set
+CONFIG_HID=y
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_HUGETLBFS is not set
-# CONFIG_HVCS is not set
CONFIG_HVC_CONSOLE=y
CONFIG_HVC_DRIVER=y
CONFIG_HVC_IRQ=y
# CONFIG_HVC_RTAS is not set
+# CONFIG_HVCS is not set
# CONFIG_HVC_UDBG is not set
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-# CONFIG_IBMEBUS is not set
-CONFIG_IBMVIO=y
# CONFIG_IBM_BSR is not set
+# CONFIG_IBMEBUS is not set
CONFIG_IBM_NEW_EMAC_EMAC4=y
CONFIG_IBM_NEW_EMAC_RGMII=y
CONFIG_IBM_NEW_EMAC_TAH=y
CONFIG_IBM_NEW_EMAC_ZMII=y
+CONFIG_IBMVIO=y
# CONFIG_IEEE802154 is not set
# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_IOMMU_HELPER=y
# CONFIG_IOMMU_VMERGE is not set
-# CONFIG_IPIC is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IPIC is not set
# CONFIG_IP_MULTICAST is not set
-# CONFIG_IRQSTACKS is not set
# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISDN is not set
CONFIG_ISO9660_FS=y
-CONFIG_JBD=y
CONFIG_JBD2=y
+CONFIG_JBD=y
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_ANALOG is not set
@@ -261,8 +261,8 @@ CONFIG_JBD2=y
# CONFIG_JOYSTICK_WARRIOR is not set
# CONFIG_JOYSTICK_XPAD is not set
# CONFIG_JOYSTICK_ZHENHUA is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
CONFIG_KERNEL_START=0xc000000000000000
CONFIG_KEXEC=y
# CONFIG_KGDB is not set
@@ -270,74 +270,73 @@ CONFIG_KEXEC=y
# CONFIG_LEDS_TRIGGERS is not set
CONFIG_LOCK_KERNEL=y
# CONFIG_LOCK_STAT is not set
-# CONFIG_LOGO is not set
CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_LOGO is not set
# CONFIG_LPARCFG is not set
# CONFIG_MACINTOSH_DRIVERS is not set
# CONFIG_MEDIA_SUPPORT is not set
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG=y
# CONFIG_MEMORY_HOTREMOVE is not set
CONFIG_MIGRATION=y
# CONFIG_MINI_FO is not set
# CONFIG_MISC_DEVICES is not set
CONFIG_MMIO_NVRAM=y
-CONFIG_MPIC=y
# CONFIG_MPIC_WEIRD is not set
+CONFIG_MPIC=y
CONFIG_MSDOS_FS=y
# CONFIG_MSI_BITMAP_SELFTEST is not set
CONFIG_MTD_OF_PARTS=y
CONFIG_MTD_PHYSMAP_OF=y
CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_NET_ETHERNET is not set
# CONFIG_NETFILTER is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NET_ETHERNET is not set
-CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS=y
CONFIG_NODES_SHIFT=4
CONFIG_NODES_SPAN_OTHER_NODES=y
CONFIG_NR_CPUS=2
CONFIG_NUMA=y
-CONFIG_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_MDIO=y
+CONFIG_OF=y
# CONFIG_PACKET_MMAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc000000000000000
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PERF_COUNTERS is not set
CONFIG_PHYLIB=y
# CONFIG_PHYP_DUMP is not set
-CONFIG_PHYSICAL_START=0x00000000
CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PHYSICAL_START=0x00000000
CONFIG_POWER3=y
-CONFIG_POWER4=y
# CONFIG_POWER4_ONLY is not set
-CONFIG_PPC=y
-CONFIG_PPC64=y
+CONFIG_POWER4=y
# CONFIG_PPC_16K_PAGES is not set
# CONFIG_PPC_256K_PAGES is not set
CONFIG_PPC_4K_PAGES=y
# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC64=y
# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BOOK3S=y
CONFIG_PPC_BOOK3S_64=y
-CONFIG_PPC_CELL=y
-# CONFIG_PPC_CELLEB is not set
+CONFIG_PPC_BOOK3S=y
CONFIG_PPC_CELL_COMMON=y
+# CONFIG_PPC_CELLEB is not set
CONFIG_PPC_CELL_NATIVE=y
# CONFIG_PPC_CELL_QPACE is not set
+CONFIG_PPC_CELL=y
# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR=y
CONFIG_PPC_DCR_MMIO=y
# CONFIG_PPC_DCR_NATIVE is not set
+CONFIG_PPC_DCR=y
# CONFIG_PPC_DISABLE_WERROR is not set
# CONFIG_PPC_EARLY_DEBUG is not set
CONFIG_PPC_FPU=y
@@ -354,9 +353,9 @@ CONFIG_PPC_INDIRECT_IO=y
# CONFIG_PPC_MM_SLICES is not set
# CONFIG_PPC_MPC106 is not set
CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF=y
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
CONFIG_PPC_OF_PLATFORM_PCI=y
+CONFIG_PPC_OF=y
# CONFIG_PPC_PASEMI is not set
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_PMAC is not set
@@ -365,13 +364,14 @@ CONFIG_PPC_PSERIES=y
CONFIG_PPC_RTAS=y
# CONFIG_PPC_SMLPAR is not set
# CONFIG_PPC_SPLPAR is not set
-CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_64=y
+CONFIG_PPC_STD_MMU=y
CONFIG_PPC_UDBG_16550=y
CONFIG_PPC_WERROR=y
+CONFIG_PPC=y
+CONFIG_PPP_ASYNC=m
CONFIG_PPP=m
CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
# CONFIG_PPS is not set
# CONFIG_PQ2ADS is not set
CONFIG_PRINT_STACK_DEPTH=64
@@ -383,19 +383,19 @@ CONFIG_PROC_PAGE_MONITOR=y
CONFIG_RTAS_ERROR_LOGGING=y
CONFIG_RTAS_FLASH=y
CONFIG_RTAS_PROC=y
-# CONFIG_RTL8306_PHY is not set
# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_RTL8306_PHY is not set
# CONFIG_RT_MUTEX_TESTER is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_SCANLOG is not set
-# CONFIG_SCHEDSTATS is not set
CONFIG_SCHED_DEBUG=y
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCHED_SMT is not set
-CONFIG_SCSI=y
+# CONFIG_SCHEDSTATS is not set
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI=y
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SERIAL_ICOM is not set
# CONFIG_SERIAL_OF_PLATFORM is not set
@@ -406,11 +406,11 @@ CONFIG_SLHC=m
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y
CONFIG_SMP=y
-CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_SPARSEMEM_VMEMMAP is not set
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+# CONFIG_SPARSEMEM_VMEMMAP is not set
+CONFIG_SPARSEMEM=y
# CONFIG_SPIDER_NET is not set
CONFIG_SPU_BASE=y
CONFIG_SPU_FS=y
@@ -428,19 +428,17 @@ CONFIG_TUNE_CELL=y
# CONFIG_U3_DART is not set
CONFIG_UDBG_RTAS_CONSOLE=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug2"
-CONFIG_USB=y
# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_HID=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-CONFIG_USB_STORAGE=y
+CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
@@ -449,11 +447,13 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
-CONFIG_USER_SCHED=y
+CONFIG_USB=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_USER_SCHED=y
CONFIG_VFAT_FS=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -461,9 +461,9 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VSX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
# CONFIG_WLAN_80211 is not set
diff --git a/target/linux/ramips/rt288x/config-2.6.30 b/target/linux/ramips/rt288x/config-2.6.30
index 6d61b34b76..1e4074802d 100644
--- a/target/linux/ramips/rt288x/config-2.6.30
+++ b/target/linux/ramips/rt288x/config-2.6.30
@@ -14,8 +14,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -24,9 +24,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -48,16 +48,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -90,7 +90,6 @@ CONFIG_IRQ_CPU=y
# CONFIG_MACH_VR41XX is not set
# CONFIG_MII is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=4
@@ -101,6 +100,7 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMTC is not set
CONFIG_MIPS_RALINK=y
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
@@ -109,8 +109,8 @@ CONFIG_MTD_PHYSMAP=y
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
diff --git a/target/linux/ramips/rt305x/config-2.6.30 b/target/linux/ramips/rt305x/config-2.6.30
index 026a225875..763c7a859e 100644
--- a/target/linux/ramips/rt305x/config-2.6.30
+++ b/target/linux/ramips/rt305x/config-2.6.30
@@ -14,8 +14,8 @@ CONFIG_BITREVERSE=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -24,9 +24,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS32_R1 is not set
CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR2=y
@@ -48,15 +48,15 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -88,7 +88,6 @@ CONFIG_IRQ_CPU=y
# CONFIG_MACH_VR41XX is not set
# CONFIG_MII is not set
# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -100,6 +99,7 @@ CONFIG_MIPS_MT_DISABLED=y
CONFIG_MIPS_RALINK=y
CONFIG_MIPS_RAMIPS_NET=y
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
# CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_PHYSMAP=y
# CONFIG_NO_IOPORT is not set
diff --git a/target/linux/rb532/config-default b/target/linux/rb532/config-default
index c8f811ca06..27f76dcdb7 100644
--- a/target/linux/rb532/config-default
+++ b/target/linux/rb532/config-default
@@ -7,10 +7,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_SFF=y
+CONFIG_ATA=y
CONFIG_BASE_SMALL=0
# CONFIG_BCM47XX is not set
# CONFIG_BINARY_PRINTF is not set
@@ -20,8 +20,8 @@ CONFIG_BOOT_RAW=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
CONFIG_CPU_HAS_LLSC=y
@@ -29,9 +29,9 @@ CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32=y
# CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set
CONFIG_CPU_MIPSR1=y
@@ -53,8 +53,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
# CONFIG_DEBUG_FS is not set
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEVPORT=y
@@ -63,8 +63,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
CONFIG_EXT2_FS=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -84,8 +84,8 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
CONFIG_IMAGE_CMDLINE_HACK=y
@@ -103,7 +103,6 @@ CONFIG_LEDS_MIKROTIK_RB532=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
CONFIG_MIKROTIK_RB532=y
-CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=4
@@ -113,15 +112,16 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_MIPS_SIM is not set
+CONFIG_MIPS=y
CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_AMDSTD is not set
CONFIG_MTD_CFI_GEOMETRY=y
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_PLATFORM=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
# CONFIG_MTD_ROOTFS_SPLIT is not set
@@ -133,8 +133,8 @@ CONFIG_NF_CT_ACCT=y
# CONFIG_NXP_STB225 is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PATA_RB532=y
-CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set
@@ -143,10 +143,10 @@ CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RC32434_WDT=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI=y
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
@@ -169,8 +169,8 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
# CONFIG_TC35815 is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-CONFIG_VIA_RHINE=y
CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_RHINE=y
CONFIG_YAFFS_9BYTE_TAGS=y
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
CONFIG_YAFFS_AUTO_YAFFS2=y
diff --git a/target/linux/rdc/ar525w/config-2.6.30 b/target/linux/rdc/ar525w/config-2.6.30
index aeed116326..109f9e0648 100644
--- a/target/linux/rdc/ar525w/config-2.6.30
+++ b/target/linux/rdc/ar525w/config-2.6.30
@@ -1,8 +1,8 @@
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_R8610 is not set
-CONFIG_MTD_RDC3210=y
CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
CONFIG_MTD_RDC3210_BUSWIDTH=2
# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set
CONFIG_MTD_RDC3210_SIZE=0x400000
# CONFIG_MTD_RDC3210_STATIC_MAP is not set
+CONFIG_MTD_RDC3210=y
diff --git a/target/linux/rdc/config-2.6.28 b/target/linux/rdc/config-2.6.28
index f155061d02..bab82f4914 100644
--- a/target/linux/rdc/config-2.6.28
+++ b/target/linux/rdc/config-2.6.28
@@ -25,15 +25,15 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLASSIC_RCU=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CPU5_WDT is not set
@@ -52,8 +52,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
CONFIG_DEVPORT=y
# CONFIG_DMI is not set
CONFIG_DOUBLEFAULT=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EUROTECH_WDT is not set
@@ -61,8 +61,8 @@ CONFIG_FAST_CMPXCHG_LOCAL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -101,13 +101,13 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_HP_WATCHDOG is not set
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
# CONFIG_HW_RANDOM_GEODE is not set
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_VIA is not set
-CONFIG_HZ=250
+CONFIG_HW_RANDOM=y
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
@@ -116,7 +116,6 @@ CONFIG_HZ_250=y
# CONFIG_IBMASR is not set
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -125,8 +124,9 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_ISA is not set
+# CONFIG_IOMMU_HELPER is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
@@ -163,8 +163,8 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MK8 is not set
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MTD_CFI_INTELEXT is not set
@@ -172,10 +172,10 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_CONCAT=y
# CONFIG_MTD_NETSC520 is not set
-CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
CONFIG_MTD_PHYSMAP_LEN=0
CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_R8610 is not set
# CONFIG_MTD_RDC3210 is not set
# CONFIG_MTD_SC520CDP is not set
@@ -196,24 +196,24 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
CONFIG_PROCESSOR_SELECT=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_R6040 is not set
-# CONFIG_RDC321X_WDT is not set
# CONFIG_RD_BZIP2 is not set
+# CONFIG_RDC321X_WDT is not set
CONFIG_RD_GZIP=y
# CONFIG_RD_LZMA is not set
# CONFIG_RELOCATABLE is not set
@@ -242,12 +242,11 @@ CONFIG_USB_SUPPORT=y
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_VM86 is not set
+CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
-CONFIG_X86=y
CONFIG_X86_32=y
# CONFIG_X86_64 is not set
CONFIG_X86_ALIGNMENT_16=y
@@ -255,12 +254,12 @@ CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_BSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_CPU=y
# CONFIG_X86_CPUID is not set
+CONFIG_X86_CPU=y
# CONFIG_X86_ELAN is not set
CONFIG_X86_F00F_BUG=y
-# CONFIG_X86_GENERIC is not set
# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_GENERIC is not set
CONFIG_X86_INVLPG=y
CONFIG_X86_L1_CACHE_SHIFT=4
# CONFIG_X86_MCE is not set
@@ -279,4 +278,5 @@ CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_X86_VSMP is not set
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30
index 81ec1c57a9..a421e64e4b 100644
--- a/target/linux/rdc/config-2.6.30
+++ b/target/linux/rdc/config-2.6.30
@@ -29,15 +29,15 @@ CONFIG_BASE_SMALL=1
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_COMPAT_NET_DEV_OPS is not set
# CONFIG_COMPAT_VDSO is not set
@@ -70,8 +70,8 @@ CONFIG_FIX_EARLYCON_MEM=y
# CONFIG_FRAME_POINTER is not set
# CONFIG_FTRACE_SYSCALLS is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -99,8 +99,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -109,8 +109,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -124,16 +124,14 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_HP_WATCHDOG is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=250
# CONFIG_HZ_100 is not set
+CONFIG_HZ=250
CONFIG_HZ_250=y
# CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8K is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -142,9 +140,11 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
# CONFIG_IP_MROUTE is not set
-# CONFIG_ISA is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
@@ -183,8 +183,8 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MMIOTRACE is not set
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MTD_CFI_INTELEXT is not set
@@ -212,18 +212,18 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
# CONFIG_PCI_QUIRKS is not set
+CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
@@ -264,17 +264,16 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
CONFIG_X86_ALIGNMENT_16=y
CONFIG_X86_BSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_CPU=y
-# CONFIG_X86_CPUID is not set
# CONFIG_X86_CPU_DEBUG is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_CPU=y
# CONFIG_X86_ELAN is not set
CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_F00F_BUG=y
@@ -297,4 +296,5 @@ CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index 1ec40be5df..ed34338fc9 100644
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -1,9 +1,9 @@
# CONFIG_AEABI is not set
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_APM_EMULATION is not set
-CONFIG_AR6000_WLAN=y
# CONFIG_AR6000_WLAN_DEBUG is not set
# CONFIG_AR6000_WLAN_RESET is not set
+CONFIG_AR6000_WLAN=y
# CONFIG_ARCH_BAST is not set
CONFIG_ARCH_FLATMEM_HAS_HOLES=y
# CONFIG_ARCH_H1940 is not set
@@ -17,8 +17,8 @@ CONFIG_ARCH_S3C2410=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
CONFIG_ARM_THUMB=y
+CONFIG_ARM=y
# CONFIG_ARPD is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
@@ -28,30 +28,30 @@ CONFIG_BASE_SMALL=0
CONFIG_BATTERY_BQ27000_HDQ=y
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
CONFIG_BRIDGE_NETFILTER=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_CHARGER_PCF50633=y
CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
CONFIG_COMPAT_BRK=y
CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32=y
CONFIG_CPU_32v4T=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV4T=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_CACHE_V4WT=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
+CONFIG_CPU_LLSERIAL_S3C2440=y
CONFIG_CPU_PABRT_NOIFAR=y
CONFIG_CPU_S3C2410_DMA=y
CONFIG_CPU_S3C2442=y
@@ -77,13 +77,12 @@ CONFIG_ELF_CORE=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB=y
CONFIG_FIQ=y
# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONTS=y
# CONFIG_FONT_10x18 is not set
CONFIG_FONT_6x11=y
# CONFIG_FONT_7x14 is not set
@@ -94,12 +93,13 @@ CONFIG_FONT_6x11=y
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_SUN8x16 is not set
+CONFIG_FONTS=y
# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FPE_NWFPE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_POINTER=y
CONFIG_FREEZER=y
# CONFIG_GENERIC_CLOCKEVENTS is not set
@@ -107,8 +107,8 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
# CONFIG_GENERIC_TIME is not set
-CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -123,12 +123,11 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PWM=y
CONFIG_HDQ_GPIO_BITBANG=y
-CONFIG_HID=y
CONFIG_HID_A4TECH=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
@@ -150,34 +149,35 @@ CONFIG_HID_SONY=y
CONFIG_HID_SUNPLUS=y
CONFIG_HID_SUPPORT=y
CONFIG_HID_TOPSEED=y
+CONFIG_HID=y
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_HZ=200
-CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_S3C2410=y
+CONFIG_I2C=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
+CONFIG_INOTIFY=y
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_LIS302DL=y
-CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_PCF50633_PMU=y
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
-CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP=y
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
# CONFIG_ISDN is not set
@@ -204,19 +204,19 @@ CONFIG_LEDS_GTA02_VIBRATOR=y
# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
# CONFIG_LEDS_TRIGGER_NETDEV is not set
CONFIG_LOCK_KERNEL=y
-CONFIG_LOGO=y
+CONFIG_LOG_BUF_SHIFT=18
# CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_OPENWRT_CLUT224=y
-CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOGO=y
# CONFIG_MACH_AML_M5900 is not set
# CONFIG_MACH_ANUBIS is not set
# CONFIG_MACH_AT2440EVB is not set
# CONFIG_MACH_JIVE is not set
# CONFIG_MACH_N30 is not set
-CONFIG_MACH_NEO1973=y
CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_MACH_NEO1973=y
# CONFIG_MACH_NEXCODER_2440 is not set
# CONFIG_MACH_OSIRIS is not set
# CONFIG_MACH_OTOM is not set
@@ -229,37 +229,37 @@ CONFIG_MACH_NEO1973_GTA02=y
# CONFIG_MACH_VR1000 is not set
# CONFIG_MACH_VSTMS is not set
CONFIG_MFD_CORE=y
-CONFIG_MFD_GLAMO=y
CONFIG_MFD_GLAMO_FB=y
CONFIG_MFD_GLAMO_GPIO=y
CONFIG_MFD_GLAMO_MCI=y
+CONFIG_MFD_GLAMO=y
CONFIG_MFD_PCF50633=y
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MISC_DEVICES is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_S3C=y
+CONFIG_MMC=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ABSENT=y
# CONFIG_MTD_CFI_AMDSTD is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_CONCAT=y
-CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_S3C2410=y
# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
CONFIG_MTD_NAND_S3C2410_HWECC=y
+CONFIG_MTD_NAND_S3C2410=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_ROM=y
CONFIG_NAMESPACES=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NETDEV_1000 is not set
# CONFIG_NET_ETHERNET is not set
# CONFIG_NET_NS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NLATTR=y
CONFIG_NO_IOPORT=y
CONFIG_NR_TTY_DEVICES=6
@@ -270,31 +270,31 @@ CONFIG_PCF50633_ADC=y
CONFIG_PCF50633_GPIO=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PDA_POWER is not set
-CONFIG_PLAT_S3C=y
CONFIG_PLAT_S3C24XX=y
-CONFIG_PM=y
+CONFIG_PLAT_S3C=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
CONFIG_PREEMPT=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
-CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_PCF50633=y
+CONFIG_REGULATOR=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_CMOS is not set
CONFIG_RTC_DRV_PCF50633=y
CONFIG_RTC_DRV_S3C=y
CONFIG_S3C2410_CLOCK=y
-CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_S3C2410_DMA=y
CONFIG_S3C2410_GPIO=y
-CONFIG_S3C2410_PM=y
# CONFIG_S3C2410_PM_CHECK is not set
# CONFIG_S3C2410_PM_DEBUG is not set
+CONFIG_S3C2410_PM=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_S3C2440_DMA=y
# CONFIG_S3C24XX_ADC is not set
@@ -315,76 +315,74 @@ CONFIG_S3C_PWM=y
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_S3C2440=y
-CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG_UARTS=3
-CONFIG_SERIO=y
+CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIO_RAW is not set
# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO=y
# CONFIG_SLOW_WORK is not set
-CONFIG_SND=m
# CONFIG_SND_ARM is not set
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_JACK=y
+CONFIG_SND=m
CONFIG_SND_PCM=m
-CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_I2S=m
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
+CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
-CONFIG_SND_SOC=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC=m
CONFIG_SND_SOC_WM8753=m
CONFIG_SND_TIMER=m
# CONFIG_SND_USB is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
CONFIG_SOUND=m
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SPI=y
CONFIG_SPI_BITBANG=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_MASTER=y
-CONFIG_SPI_S3C24XX=y
CONFIG_SPI_S3C24XX_GPIO=y
+CONFIG_SPI_S3C24XX=y
# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI=y
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_SQUASHFS is not set
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TCP_MD5SIG=y
-CONFIG_TOUCHSCREEN_FILTER=y
CONFIG_TOUCHSCREEN_FILTER_GROUP=y
CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
CONFIG_TOUCHSCREEN_FILTER_MEAN=y
CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-CONFIG_TOUCHSCREEN_S3C2410=y
+CONFIG_TOUCHSCREEN_FILTER=y
# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
+CONFIG_TOUCHSCREEN_S3C2410=y
CONFIG_TRACING_SUPPORT=y
CONFIG_UID16=y
CONFIG_UNEVICTABLE_LRU=y
-CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH=y
# CONFIG_USB_FILE_STORAGE is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
# CONFIG_USB_GADGET_CI13XXX is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_GOKU is not set
@@ -399,6 +397,7 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_S3C2410=y
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET=y
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_G_SERIAL is not set
CONFIG_USB_HID=y
@@ -407,10 +406,11 @@ CONFIG_USB_HID=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_S3C2410=y
# CONFIG_USB_S3C2410_DEBUG is not set
+CONFIG_USB_S3C2410=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_SUSPEND=y
+CONFIG_USB=y
# CONFIG_USB_ZERO is not set
# CONFIG_USER_NS is not set
CONFIG_VECTORS_BASE=0xffff0000
@@ -418,9 +418,9 @@ CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VIDEO_OUTPUT_CONTROL=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
# CONFIG_WLAN_80211 is not set
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/s3c24xx/config-2.6.31 b/target/linux/s3c24xx/config-2.6.31
index dcfddbb21b..ac7bdac3ea 100644
--- a/target/linux/s3c24xx/config-2.6.31
+++ b/target/linux/s3c24xx/config-2.6.31
@@ -14,8 +14,8 @@ CONFIG_ARCH_S3C2410=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARCH_U300 is not set
-CONFIG_ARM=y
CONFIG_ARM_THUMB=y
+CONFIG_ARM=y
# CONFIG_ARPD is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
@@ -25,9 +25,9 @@ CONFIG_BASE_SMALL=0
CONFIG_BATTERY_BQ27000_HDQ=y
# CONFIG_BINARY_PRINTF is not set
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
CONFIG_BRIDGE_NETFILTER=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_CHARGER_PCF50633=y
@@ -35,21 +35,21 @@ CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
CONFIG_COMPAT_BRK=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONSTRUCTORS=y
-CONFIG_CPU_32=y
CONFIG_CPU_32v4T=y
+CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV4T=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_CACHE_V4WT=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
+CONFIG_CPU_LLSERIAL_S3C2440=y
CONFIG_CPU_PABRT_NOIFAR=y
CONFIG_CPU_S3C2410_DMA=y
CONFIG_CPU_S3C2442=y
@@ -60,8 +60,8 @@ CONFIG_CRC7=y
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=y
CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_MD5=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_FS is not set
@@ -76,13 +76,12 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_ELF_CORE=y
# CONFIG_EMBEDDED is not set
# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB=y
CONFIG_FIQ=y
# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONTS=y
# CONFIG_FONT_10x18 is not set
CONFIG_FONT_6x11=y
# CONFIG_FONT_7x14 is not set
@@ -93,12 +92,13 @@ CONFIG_FONT_6x11=y
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_SUN8x16 is not set
+CONFIG_FONTS=y
# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FPE_NWFPE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAME_POINTER=y
CONFIG_FREEZER=y
# CONFIG_FSNOTIFY is not set
@@ -120,12 +120,11 @@ CONFIG_HAVE_IDE=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PWM=y
CONFIG_HDQ_GPIO_BITBANG=y
-CONFIG_HID=y
CONFIG_HID_A4TECH=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
@@ -151,35 +150,36 @@ CONFIG_HID_SUNPLUS=y
CONFIG_HID_SUPPORT=y
CONFIG_HID_THRUSTMASTER=y
CONFIG_HID_TOPSEED=y
+CONFIG_HID=y
CONFIG_HID_ZEROPLUS=y
CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_HZ=200
-CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_DESIGNWARE is not set
CONFIG_I2C_S3C2410=y
+CONFIG_I2C=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INOTIFY=y
-CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_GPIO_BUTTONS is not set
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_LIS302DL=y
-CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_PCF50633_PMU=y
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
-CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP=y
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
# CONFIG_ISDN is not set
@@ -206,11 +206,11 @@ CONFIG_LEDS_GTA02_VIBRATOR=y
# CONFIG_LEDS_S3C24XX is not set
# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
CONFIG_LOCK_KERNEL=y
-CONFIG_LOGO=y
+CONFIG_LOG_BUF_SHIFT=18
# CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOGO=y
CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_AML_M5900 is not set
# CONFIG_MACH_ANUBIS is not set
@@ -218,8 +218,8 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
# CONFIG_MACH_JIVE is not set
# CONFIG_MACH_MINI2440 is not set
# CONFIG_MACH_N30 is not set
-CONFIG_MACH_NEO1973=y
CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_MACH_NEO1973=y
# CONFIG_MACH_NEXCODER_2440 is not set
# CONFIG_MACH_OSIRIS is not set
# CONFIG_MACH_OTOM is not set
@@ -232,36 +232,36 @@ CONFIG_MACH_NEO1973_GTA02=y
# CONFIG_MACH_VR1000 is not set
# CONFIG_MACH_VSTMS is not set
CONFIG_MFD_CORE=y
-CONFIG_MFD_GLAMO=y
CONFIG_MFD_GLAMO_FB=y
CONFIG_MFD_GLAMO_GPIO=y
# CONFIG_MFD_GLAMO_MCI is not set
+CONFIG_MFD_GLAMO=y
CONFIG_MFD_PCF50633=y
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MG_DISK is not set
# CONFIG_MISC_DEVICES is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
+CONFIG_MMC=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MTD_ABSENT=y
# CONFIG_MTD_CFI_AMDSTD is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_CONCAT=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_S3C2410=y
# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
CONFIG_MTD_NAND_S3C2410_HWECC=y
+CONFIG_MTD_NAND_S3C2410=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_ROM=y
CONFIG_NAMESPACES=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NETDEV_1000 is not set
# CONFIG_NET_ETHERNET is not set
# CONFIG_NET_NS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NLS=y
CONFIG_NO_IOPORT=y
CONFIG_NR_TTY_DEVICES=6
@@ -271,38 +271,38 @@ CONFIG_PCF50633_ADC=y
CONFIG_PCF50633_GPIO=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PDA_POWER is not set
-CONFIG_PLAT_S3C=y
CONFIG_PLAT_S3C24XX=y
-CONFIG_PM=y
+CONFIG_PLAT_S3C=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
CONFIG_PREEMPT=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
-CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR_LP3971 is not set
# CONFIG_REGULATOR_MAX1586 is not set
CONFIG_REGULATOR_PCF50633=y
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_RFKILL=y
+CONFIG_REGULATOR=y
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_CMOS is not set
CONFIG_RTC_DRV_PCF50633=y
# CONFIG_RTC_DRV_RX8025 is not set
CONFIG_RTC_DRV_S3C=y
CONFIG_S3C2410_CLOCK=y
-CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_S3C2410_DMA=y
CONFIG_S3C2410_GPIO=y
-CONFIG_S3C2410_PM=y
# CONFIG_S3C2410_PM_CHECK is not set
# CONFIG_S3C2410_PM_DEBUG is not set
+CONFIG_S3C2410_PM=y
CONFIG_S3C2410_WATCHDOG=y
# CONFIG_S3C24XX_ADC is not set
CONFIG_S3C24XX_GPIO_EXTRA=64
@@ -320,74 +320,71 @@ CONFIG_S3C_PWM=y
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_S3C2440=y
-CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG_UARTS=3
-CONFIG_SERIO=y
+CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIO_RAW is not set
# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO=y
# CONFIG_SLOW_WORK is not set
# CONFIG_SMARTJOYPLUS_FF is not set
-CONFIG_SND=m
# CONFIG_SND_DRIVERS is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_JACK=y
+CONFIG_SND=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
CONFIG_SND_PCM=m
# CONFIG_SND_RAWMIDI_SEQ is not set
-CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_I2S=m
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
+CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_SOC=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC=m
CONFIG_SND_SOC_WM8753=m
CONFIG_SND_TIMER=m
# CONFIG_SND_USB is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
CONFIG_SOUND=m
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SPI=y
CONFIG_SPI_BITBANG=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_MASTER=y
-CONFIG_SPI_S3C24XX=y
CONFIG_SPI_S3C24XX_GPIO=y
+CONFIG_SPI_S3C24XX=y
# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI=y
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_SQUASHFS is not set
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TCP_MD5SIG=y
-CONFIG_TOUCHSCREEN_FILTER=y
CONFIG_TOUCHSCREEN_FILTER_GROUP=y
CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
CONFIG_TOUCHSCREEN_FILTER_MEAN=y
CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-CONFIG_TOUCHSCREEN_S3C2410=y
+CONFIG_TOUCHSCREEN_FILTER=y
# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
+CONFIG_TOUCHSCREEN_S3C2410=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_UID16=y
-CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH=y
# CONFIG_USB_FILE_STORAGE is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
@@ -395,6 +392,7 @@ CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_GOKU is not set
@@ -411,6 +409,7 @@ CONFIG_USB_GADGET_S3C2410=y
# CONFIG_USB_GADGET_S3C_HSOTG is not set
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET=y
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_G_SERIAL is not set
CONFIG_USB_HID=y
@@ -419,10 +418,11 @@ CONFIG_USB_HID=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_S3C2410=y
# CONFIG_USB_S3C2410_DEBUG is not set
+CONFIG_USB_S3C2410=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_SUSPEND=y
+CONFIG_USB=y
# CONFIG_USB_ZERO is not set
# CONFIG_USER_NS is not set
CONFIG_VECTORS_BASE=0xffff0000
@@ -430,9 +430,9 @@ CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VIDEO_OUTPUT_CONTROL=y
# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
CONFIG_W1=m
# CONFIG_WLAN_80211 is not set
CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
index 6f8e4e57e4..d87bc852fc 100644
--- a/target/linux/sibyte/config-default
+++ b/target/linux/sibyte/config-default
@@ -1,6 +1,3 @@
-CONFIG_HWMON=y
-CONFIG_SENSORS_LM90=y
-CONFIG_HWMON_DEBUG_CHIP=y
# CONFIG_32BIT is not set
CONFIG_64BIT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -88,6 +85,8 @@ CONFIG_HAVE_IDE=y
# CONFIG_HAVE_KRETPROBES is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_HW_HAS_PCI=y
+CONFIG_HWMON_DEBUG_CHIP=y
+CONFIG_HWMON=y
CONFIG_HW_RANDOM=m
# CONFIG_HZ_100 is not set
CONFIG_HZ=250
@@ -180,6 +179,7 @@ CONFIG_SB1250_MAC=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SCSI is not set
+CONFIG_SENSORS_LM90=y
# CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_NONSTANDARD=y
CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
diff --git a/target/linux/ubicom32/config-2.6.28 b/target/linux/ubicom32/config-2.6.28
index 8c1dae5ddc..cea94dd649 100755
--- a/target/linux/ubicom32/config-2.6.28
+++ b/target/linux/ubicom32/config-2.6.28
@@ -10,31 +10,31 @@ CONFIG_BINFMT_FLAT=y
# CONFIG_BINFMT_SHARED_FLAT is not set
CONFIG_BINFMT_ZFLAT=y
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM=y
CONFIG_BRD_64MB=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="console=ttyUM0 console=ttyUS0 serdes=0x02004000,61,250000000"
CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyUM0 console=ttyUS0 serdes=0x02004000,61,250000000"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CRC_CCITT=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_RNG2=y
# CONFIG_CRYPTO_UBICOM32 is not set
# CONFIG_DEBUG_FS is not set
@@ -53,8 +53,8 @@ CONFIG_FORCE_MAX_ZONEORDER=14
# CONFIG_FPU is not set
# CONFIG_FUTEX is not set
# CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
# CONFIG_GEN_RTC is not set
@@ -65,17 +65,17 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAVE_CLK=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_UBICOM32=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_INITRAMFS_ROOT_UID=0
CONFIG_INITRAMFS_SOURCE="../romfs ../vendors/Ubicom/RouterGateway/initramfs_list"
-CONFIG_INPUT=y
# CONFIG_INPUT_MISC is not set
CONFIG_INPUT_POLLDEV=y
+CONFIG_INPUT=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IP5160DEV is not set
# CONFIG_IP5160EVAL is not set
@@ -87,8 +87,8 @@ CONFIG_IP7160RGW=y
# CONFIG_IP7500AV is not set
# CONFIG_IP7500MEDIA is not set
# CONFIG_IP7500MODULE is not set
-# CONFIG_IRQSTACKS is not set
CONFIG_IRQ_PER_CPU=y
+# CONFIG_IRQSTACKS is not set
# CONFIG_ISDN is not set
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
# CONFIG_JFFS2_SUMMARY is not set
@@ -97,8 +97,8 @@ CONFIG_LDM_DEBUG=y
CONFIG_LDM_PARTITION=y
CONFIG_LEDS_GPIO=y
# CONFIG_LEDS_TRIGGERS is not set
-CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
CONFIG_LIBCRC32C=y
# CONFIG_LINKER_RELAXATION is not set
# CONFIG_MISC_DEVICES is not set
@@ -119,9 +119,9 @@ CONFIG_OCM_MODULES_MAY_CONSUME_REMAINING_CODESPACE=y
CONFIG_OCM_MODULES_RESERVATION=41
# CONFIG_PACKET_MMAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
CONFIG_PCI_DEV0_IDSEL=0x001000000
CONFIG_PCI_DEV1_IDSEL=0x002000000
+CONFIG_PCI=y
CONFIG_PRINTK_TIME=y
CONFIG_PROTECT_KERNEL=y
CONFIG_RAMBASE=0x40000000
@@ -131,37 +131,37 @@ CONFIG_RAMSIZE=0x4000000
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_UBI32_MAILBOX=y
CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE=y
+CONFIG_SERIAL_UBI32_MAILBOX=y
# CONFIG_SERIAL_UBI32_SERDES is not set
# CONFIG_SERIAL_UBI32_UARTTIO is not set
# CONFIG_SIGNALFD is not set
# CONFIG_SMP is not set
-CONFIG_SPI=y
CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_SPIDEV is not set
CONFIG_SPI_UBICOM32_GPIO=y
+CONFIG_SPI=y
# CONFIG_STOP_ON_BUG is not set
# CONFIG_STOP_ON_TRAP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_TICK_ONESHOT=y
-# CONFIG_TIMERFD is not set
-CONFIG_TIMER_EXTRA_ALLOC=0
CONFIG_TIME_LOW_RES=y
+CONFIG_TIMER_EXTRA_ALLOC=0
+# CONFIG_TIMERFD is not set
CONFIG_TINY_SHMEM=y
CONFIG_UBI32_WDT=y
-CONFIG_UBICOM32=y
CONFIG_UBICOM32_GMAC=y
CONFIG_UBICOM32_NAPI=y
CONFIG_UBICOM32_OCM_FOR_SKB=y
CONFIG_UBICOM32_V4=y
+CONFIG_UBICOM32=y
# CONFIG_UBICOM_HID is not set
-CONFIG_UBICOM_INPUT=y
# CONFIG_UBICOM_INPUT_I2C is not set
+CONFIG_UBICOM_INPUT=y
# CONFIG_UNALIGNED_ACCESS_DISABLED is not set
CONFIG_UNALIGNED_ACCESS_ENABLED=y
# CONFIG_UNALIGNED_ACCESS_USERSPACE_ONLY is not set
diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 6283ae09a0..d7a0a6de2d 100644
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -36,9 +36,9 @@ CONFIG_BLK_DEV_AMD74XX=y
# CONFIG_BLK_DEV_DTC2278 is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_HT6560B is not set
-CONFIG_BLK_DEV_IDEDMA=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_IDEDMA_SFF=y
+CONFIG_BLK_DEV_IDEDMA=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_QD65XX is not set
@@ -53,7 +53,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPU5_WDT is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -65,9 +64,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_SUP_AMD=y
CONFIG_CPU_SUP_CENTAUR_32=y
CONFIG_CPU_SUP_CYRIX_32=y
@@ -83,18 +83,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DELL_RBU is not set
# CONFIG_DEPCA is not set
CONFIG_DEVPORT=y
-CONFIG_DMI=y
# CONFIG_DMIID is not set
+CONFIG_DMI=y
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
# CONFIG_EL16 is not set
+# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
# CONFIG_EL3 is not set
CONFIG_ELF_CORE=y
@@ -107,9 +107,9 @@ CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -140,9 +140,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HID=y
CONFIG_HID_COMPAT=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGH_RES_TIMERS is not set
@@ -151,34 +151,33 @@ CONFIG_HID_SUPPORT=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8K is not set
# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
# CONFIG_IBM_ASM is not set
-CONFIG_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
+# CONFIG_IBMASR is not set
# CONFIG_IDE_GD_ATAPI is not set
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD=y
CONFIG_IDE_GENERIC=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
# CONFIG_IDE_PROC_FS is not set
CONFIG_IDE_TIMINGS=y
+CONFIG_IDE=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IOMMU_HELPER is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -187,9 +186,10 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_HELPER is not set
CONFIG_ISA_DMA_API=y
+CONFIG_ISAPNP=y
+CONFIG_ISA=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
@@ -223,16 +223,15 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MEMTEST is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
-CONFIG_MICROCODE=y
# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE=y
# CONFIG_MIXCOMWD is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -240,19 +239,20 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
CONFIG_MTD_BLOCK2MTD=y
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_TS5500 is not set
-CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR=y
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
# CONFIG_MWINCHIP3D is not set
@@ -272,24 +272,24 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
-CONFIG_PNP=y
# CONFIG_PNPACPI is not set
# CONFIG_PNPBIOS is not set
CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PNP=y
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_R6040 is not set
@@ -303,25 +303,25 @@ CONFIG_RTC=y
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
# CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
# CONFIG_SCx200_WDT is not set
+CONFIG_SCx200=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_SONYPI is not set
@@ -335,42 +335,41 @@ CONFIG_UID16=y
CONFIG_USB_SUPPORT=y
# CONFIG_USER_NS is not set
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_VGASTATE is not set
CONFIG_VGA_CONSOLE=y
+# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VORTEX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_WDT is not set
-CONFIG_X86=y
CONFIG_X86_32=y
# CONFIG_X86_64 is not set
CONFIG_X86_BIOS_REBOOT=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
# CONFIG_X86_CMPXCHG is not set
-CONFIG_X86_CPU=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
+CONFIG_X86_CPU=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_E_POWERSAVER is not set
CONFIG_X86_F00F_BUG=y
CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_GENERIC=y
# CONFIG_X86_GENERICARCH is not set
+CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_LOCAL_APIC=y
# CONFIG_X86_LONGRUN is not set
-CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
# CONFIG_X86_MCE_P4THERMAL is not set
+CONFIG_X86_MCE=y
CONFIG_X86_MINIMUM_CPU_FAMILY=3
CONFIG_X86_MPPARSE=y
# CONFIG_X86_MSR is not set
@@ -394,4 +393,5 @@ CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_VSMP is not set
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index 6cc268590b..36da392edb 100644
--- a/target/linux/x86/config-2.6.30
+++ b/target/linux/x86/config-2.6.30
@@ -26,11 +26,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_AT1700 is not set
-CONFIG_ATA=y
CONFIG_ATA_GENERIC=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_PIIX=y
CONFIG_ATA_SFF=y
+CONFIG_ATA=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
@@ -45,7 +45,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPU5_WDT is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -57,9 +56,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_SUP_AMD=y
CONFIG_CPU_SUP_CENTAUR=y
CONFIG_CPU_SUP_CYRIX_32=y
@@ -79,18 +79,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DEPCA is not set
CONFIG_DEVPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
# CONFIG_DMIID is not set
+CONFIG_DMI=y
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
# CONFIG_EL16 is not set
+# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
# CONFIG_EL3 is not set
CONFIG_ELF_CORE=y
@@ -105,9 +105,9 @@ CONFIG_FIX_EARLYCON_MEM=y
# CONFIG_FRAME_POINTER is not set
# CONFIG_FTRACE_SYSCALLS is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -133,8 +133,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -143,16 +143,16 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HID=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGH_RES_TIMERS is not set
@@ -161,28 +161,26 @@ CONFIG_HID_SUPPORT=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8K is not set
# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
# CONFIG_IBM_ASM is not set
+# CONFIG_IBMASR is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -191,9 +189,11 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
CONFIG_ISA_DMA_API=y
+CONFIG_ISAPNP=y
+CONFIG_ISA=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
@@ -231,17 +231,16 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MEMTEST is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
-CONFIG_MICROCODE=y
# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE=y
# CONFIG_MIXCOMWD is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MMIOTRACE is not set
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -249,19 +248,20 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
CONFIG_MTD_BLOCK2MTD=y
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_TS5500 is not set
-CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR=y
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
# CONFIG_MWINCHIP3D is not set
@@ -289,24 +289,24 @@ CONFIG_PATA_SC1200=y
CONFIG_PATA_VIA=y
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
-CONFIG_PNP=y
# CONFIG_PNPACPI is not set
# CONFIG_PNPBIOS is not set
CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PNP=y
# CONFIG_POWER_TRACER is not set
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
@@ -322,34 +322,34 @@ CONFIG_RTC=y
# CONFIG_SC520_WDT is not set
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+CONFIG_SCSI=y
# CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
# CONFIG_SCx200_WDT is not set
+CONFIG_SCx200=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_SYSPROF_TRACER is not set
# CONFIG_TELCLOCK is not set
@@ -365,25 +365,24 @@ CONFIG_VGA_CONSOLE=y
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VORTEX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_WDT is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
# CONFIG_X86_CMPXCHG is not set
-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
# CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_F00F_BUG=y
CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
@@ -394,9 +393,9 @@ CONFIG_X86_L1_CACHE_BYTES=64
CONFIG_X86_L1_CACHE_SHIFT=4
CONFIG_X86_LOCAL_APIC=y
# CONFIG_X86_LONGRUN is not set
-CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
# CONFIG_X86_MCE_P4THERMAL is not set
+CONFIG_X86_MCE=y
CONFIG_X86_MINIMUM_CPU_FAMILY=3
CONFIG_X86_MPPARSE=y
# CONFIG_X86_MSR is not set
@@ -418,4 +417,5 @@ CONFIG_X86_RESERVE_LOW_64K=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/config-2.6.31 b/target/linux/x86/config-2.6.31
index ce211009ed..31c89fd035 100644
--- a/target/linux/x86/config-2.6.31
+++ b/target/linux/x86/config-2.6.31
@@ -26,11 +26,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_AT1700 is not set
-CONFIG_ATA=y
CONFIG_ATA_GENERIC=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_PIIX=y
CONFIG_ATA_SFF=y
+CONFIG_ATA=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINARY_PRINTF is not set
@@ -46,7 +46,6 @@ CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONSTRUCTORS=y
# CONFIG_CPU5_WDT is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -58,9 +57,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_SUP_AMD=y
CONFIG_CPU_SUP_CENTAUR=y
CONFIG_CPU_SUP_CYRIX_32=y
@@ -80,18 +80,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DEPCA is not set
CONFIG_DEVPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
# CONFIG_DMIID is not set
+CONFIG_DMI=y
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
# CONFIG_EL16 is not set
+# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
# CONFIG_EL3 is not set
CONFIG_ELF_CORE=y
@@ -106,9 +106,9 @@ CONFIG_FIX_EARLYCON_MEM=y
# CONFIG_FRAME_POINTER is not set
CONFIG_FSNOTIFY=y
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -137,8 +137,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -147,17 +147,17 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HID=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGH_RES_TIMERS is not set
@@ -166,29 +166,26 @@ CONFIG_HID_SUPPORT=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8K is not set
# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
# CONFIG_IBM_ASM is not set
+# CONFIG_IBMASR is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_STRESS is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -197,9 +194,12 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_STRESS is not set
CONFIG_ISA_DMA_API=y
+CONFIG_ISAPNP=y
+CONFIG_ISA=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
@@ -238,16 +238,15 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MEMTEST is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
-CONFIG_MICROCODE=y
# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE=y
# CONFIG_MIXCOMWD is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -255,19 +254,20 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
CONFIG_MTD_BLOCK2MTD=y
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_TS5500 is not set
-CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR=y
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
# CONFIG_MWINCHIP3D is not set
@@ -296,24 +296,24 @@ CONFIG_PATA_SC1200=y
CONFIG_PATA_VIA=y
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PNP=y
# CONFIG_PNPACPI is not set
# CONFIG_PNPBIOS is not set
CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PNP=y
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
CONFIG_RD_BZIP2=y
@@ -328,34 +328,34 @@ CONFIG_RTC=y
# CONFIG_SC520_WDT is not set
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+CONFIG_SCSI=y
# CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
# CONFIG_SCx200_WDT is not set
+CONFIG_SCx200=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_TELCLOCK is not set
# CONFIG_TOSHIBA is not set
@@ -370,26 +370,25 @@ CONFIG_VGA_CONSOLE=y
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VORTEX is not set
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_WDT is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_ANCIENT_MCE is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
# CONFIG_X86_CMPXCHG is not set
-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
# CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_F00F_BUG=y
CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
@@ -400,11 +399,11 @@ CONFIG_X86_L1_CACHE_BYTES=64
CONFIG_X86_L1_CACHE_SHIFT=4
CONFIG_X86_LOCAL_APIC=y
# CONFIG_X86_LONGRUN is not set
-CONFIG_X86_MCE=y
CONFIG_X86_MCE_AMD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE=y
CONFIG_X86_MINIMUM_CPU_FAMILY=3
CONFIG_X86_MPPARSE=y
# CONFIG_X86_MSR is not set
@@ -429,4 +428,5 @@ CONFIG_X86_THERMAL_VECTOR=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/olpc/config-2.6.30 b/target/linux/x86/olpc/config-2.6.30
index f4f32e0a9a..dac5ea2c1d 100644
--- a/target/linux/x86/olpc/config-2.6.30
+++ b/target/linux/x86/olpc/config-2.6.30
@@ -1,6 +1,5 @@
CONFIG_4KSTACKS=y
# CONFIG_64BIT is not set
-CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_BATTERY=y
@@ -13,15 +12,16 @@ CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_PROCFS is not set
CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_SBS is not set
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_WMI is not set
+CONFIG_ACPI=y
# CONFIG_AGP is not set
# CONFIG_APM is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -57,8 +57,8 @@ CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV is not set
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BLK_DEV_SR=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -74,7 +74,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
# CONFIG_CPA_DEBUG is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -86,12 +85,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_IDLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_SUP_AMD=y
# CONFIG_CPU_SUP_CENTAUR is not set
# CONFIG_CPU_SUP_CYRIX_32 is not set
@@ -115,8 +115,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_NX_TEST is not set
@@ -142,12 +142,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEVPORT=y
CONFIG_DISPLAY_SUPPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
CONFIG_DMIID=y
+CONFIG_DMI=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EEEPC_LAPTOP is not set
@@ -156,33 +156,33 @@ CONFIG_ELF_CORE=y
CONFIG_EXT2_FS=y
CONFIG_FAST_CMPXCHG_LOCAL=y
# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_GEODE=y
-# CONFIG_FB_GEODE_GX is not set
# CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_GEODE_GX is not set
CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
+CONFIG_FB=y
# CONFIG_FCOE_FNIC is not set
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAME_POINTER is not set
CONFIG_FREEZER=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_FUJITSU_LAPTOP is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -210,8 +210,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -220,8 +220,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -229,37 +229,35 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_HIBERNATION=y
-CONFIG_HID=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
-# CONFIG_HPET is not set
CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_HPET is not set
CONFIG_HPET_TIMER=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I8K is not set
# CONFIG_IMA is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INTEL_MENLOW is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -268,17 +266,19 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_ISA is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set
-CONFIG_KEXEC=y
# CONFIG_KEXEC_JUMP is not set
+CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
@@ -316,12 +316,11 @@ CONFIG_MGEODE_LX=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
+CONFIG_MMC=y
# CONFIG_MMIOTRACE is not set
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -330,11 +329,12 @@ CONFIG_MOUSE_PS2_OLPC=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MSI_LAPTOP is not set
@@ -349,12 +349,12 @@ CONFIG_MTD_PCI=y
# CONFIG_MWINCHIP3D is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_ETHERNET is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NOHIGHMEM=y
-CONFIG_NOP_TRACER=y
CONFIG_NO_HZ=y
+CONFIG_NOP_TRACER=y
CONFIG_NR_CPUS=1
# CONFIG_NSC_GPIO is not set
CONFIG_NVRAM=y
@@ -367,32 +367,32 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PARTITION_ADVANCED is not set
# CONFIG_PC8736x_GPIO is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_GOANY is not set
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
CONFIG_PCI_GOOLPC=y
CONFIG_PCI_OLPC=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PDA_POWER is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
-CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_SLEEP=y
CONFIG_PM_STD_PARTITION=""
# CONFIG_PM_TRACE_RTC is not set
# CONFIG_PM_VERBOSE is not set
-CONFIG_PNP=y
+CONFIG_PM=y
CONFIG_PNPACPI=y
CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_TRACER is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
@@ -408,32 +408,32 @@ CONFIG_RTC=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_HRTICK=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_SCHEDSTATS=y
CONFIG_SCSI=y
# CONFIG_SCx200 is not set
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLOW_WORK is not set
# CONFIG_SMP is not set
# CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_STACKTRACE=y
CONFIG_STRICT_DEVMEM=y
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_SYSPROF_TRACER is not set
# CONFIG_TC1100_WMI is not set
# CONFIG_TELCLOCK is not set
@@ -443,10 +443,9 @@ CONFIG_TICK_ONESHOT=y
CONFIG_TIMER_STATS=y
# CONFIG_TOSHIBA is not set
CONFIG_TRACEPOINTS=y
-CONFIG_TRACING=y
CONFIG_TRACING_SUPPORT=y
+CONFIG_TRACING=y
CONFIG_UID16=y
-CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -456,35 +455,35 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_UHCI_HCD=y
+CONFIG_USB=y
CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGA_CONSOLE=y
CONFIG_VM86=y
+CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_ACPI_CPUFREQ is not set
CONFIG_X86_BSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DS is not set
# CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_INTEL_USERCOPY=y
@@ -525,4 +524,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/olpc/config-2.6.31 b/target/linux/x86/olpc/config-2.6.31
index 54f037ae0d..1907d34695 100644
--- a/target/linux/x86/olpc/config-2.6.31
+++ b/target/linux/x86/olpc/config-2.6.31
@@ -1,6 +1,5 @@
CONFIG_4KSTACKS=y
# CONFIG_64BIT is not set
-CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_BATTERY=y
@@ -13,15 +12,16 @@ CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_PROCFS is not set
CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_SBS is not set
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_WMI is not set
+CONFIG_ACPI=y
# CONFIG_AGP is not set
# CONFIG_APM is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -42,10 +42,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_ASUS_LAPTOP is not set
-CONFIG_ATA=y
CONFIG_ATA_GENERIC=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_PIIX=y
+CONFIG_ATA=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
@@ -61,8 +61,8 @@ CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV is not set
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BLK_DEV_SR=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -79,7 +79,6 @@ CONFIG_COMPAT_VDSO=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CPA_DEBUG is not set
-CONFIG_CPU_FREQ=y
# CONFIG_CPU_FREQ_DEBUG is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -91,12 +90,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_IDLE=y
+CONFIG_CPU_FREQ=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_SUP_AMD=y
CONFIG_CPU_SUP_CENTAUR=y
CONFIG_CPU_SUP_CYRIX_32=y
@@ -115,8 +115,8 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
@@ -144,13 +144,13 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEVPORT=y
CONFIG_DISPLAY_SUPPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
CONFIG_DMIID=y
+CONFIG_DMI=y
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
# CONFIG_EFI is not set
@@ -161,36 +161,36 @@ CONFIG_EVENT_TRACING=y
CONFIG_EXT2_FS=y
CONFIG_FAST_CMPXCHG_LOCAL=y
# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_GEODE=y
-# CONFIG_FB_GEODE_GX is not set
# CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_GEODE_GX is not set
CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_LE80578 is not set
# CONFIG_FB_N411 is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_VESA is not set
+CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAME_POINTER is not set
CONFIG_FREEZER=y
# CONFIG_FUJITSU_LAPTOP is not set
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -221,8 +221,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FTRACE_SYSCALLS=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -231,47 +231,44 @@ CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_COUNTERS=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_NVS=y
-CONFIG_HID=y
+CONFIG_HIBERNATION=y
CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HPET is not set
CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_HPET is not set
CONFIG_HPET_TIMER=y
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_GEODE=y
CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_I8K is not set
# CONFIG_IMA is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INTEL_MENLOW is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_STRESS is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -280,17 +277,20 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_ISA is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_STRESS is not set
CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS=y
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set
-CONFIG_KEXEC=y
# CONFIG_KEXEC_JUMP is not set
+CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
@@ -329,15 +329,14 @@ CONFIG_MGEODE_LX=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
# CONFIG_MMC_SDHCI_PCI is not set
# CONFIG_MMC_SDHCI_PLTFM is not set
+CONFIG_MMC_SDHCI=y
# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_WBSD is not set
+CONFIG_MMC=y
# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -346,11 +345,12 @@ CONFIG_MOUSE_PS2_OLPC=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MSI_LAPTOP is not set
@@ -366,14 +366,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MWINCHIPC6 is not set
CONFIG_NAMESPACES=y
# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_ETHERNET is not set
# CONFIG_NET_NS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NLS=y
CONFIG_NOHIGHMEM=y
-CONFIG_NOP_TRACER=y
CONFIG_NO_HZ=y
+CONFIG_NOP_TRACER=y
CONFIG_NR_CPUS=1
# CONFIG_NSC_GPIO is not set
CONFIG_NVRAM=y
@@ -392,33 +392,33 @@ CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_SC1200=y
CONFIG_PATA_VIA=y
# CONFIG_PC8736x_GPIO is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_GOANY is not set
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
CONFIG_PCI_GOOLPC=y
CONFIG_PCI_OLPC=y
+CONFIG_PCI=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PDA_POWER is not set
CONFIG_PERF_COUNTERS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_SLEEP=y
CONFIG_PM_STD_PARTITION=""
# CONFIG_PM_TRACE_RTC is not set
# CONFIG_PM_VERBOSE is not set
-CONFIG_PNP=y
+CONFIG_PM=y
CONFIG_PNPACPI=y
CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PROC_PAGE_MONITOR=y
@@ -435,36 +435,36 @@ CONFIG_RTC=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
+CONFIG_SCHEDSTATS=y
# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI=y
# CONFIG_SCx200 is not set
# CONFIG_SDIO_UART is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO=y
# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
# CONFIG_SMP is not set
-CONFIG_SPARSEMEM_STATIC=y
# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_STACKTRACE=y
CONFIG_STRICT_DEVMEM=y
-CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
# CONFIG_TC1100_WMI is not set
# CONFIG_TELCLOCK is not set
CONFIG_THERMAL=y
@@ -475,7 +475,6 @@ CONFIG_TIMER_STATS=y
CONFIG_TRACEPOINTS=y
CONFIG_TRACING=y
CONFIG_UID16=y
-CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -485,35 +484,35 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_UHCI_HCD=y
+CONFIG_USB=y
# CONFIG_USER_NS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGA_CONSOLE=y
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
# CONFIG_WATCHDOG is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
# CONFIG_X86_64 is not set
# CONFIG_X86_ACPI_CPUFREQ is not set
# CONFIG_X86_ANCIENT_MCE is not set
CONFIG_X86_BSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DS is not set
# CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_GENERIC=y
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_INTEL_USERCOPY=y
@@ -554,4 +553,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
+CONFIG_X86=y
# CONFIG_ZONE_DMA32 is not set