From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 13 May 2007 13:31:02 +0000 (+0000)
Subject: fix the nslu2 image for the new layout
X-Git-Tag: kamikaze_7.06~24
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=cfcf4aab45e977827f09113b526fd94a6662a9c1;p=openwrt%2Fsvn-archive%2Fopenwrt.git

fix the nslu2 image for the new layout

SVN-Revision: 7204
---

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 17c0ab0d43..7d23002853 100644
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -41,7 +41,7 @@ define Image/Build/slug
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
 		-L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
 		-k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \
-		-r Flashdisk:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
+		-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
 		-p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin
 endef
 
diff --git a/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch b/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch
index 9b1a9363d2..c05812dfe0 100644
--- a/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch
+++ b/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch
@@ -127,7 +127,7 @@ Index: apex-1.4.7/src/mach-ixp42x/slugos-nslu2-armeb_config
 +CONFIG_ENV_REGION_KERNEL="fis://kernel"
 +# CONFIG_ENV_REGION_KERNEL_SWAP is not set
 +CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
-+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200"
++CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
 +# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
 +CONFIG_USES_NOR_BOOTFLASH=y
 +CONFIG_BIGENDIAN=y