[ar71xx] preliminary failsafe support (closes #5726)

[openwrt.git] / target / linux / ppc40x / config-2.6.30

diff --git a/target/linux/ppc40x/config-2.6.30 b/target/linux/ppc40x/config-2.6.30
index 338d4fe..f420c1c 100644 (file)
--- a/target/linux/ppc40x/config-2.6.30
+++ b/target/linux/ppc40x/config-2.6.30
@@ -24,10 +24,10 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
-# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT=y
 CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 # CONFIG_CPU_FREQ is not set
@@ -62,6 +62,7 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 # CONFIG_GEN_RTC is not set
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
@@ -84,7 +85,6 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_HCU4 is not set
-# CONFIG_HVC_UDBG is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
@@ -110,8 +110,7 @@ CONFIG_KILAUEA=y
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 # CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_MAGICBOXV1=y
-CONFIG_MAGICBOXV2=y
+CONFIG_MAGICBOX=y
 # CONFIG_MAKALU is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MMIO_NVRAM is not set
@@ -128,12 +127,11 @@ CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_OF=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
-CONFIG_OPENRB_LIGHT=y
+CONFIG_OPENRB=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
-# CONFIG_PCIEASPM is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
@@ -145,10 +143,6 @@ CONFIG_PPC32=y
 CONFIG_PPC40x_SIMPLE=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC64 is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set
@@ -183,9 +177,9 @@ CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
+CONFIG_SLUB=y
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRACING_SUPPORT=y