brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / apex / patches / 120-openwrt_nslu2_16mb_armeb_config.patch

diff --git a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
index a358c3f..614ef7f 100644 (file)
--- a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
+++ b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
@@ -1,6 +1,6 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config  2007-06-02 10:06:45.000000000 +0930
-+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config~ 2007-06-03 02:22:18.000000000 +0930
-@@ -17,7 +17,7 @@
+--- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
++++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -8,14 +8,16 @@
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (16MiB Flash)"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -143,7 +143,7 @@
- #    Overrides
+ # CONFIG_DRIVER_LONG_LONG_SIZE is not set
+@@ -163,9 +163,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
+ # Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
--CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
--CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +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