From 5aefad6b53ebc6c5ccc83c5d73a2a5c40f6ffc28 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 9 Dec 2009 08:03:35 +0000 Subject: [PATCH] ar71xx: sync kernel configs git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18711 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/config-2.6.28 | 18 +++++++++--------- target/linux/ar71xx/config-2.6.30 | 22 +++++++++++----------- target/linux/ar71xx/config-2.6.31 | 27 ++++++++++++++------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index fc17341d5d..7f84bab54a 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -1,9 +1,9 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set # CONFIG_8139TOO is not set +CONFIG_AG71XX=y CONFIG_AG71XX_AR8216_SUPPORT=y # CONFIG_AG71XX_DEBUG is not set -CONFIG_AG71XX=y CONFIG_AR71XX_MACH_AP81=y CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y @@ -45,9 +45,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 is not set CONFIG_CPU_MIPS32_R2=y -CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R2 is not set CONFIG_CPU_MIPSR2=y @@ -75,8 +75,8 @@ CONFIG_DEVPORT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y @@ -94,10 +94,10 @@ CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -CONFIG_I2C=y CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set CONFIG_IMAGE_CMDLINE_HACK=y @@ -118,6 +118,7 @@ CONFIG_IRQ_CPU=y # CONFIG_MACH_VR41XX is not set CONFIG_MICREL_PHY=y # 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 @@ -126,20 +127,20 @@ 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_MTD_AR91XX_FLASH=y -# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI is not set +# CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_M25P80=y CONFIG_MTD_MYLOADER_PARTS=y -CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y CONFIG_MYLOADER=y +CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_MV88E6123_61_65 is not set # CONFIG_NET_DSA_MV88E6131 is not set @@ -148,7 +149,6 @@ CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_TAG_DSA is not set # CONFIG_NET_DSA_TAG_EDSA is not set CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_NET_DSA=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set @@ -183,6 +183,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SIBYTE_SWARM is not set # CONFIG_SLAB is not set CONFIG_SLUB=y +CONFIG_SPI=y CONFIG_SPI_AP83=y CONFIG_SPI_AR71XX=y CONFIG_SPI_BITBANG=y @@ -191,7 +192,6 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_PB44=y # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_VSC7385 is not set -CONFIG_SPI=y CONFIG_SWCONFIG=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30 index 914c2655a0..9b7e5fe953 100644 --- a/target/linux/ar71xx/config-2.6.30 +++ b/target/linux/ar71xx/config-2.6.30 @@ -1,8 +1,8 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set +CONFIG_AG71XX=y CONFIG_AG71XX_AR8216_SUPPORT=y # CONFIG_AG71XX_DEBUG is not set -CONFIG_AG71XX=y CONFIG_AR71XX_MACH_AP81=y CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y @@ -38,8 +38,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="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200" CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_CAVIUM_OCTEON is not set @@ -48,9 +48,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 is not set CONFIG_CPU_MIPS32_R2=y -CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R2 is not set CONFIG_CPU_MIPSR2=y @@ -72,16 +72,16 @@ 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 CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=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,10 +101,10 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_OPROFILE=y CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -CONFIG_I2C=y CONFIG_ICPLUS_PHY=y CONFIG_IMAGE_CMDLINE_HACK=y CONFIG_INITRAMFS_ROOT_GID=0 @@ -123,6 +123,7 @@ CONFIG_IRQ_CPU=y # CONFIG_MACH_VR41XX is not set CONFIG_MICREL_PHY=y # 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 @@ -131,20 +132,20 @@ 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_MTD_AR91XX_FLASH=y -# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI is not set +# CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_M25P80=y CONFIG_MTD_MYLOADER_PARTS=y -CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y CONFIG_MYLOADER=y +CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_MV88E6123_61_65 is not set # CONFIG_NET_DSA_MV88E6131 is not set @@ -153,7 +154,6 @@ CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_TAG_DSA is not set # CONFIG_NET_DSA_TAG_EDSA is not set CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_NET_DSA=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set @@ -188,6 +188,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SLAB is not set # CONFIG_SLOW_WORK is not set CONFIG_SLUB=y +CONFIG_SPI=y CONFIG_SPI_AP83=y CONFIG_SPI_AR71XX=y CONFIG_SPI_BITBANG=y @@ -196,7 +197,6 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_PB44=y # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_VSC7385 is not set -CONFIG_SPI=y CONFIG_SWCONFIG=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31 index fa9f5dd8a1..a975cd7a54 100644 --- a/target/linux/ar71xx/config-2.6.31 +++ b/target/linux/ar71xx/config-2.6.31 @@ -1,9 +1,10 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set +CONFIG_AG71XX=y CONFIG_AG71XX_AR8216_SUPPORT=y # CONFIG_AG71XX_DEBUG is not set -CONFIG_AG71XX=y # CONFIG_ALCHEMY_GPIO_INDIRECT is not set +# CONFIG_AR7 is not set CONFIG_AR71XX_MACH_AP81=y CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y @@ -15,9 +16,9 @@ CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB44=y CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_TL_WR1043ND=y CONFIG_AR71XX_MACH_TL_WR741ND=y CONFIG_AR71XX_MACH_TL_WR941ND=y -CONFIG_AR71XX_MACH_TL_WR1043ND=y CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WNDR3700=y CONFIG_AR71XX_MACH_WNR2000=y @@ -25,7 +26,6 @@ CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_MACH_WRT160NL=y CONFIG_AR71XX_MACH_WRT400N=y CONFIG_AR71XX_WDT=y -# CONFIG_AR7 is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y @@ -40,8 +40,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="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200" CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_CAVIUM_OCTEON is not set @@ -50,9 +50,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 is not set CONFIG_CPU_MIPS32_R2=y -CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R2 is not set CONFIG_CPU_MIPSR2=y @@ -74,8 +74,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 @@ -83,8 +83,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y # CONFIG_FSNOTIFY is not set -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 @@ -103,12 +103,13 @@ CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -CONFIG_I2C=y CONFIG_ICPLUS_PHY=y CONFIG_IMAGE_CMDLINE_HACK=y +# CONFIG_INITRAMFS_COMPRESSION_LZO is not set CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_SOURCE="../../root" @@ -126,6 +127,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0 # CONFIG_MACH_VR41XX is not set CONFIG_MICREL_PHY=y # 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 @@ -134,20 +136,20 @@ 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_MTD_AR91XX_FLASH=y -# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI is not set +# CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_M25P80=y CONFIG_MTD_MYLOADER_PARTS=y -CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y CONFIG_MYLOADER=y +CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_MV88E6123_61_65 is not set # CONFIG_NET_DSA_MV88E6131 is not set @@ -156,7 +158,6 @@ CONFIG_NET_DSA_MV88E6060=y # CONFIG_NET_DSA_TAG_DSA is not set # CONFIG_NET_DSA_TAG_EDSA is not set CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_NET_DSA=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set @@ -190,6 +191,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SIBYTE_SWARM is not set # CONFIG_SLAB is not set CONFIG_SLUB=y +CONFIG_SPI=y CONFIG_SPI_AP83=y CONFIG_SPI_AR71XX=y CONFIG_SPI_BITBANG=y @@ -198,7 +200,6 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_PB44=y # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_VSC7385 is not set -CONFIG_SPI=y CONFIG_SWCONFIG=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y -- 2.11.0