adm5120: sync kernel configs

SVN-Revision: 19741

2 files changed, 26 insertions, 27 deletions

diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30
index 71703aacbd..931987495a 100644
--- a/target/linux/adm5120/router_be/config-2.6.30
+++ b/target/linux/adm5120/router_be/config-2.6.30
@@ -1,5 +1,6 @@
 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
@@ -14,7 +15,6 @@ 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
@@ -30,8 +30,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,jffs2"
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -40,9 +40,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
@@ -64,8 +64,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_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -76,8 +76,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
@@ -98,20 +98,20 @@ CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 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_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_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_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
@@ -121,8 +121,8 @@ CONFIG_LEGACY_PTYS=y
 # 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
@@ -130,7 +130,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_BLOCK2MTD=y
@@ -154,18 +153,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
@@ -192,10 +191,10 @@ 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_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.32 b/target/linux/adm5120/router_be/config-2.6.32
index 13ecb910fc..f919e0d66c 100644
--- a/target/linux/adm5120/router_be/config-2.6.32
+++ b/target/linux/adm5120/router_be/config-2.6.32
@@ -1,5 +1,6 @@
 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
@@ -14,7 +15,6 @@ 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_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
 CONFIG_CPU_BIG_ENDIAN=y
@@ -43,9 +43,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # 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
@@ -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_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=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_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
@@ -101,20 +101,20 @@ CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 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_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_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -124,6 +124,7 @@ CONFIG_LEGACY_PTYS=y
 # 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
@@ -132,7 +133,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_BLOCK2MTD=y
@@ -157,18 +157,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
@@ -195,10 +195,10 @@ 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_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