diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-06-06 06:32:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-06-06 06:32:41 +0000 |
| commit | 7077028d457b339db9044ce06f74d0c1ce5c7b7c (patch) | |
| tree | f364ca1c6a73f6da433e7312cce9ec722ad7b49f /target | |
| parent | 91aa0a7ca07219c2fef2686789813d98ad53b2f2 (diff) | |
| download | upstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.tar.gz upstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.tar.bz2 upstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.zip | |
sync kernel config, and refresh patches
SVN-Revision: 16352
Diffstat (limited to 'target')
6 files changed, 11 insertions, 8 deletions
diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29 index 59265aa69b..9f54da924b 100644 --- a/target/linux/ar71xx/config-2.6.29 +++ b/target/linux/ar71xx/config-2.6.29 @@ -19,6 +19,7 @@ CONFIG_AR71XX_MACH_TL_WR941ND=y CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WNR2000=y CONFIG_AR71XX_MACH_WP543=y +CONFIG_AR71XX_MACH_WRT160NL=y CONFIG_AR71XX_MACH_WRT400N=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set @@ -77,7 +78,6 @@ CONFIG_DEVPORT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y -# CONFIG_EEPROM_AT25 is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30 index c24b542918..3d60d4cce6 100644 --- a/target/linux/ar71xx/config-2.6.30 +++ b/target/linux/ar71xx/config-2.6.30 @@ -71,6 +71,12 @@ 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 @@ -110,7 +116,6 @@ CONFIG_IRQ_CPU=y # CONFIG_ISDN is not set # CONFIG_LEDS_GPIO is not set # CONFIG_LEMOTE_FULONG is not set -# CONFIG_LIB80211 is not set # CONFIG_M25PXX_USE_FAST_READ is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -134,7 +139,6 @@ CONFIG_MIPS_MT_DISABLED=y CONFIG_MTD_CONCAT=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y -# CONFIG_MTD_NAND_CAFE is not set CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y @@ -156,7 +160,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_PHYLIB=y # CONFIG_PMC_MSP is not set diff --git a/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch index 3b01aea104..30004aaf66 100644 --- a/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -586,6 +586,13 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ +@@ -593,6 +593,13 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/ diff --git a/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch index 511fbbfd83..a7340a20ec 100644 --- a/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -160,6 +160,7 @@ endif +@@ -167,6 +167,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ diff --git a/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch index da6d2e79eb..4310956667 100644 --- a/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -602,6 +602,13 @@ else +@@ -609,6 +609,13 @@ else load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 endif diff --git a/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch index db0c4b21d2..25c7e3e10c 100644 --- a/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -164,6 +164,7 @@ endif +@@ -171,6 +171,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ |