[x86] resync kernel configurations, patch from Hauke Mehrtens (#4396)

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

diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27
index ffb942e..33e22b4 100644 (file)
--- a/target/linux/ar71xx/config-2.6.27
+++ b/target/linux/ar71xx/config-2.6.27
@@ -4,8 +4,16 @@ CONFIG_32BIT=y
 CONFIG_ADM6996_PHY=y
 CONFIG_AG71XX=y
 # CONFIG_AR71XX_EARLY_SERIAL is not set
+CONFIG_AR71XX_MACH_AP83=y
+CONFIG_AR71XX_MACH_AW_NR580=y
 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_RB_4XX=y
+CONFIG_AR71XX_MACH_TEW_632BRP=y
+CONFIG_AR71XX_MACH_UBNT=y
+CONFIG_AR71XX_MACH_WNR2000=y
 CONFIG_AR71XX_MACH_WP543=y
 CONFIG_AR71XX_WDT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -19,10 +27,9 @@ CONFIG_ATHEROS_AR71XX=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
-# CONFIG_BROADCOM_PHY is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -58,8 +65,6 @@ CONFIG_DEVPORT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -70,8 +75,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_MAX7301 is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -108,7 +111,6 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MICREL_PHY=y
@@ -146,6 +148,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 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_NAND_CAFE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
@@ -165,12 +168,10 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set
-CONFIG_NF_CT_ACCT=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set
@@ -186,9 +187,8 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_QSEMI_PHY is not set
+CONFIG_PROM_EMU=y
 # CONFIG_R6040 is not set
-# CONFIG_REALTEK_PHY is not set
 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -211,7 +211,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SMSC_PHY is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -230,8 +229,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m
@@ -248,7 +245,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
-# CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_YAFFS_9BYTE_TAGS=y
 CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
 CONFIG_YAFFS_AUTO_YAFFS2=y