ignore the bootloader's commandline on orion

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

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 4dc9ec5..50e94b7 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -22,11 +22,14 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_MSM7X00A is not set
 # CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set
@@ -44,8 +47,8 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
-# CONFIG_ARTHUR is not set
 # CONFIG_ARPD is not set
+# CONFIG_ARTHUR is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_PIIX is not set
@@ -63,7 +66,7 @@ CONFIG_BOUNCE=y
 # CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
@@ -82,14 +85,12 @@ CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
 # CONFIG_DEFAULT_VEGAS is not set
 CONFIG_DEFAULT_WESTWOOD=y
-# CONFIG_DEVKMEM is not set
 CONFIG_DEVPORT=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8
@@ -97,13 +98,11 @@ CONFIG_DLCI_MAX=8
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_E100 is not set
-# CONFIG_E1000 is not set
 # CONFIG_E1000E_ENABLED is not set
 # CONFIG_FARSYNC is not set
-# CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_FASTFPE is not set
+# CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_FRAME_WARN=1024
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -128,7 +127,6 @@ CONFIG_HDLC_PPP=m
 CONFIG_HDLC_RAW=m
 # CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HERMES is not set
-# CONFIG_HTC_PASIC3 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y
@@ -136,7 +134,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
-# CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -182,10 +179,12 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_KUROBOX_PRO is not set
 # CONFIG_MACH_LINKSTATION_PRO is not set
 # CONFIG_MACH_MV2120 is not set
+# CONFIG_MACH_MSS2 is not set
 # CONFIG_MACH_RD88F5182 is not set
 # CONFIG_MACH_TS209 is not set
 # CONFIG_MACH_TS409 is not set
 # CONFIG_MACH_TS78XX is not set
+CONFIG_MACH_WNR854T=y
 CONFIG_MACH_WRT350N_V2=y
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MEDIA_ATTACH is not set
@@ -200,18 +199,16 @@ CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set
-# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
-# CONFIG_MTD_CFI_AMDSTD is not set
+CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
@@ -240,7 +237,10 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_START=0xf0000000
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -259,7 +259,6 @@ CONFIG_MV643XX_ETH=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
@@ -322,7 +321,6 @@ CONFIG_SLABINFO=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SSB_POSSIBLE=y
 # CONFIG_SWAP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TCP_CONG_HSTCP is not set
@@ -342,13 +340,12 @@ CONFIG_USB=m
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CATC is not set
 CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_KAWETH 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_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_R8A66597_HCD is not set