fix jffs2 and mini_fo mount in failsafe (patch from #7134)

[openwrt.git] / package / apex / patches / 100-openwrt_nslu2_armeb_config.patch

diff --git a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
index 55267d4..49933ea 100644 (file)
--- a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
+++ b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
@@ -1,6 +1,6 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config       2007-06-02 10:06:45.000000000 +0930
-+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config~      2007-06-03 02:22:18.000000000 +0930
-@@ -17,7 +17,7 @@
+--- a/src/mach-ixp42x/slugos-nslu2-armeb_config
++++ b/src/mach-ixp42x/slugos-nslu2-armeb_config
+@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -9,7 +9,7 @@
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -143,7 +143,7 @@
+@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
  #    Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
@@ -19,3 +19,5 @@
 -CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+ # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+ CONFIG_USES_NOR_BOOTFLASH=y