[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / target / linux / ar71xx / config-2.6.28

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index 1015c8d..f272070 100644 (file)
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -13,12 +13,15 @@ CONFIG_AR71XX_MACH_GENERIC=y
 CONFIG_AR71XX_MACH_MZK_W04NU=y
 CONFIG_AR71XX_MACH_MZK_W300NH=y
 CONFIG_AR71XX_MACH_PB42=y
 CONFIG_AR71XX_MACH_MZK_W04NU=y
 CONFIG_AR71XX_MACH_MZK_W300NH=y
 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_WR941ND=y
 CONFIG_AR71XX_MACH_UBNT=y
 CONFIG_AR71XX_MACH_WNR2000=y
 CONFIG_AR71XX_MACH_WP543=y
 CONFIG_AR71XX_MACH_RB_4XX=y
 CONFIG_AR71XX_MACH_TEW_632BRP=y
 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
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_AR71XX_WDT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set


@@ -31,9 +34,10 @@ CONFIG_ATHEROS_AR71XX=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y

+CONFIG_CC_OPTIMIZE_FOR_SIZE=y

 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y

-CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"

 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y


@@ -70,8 +74,6 @@ CONFIG_DEVPORT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y

-# CONFIG_FIXED_PHY is not set
-# CONFIG_FREEZER is not set

 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y


@@ -84,7 +86,6 @@ CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y

-# CONFIG_HAVE_AOUT is not set

 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y


@@ -92,9 +93,6 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set

-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

 CONFIG_ICPLUS_PHY=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_ICPLUS_PHY=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_ROOT_GID=0


@@ -102,8 +100,6 @@ CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_SOURCE="../../root"
 CONFIG_IRQ_CPU=y
 # CONFIG_ISDN is not set
 CONFIG_INITRAMFS_SOURCE="../../root"
 CONFIG_IRQ_CPU=y
 # CONFIG_ISDN is not set

-CONFIG_KMOD=y
-# CONFIG_LEDS_ALIX is not set

 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_M25PXX_USE_FAST_READ is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_M25PXX_USE_FAST_READ is not set


@@ -114,8 +110,6 @@ CONFIG_KMOD=y
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set

-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TMIO is not set

 CONFIG_MICREL_PHY=y
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 CONFIG_MICREL_PHY=y
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y


@@ -127,51 +121,15 @@ 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_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set

-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set

 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI is not set

-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y

-# CONFIG_MTD_JEDECPROBE is not set

 CONFIG_MTD_M25P80=y
 CONFIG_MTD_M25P80=y

-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set

 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y

-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set

 CONFIG_MTD_NAND_RB4XX=y
 CONFIG_MTD_NAND_RB4XX=y

-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set

 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y

-CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set

 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set
 CONFIG_NET_DSA=y
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set
 CONFIG_NET_DSA=y


@@ -183,20 +141,15 @@ 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_TAG_DSA is not set
 # CONFIG_NET_DSA_TAG_EDSA is not set
 CONFIG_NET_DSA_TAG_TRAILER=y

-# CONFIG_NF_DEFRAG_IPV4 is not set

 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set

 CONFIG_PCI=y
 CONFIG_PCI=y

+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y

 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYLIB=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYLIB=y

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set


@@ -204,8 +157,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROM_EMU=y
 # CONFIG_R6040 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROM_EMU=y
 # CONFIG_R6040 is not set

-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y

 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set


@@ -225,16 +176,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y

-# CONFIG_SOFT_WATCHDOG is not set

 CONFIG_SPI=y
 CONFIG_SPI_AR71XX=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI=y
 CONFIG_SPI_AR71XX=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set

-# CONFIG_SPI_GPIO_OLD is not set

 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set

-CONFIG_SSB_POSSIBLE=y
-CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y