adm5120: sync kernel configs

[openwrt.git] / target / linux / adm5120 / router_le / config-2.6.30

diff --git a/target/linux/adm5120/router_le/config-2.6.30 b/target/linux/adm5120/router_le/config-2.6.30
index 6d65d79..d6f98f7 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.30
+++ b/target/linux/adm5120/router_le/config-2.6.30
@@ -2,6 +2,7 @@ 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_61X4WG=y
@@ -27,6 +28,7 @@ CONFIG_ADM5120_OEM_EDIMAX=y
 CONFIG_ADM5120_OEM_INFINEON=y
 CONFIG_ADM5120_OEM_MIKROTIK=y
 CONFIG_ADM5120_OEM_MOTOROLA=y
+CONFIG_ADM5120_OEM_OSBRIDGE=y
 # CONFIG_ADM5120_OEM_ZYXEL is not set
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
@@ -39,15 +41,12 @@ CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_AMBA=y
 CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
-CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 # CONFIG_BINARY_PRINTF is not set
 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_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
@@ -83,9 +82,14 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RNG2=y
@@ -125,13 +129,14 @@ CONFIG_HID=m
 CONFIG_HID_SUPPORT=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=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
-# CONFIG_I2C is not set
+CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -139,7 +144,6 @@ CONFIG_INPUT=m
 # CONFIG_INPUT_GPIO_BUTTONS is not set
 # 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
@@ -175,10 +179,8 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_TRXSPLIT=y
-# CONFIG_NATSEMI is not set
 CONFIG_NO_HZ=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
@@ -186,18 +188,13 @@ CONFIG_NO_HZ=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PATA_RB153_CF=m
-# CONFIG_PATA_SCH is not set
-CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCSPKR_PLATFORM is not set
 # 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_PROBE_INITRD_HEADER is not set
-# CONFIG_PROM_EMU is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=m
 # CONFIG_SERIAL_8250 is not set
@@ -237,7 +234,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
-CONFIG_TICK_ONESHOT=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y