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

[openwrt.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 81ea813..276b2d4 100644 (file)
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -1,10 +1,11 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set

-CONFIG_ADM5120_GPIO=y

 CONFIG_ADM5120_NR_UARTS=2
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ADM5120_NR_UARTS=2
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ATM_DRIVERS is not set

 CONFIG_BASE_SMALL=0
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BASE_SMALL=0
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m


@@ -15,7 +16,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y

-CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs 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
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y


@@ -46,9 +47,11 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_DDB5477 is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_DDB5477 is not set

+CONFIG_DEVPORT=y

 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=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
 CONFIG_ELF_CORE=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set


@@ -60,11 +63,10 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 # CONFIG_GEN_RTC is not set

+CONFIG_HAS_DMA=y

 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y

-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_FF is not set
+CONFIG_HID=m

 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y


@@ -88,6 +90,7 @@ CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m

+CONFIG_IRQ_CPU=y

 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_POSIX_ACL=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_POSIX_ACL=y


@@ -95,8 +98,13 @@ CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_JFFS2_FS_XATTR=y
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JOLIET is not set
 CONFIG_JFFS2_FS_XATTR=y
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JOLIET is not set

+CONFIG_LEDS_ADM5120=y
+CONFIG_LEDS_ADM5120_DIAG=y
+# CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set
+CONFIG_LEDS_GPIO=y

 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256

+# CONFIG_MACH_ALCHEMY is not set

 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set


@@ -106,36 +114,20 @@ CONFIG_MIPS=y
 CONFIG_MIPS_ADM5120=y
 CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set
 CONFIG_MIPS_ADM5120=y
 CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set

-# CONFIG_MIPS_BOSPORUS is not set

 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_COBALT is not set

-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set

 # CONFIG_MIPS_EV64120 is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_EV64120 is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set

-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_MTX1 is not set

 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set

-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set

 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_VPE_LOADER is not set

-# CONFIG_MIPS_XXS1500 is not set

 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y

-# CONFIG_MOMENCO_JAGUAR_ATX is not set

 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_MOMENCO_OCELOT_3 is not set
 # CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_MOMENCO_OCELOT_3 is not set
 # CONFIG_MOMENCO_OCELOT_C is not set

-# CONFIG_MOMENCO_OCELOT_G is not set

 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_ADM5120=y


@@ -145,7 +137,7 @@ CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y

-CONFIG_MTD_CFI_AMDSTD_FORCE_BOTTOM_BOOT=y
+CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y

 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set


@@ -162,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_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
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y


@@ -176,10 +168,11 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
 # 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_NANDSIM is not set

+# CONFIG_MTD_NAND_PLATFORM is not set

 CONFIG_MTD_NAND_RB100=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_RB100=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set

-# CONFIG_MTD_OBSOLETE_CHIPS is not set

 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set


@@ -191,10 +184,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set

-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-CONFIG_NET_ACT_SIMP=m
+# CONFIG_NETDEV_1000 is not set

 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set


@@ -215,6 +205,7 @@ CONFIG_PCI_ADM5120=y
 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

+CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ADM5120=y
 CONFIG_SERIO=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ADM5120=y
 CONFIG_SERIO=y


@@ -235,11 +226,11 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set

-# CONFIG_SND_USB_AUDIO is not set

 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 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
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y


@@ -253,31 +244,39 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set

-CONFIG_USB_ADM5120_HCD=y
-# CONFIG_USB_ATM is not set
+CONFIG_USB_ADM5120_HCD=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set

 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CATC is not set

-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_GTCO is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set

 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_KAWETH is not set

+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=m

 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PEGASUS is not set

-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_RTL8150 is not set

 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_SERIAL is not set

-# CONFIG_USB_STORAGE is not set

 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set

-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-CONFIG_USB_YEALINK=m
-# CONFIG_USB_ZD1201 is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_V4L1=y

 CONFIG_VM_EVENT_COUNTERS=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_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y

+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=0

 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
 # CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
 # CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set

-# CONFIG_YAFFS_DOES_ECC is not set

 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y
 # CONFIG_ZD1211RW is not set
 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y
 # CONFIG_ZD1211RW is not set

+CONFIG_ZONE_DMA_FLAG=0