adm5120: sync kernel configs

SVN-Revision: 19741

2 files changed, 44 insertions, 45 deletions

diff --git a/target/linux/adm5120/router_le/config-2.6.30 b/target/linux/adm5120/router_le/config-2.6.30
index 793f96173e..d6f98f7acc 100644
--- a/target/linux/adm5120/router_le/config-2.6.30
+++ b/target/linux/adm5120/router_le/config-2.6.30
@@ -1,9 +1,10 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_6104K=y
+CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_61X4WG=y
 CONFIG_ADM5120_MACH_CAS_771=y
 CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -15,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_133C=y
 CONFIG_ADM5120_MACH_RB_133=y
+CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_150=y
 CONFIG_ADM5120_MACH_RB_153=y
 CONFIG_ADM5120_MACH_RB_192=y
@@ -31,7 +32,6 @@ 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
@@ -47,8 +47,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_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -57,9 +57,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
@@ -84,18 +84,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -106,8 +106,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -127,33 +127,33 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # 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
@@ -162,8 +162,8 @@ CONFIG_LIB80211=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
 CONFIG_MIPS_MACHINE=y
 # CONFIG_MIPS_MALTA is not set
@@ -171,7 +171,6 @@ 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
@@ -179,8 +178,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_PLATFORM=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NO_HZ=y
 # CONFIG_NO_IOPORT is not set
@@ -199,18 +198,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
@@ -238,9 +237,9 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=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.32 b/target/linux/adm5120/router_le/config-2.6.32
index 886b149c96..263011f9e7 100644
--- a/target/linux/adm5120/router_le/config-2.6.32
+++ b/target/linux/adm5120/router_le/config-2.6.32
@@ -1,9 +1,10 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_6104K=y
+CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_61X4WG=y
 CONFIG_ADM5120_MACH_CAS_771=y
 CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -15,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_133C=y
 CONFIG_ADM5120_MACH_RB_133=y
+CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_150=y
 CONFIG_ADM5120_MACH_RB_153=y
 CONFIG_ADM5120_MACH_RB_192=y
@@ -31,7 +32,6 @@ 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
@@ -50,8 +50,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_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -60,9 +60,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_LOONGSON2E 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
@@ -87,18 +87,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -109,8 +109,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -130,32 +130,32 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+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
@@ -165,6 +165,7 @@ CONFIG_LIB80211=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_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
@@ -173,7 +174,6 @@ 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
@@ -181,8 +181,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_PLATFORM=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NLS=m
 CONFIG_NO_HZ=y
@@ -202,18 +202,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
@@ -241,9 +241,9 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=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