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

[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 49933ea..7e9cfdf 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 @@
 --- a/src/mach-ixp42x/slugos-nslu2-armeb_config
 +++ b/src/mach-ixp42x/slugos-nslu2-armeb_config
 --- a/src/mach-ixp42x/slugos-nslu2-armeb_config
 +++ b/src/mach-ixp42x/slugos-nslu2-armeb_config

-@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y

  #
  # General Setup
  #
  #
  # General Setup
  #


@@ -8,15 +8,15 @@
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (8MiB Flash)"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (8MiB Flash)"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y

- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
- #    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_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="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_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