From 0ddc97c252eefb8a56dd645c4ef3543a2df443c0 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 8 Oct 2009 11:13:01 +0000 Subject: [PATCH] adm5120: sync kernel config SVN-Revision: 17998 --- target/linux/adm5120/router_be/config-2.6.28 | 2 ++ target/linux/adm5120/router_be/config-2.6.30 | 11 +++-------- target/linux/adm5120/router_le/config-2.6.28 | 14 +++++++++++++- target/linux/adm5120/router_le/config-2.6.30 | 10 +++++++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28 index 579f4c10ad..dac488f5da 100644 --- a/target/linux/adm5120/router_be/config-2.6.28 +++ b/target/linux/adm5120/router_be/config-2.6.28 @@ -11,6 +11,7 @@ CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_INFINEON is not set # CONFIG_ADM5120_OEM_MIKROTIK is not set # CONFIG_ADM5120_OEM_MOTOROLA is not set +# CONFIG_ADM5120_OEM_OSBRIDGE is not set CONFIG_ADM5120_OEM_ZYXEL=y CONFIG_ADM5120_SOC_BGA=y CONFIG_ADM5120_WDT=y @@ -120,6 +121,7 @@ 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 diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30 index 6e334349e7..e954c7af32 100644 --- a/target/linux/adm5120/router_be/config-2.6.30 +++ b/target/linux/adm5120/router_be/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_P_334WT=y CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_CELLVISION is not set @@ -10,6 +11,7 @@ CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_INFINEON is not set # CONFIG_ADM5120_OEM_MIKROTIK is not set # CONFIG_ADM5120_OEM_MOTOROLA is not set +CONFIG_ADM5120_OEM_OSBRIDGE=y CONFIG_ADM5120_OEM_ZYXEL=y CONFIG_ADM5120_SOC_BGA=y CONFIG_ADM5120_WDT=y @@ -63,12 +65,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER2=y -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_DECOMPRESS_LZMA=y @@ -120,7 +116,6 @@ CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LEMOTE_FULONG is not set -# CONFIG_LIB80211 is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -131,6 +126,7 @@ 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 @@ -154,7 +150,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y 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 diff --git a/target/linux/adm5120/router_le/config-2.6.28 b/target/linux/adm5120/router_le/config-2.6.28 index 24c0f8d42a..287feaa96e 100644 --- a/target/linux/adm5120/router_le/config-2.6.28 +++ b/target/linux/adm5120/router_le/config-2.6.28 @@ -82,6 +82,17 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # 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_ARC4=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=m +CONFIG_CRYPTO_RNG2=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set @@ -114,6 +125,7 @@ CONFIG_HID_COMPAT=y 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 @@ -150,6 +162,7 @@ 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 @@ -175,7 +188,6 @@ 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 diff --git a/target/linux/adm5120/router_le/config-2.6.30 b/target/linux/adm5120/router_le/config-2.6.30 index 538fed0b6c..394b85ae29 100644 --- a/target/linux/adm5120/router_le/config-2.6.30 +++ b/target/linux/adm5120/router_le/config-2.6.30 @@ -86,9 +86,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 @@ -128,6 +133,7 @@ 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 @@ -164,6 +170,7 @@ 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 @@ -179,7 +186,6 @@ 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 @@ -190,11 +196,9 @@ 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 -- 2.30.2