[adm5120] reorder rootfstypes to allow both squashfs and jffs2 images to boot

[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / config / default

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index f22330490f21b74717b2b59b3025c087c7b6d2f7..276b2d42fd47aff648778c93f4d5c25a91ba2775 100644 (file)
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -1,7 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_ADM5120_HARDWARE_SWAB=y
 CONFIG_ADM5120_NR_UARTS=2
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -17,7 +16,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs,yaffs2 init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2 init=/etc/preinit"
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -52,6 +51,7 @@ CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
+CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
@@ -154,7 +154,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -230,6 +230,7 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -243,7 +244,7 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
-CONFIG_USB_ADM5120_HCD=y
+CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USB_ALI_M5632 is not set
 # CONFIG_USB_AN2720 is not set
 # CONFIG_USB_CATC is not set
@@ -262,17 +263,15 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_ZD1201 is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_V4L1=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y
-CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=0
 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
 # CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
 CONFIG_YAFFS_FS=y