aboutsummaryrefslogtreecommitdiffstats
path: root/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-09-04 17:02:18 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-09-04 17:02:18 +0000
commit355d9d786cc7c8b0ad3423b4b79ccdc4f9e56518 (patch)
tree88052c5a2ed41b97f0d85efb260b564dfc20f52f /package/apex/patches/160-openwrt_nas100d_armeb_config.patch
parenta0ceac3b2dca97022b66d12ddcd59f25b07c5995 (diff)
downloadmaster-187ad058-355d9d786cc7c8b0ad3423b4b79ccdc4f9e56518.tar.gz
master-187ad058-355d9d786cc7c8b0ad3423b4b79ccdc4f9e56518.tar.bz2
master-187ad058-355d9d786cc7c8b0ad3423b4b79ccdc4f9e56518.zip
package/apex: update apex to version 1.6.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22900 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/apex/patches/160-openwrt_nas100d_armeb_config.patch')
-rw-r--r--package/apex/patches/160-openwrt_nas100d_armeb_config.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
index 83d8c3f715..0b0c985e46 100644
--- a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
+++ b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
@@ -1,6 +1,6 @@
--- a/src/mach-ixp42x/slugos-nas100d-armeb_config
+++ b/src/mach-ixp42x/slugos-nas100d-armeb_config
-@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y
#
# General Setup
#
@@ -8,12 +8,12 @@
+CONFIG_TARGET_DESCRIPTION="OpenWRT NAS100D"
CONFIG_CROSS_COMPILE=""
CONFIG_AEABI=y
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -145,7 +145,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
- # Overrides
+ # CONFIG_DRIVER_LONG_LONG_SIZE is not set
+@@ -158,7 +158,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
+ # Overrides
#
CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
--CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
CONFIG_USES_NOR_BOOTFLASH=y