projects / openwrt / svn-archive / archive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1919616)
fix the nslu2 image for the new layout
authorImre Kaloz <kaloz@openwrt.org>
Sun, 13 May 2007 13:31:02 +0000 (13:31 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Sun, 13 May 2007 13:31:02 +0000 (13:31 +0000)
SVN-Revision: 7204

target/linux/ixp4xx-2.6/image/Makefile patch | blob | history
target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch patch | blob | history

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 17c0ab0d439e9fa2b2b8c5b0b1133fec93f01f64..7d230028530e0aed60824ff32150b61eeeb20632 100644 (file)
--- 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 \
        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
 
                -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 9b1a9363d2607274e5e378f27e4de8d6c847ec1c..c05812dfe0bb1992eb7a24ddcda982cb28c41fd3 100644 (file)
--- 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_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
 +# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
 +CONFIG_USES_NOR_BOOTFLASH=y
 +CONFIG_BIGENDIAN=y
OpenWrt SVN history