[rdc] resync kernel configuration

[openwrt.git] / target / linux / ppc44x / config-default

diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index 874e587..c3516a9 100644 (file)
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -11,6 +11,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_ARCHES is not set
 # CONFIG_BAMBOO is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y
@@ -18,25 +19,26 @@ CONFIG_BOOKE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x01000000
 # CONFIG_BT is not set
-CONFIG_CMDLINE="console=ttyS1,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd init=/etc/preinit"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
-# CONFIG_CANYONLANDS is not set
+CONFIG_CANYONLANDS=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEVICE_TREE="taishan.dts"
 # CONFIG_DMADEVICES is not set
 # CONFIG_E200 is not set
 # CONFIG_E500 is not set
 # CONFIG_EBONY is not set
 # CONFIG_EDAC is not set
+CONFIG_EXTRA_TARGETS="uImage"
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_GEN_RTC is not set
+# CONFIG_GLACIER is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HIGHMEM is not set
@@ -159,14 +161,13 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_SEQUOIA is not set
+# CONFIG_SND_PPC is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TAISHAN=y
 CONFIG_TASK_SIZE=0x80000000
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VIA_RHINE is not set