diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2007-05-13 13:31:02 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2007-05-13 13:31:02 +0000 |
| commit | af716e575e277b4cce9b99bab038f79713490456 (patch) | |
| tree | 6d00f5833e7300118a0860a62a60da6953ca29f5 | |
| parent | ff31b9d4ccc3403c51186418b6bce3142e68dcf7 (diff) | |
| download | master-187ad058-af716e575e277b4cce9b99bab038f79713490456.tar.gz master-187ad058-af716e575e277b4cce9b99bab038f79713490456.tar.bz2 master-187ad058-af716e575e277b4cce9b99bab038f79713490456.zip | |
fix the nslu2 image for the new layout
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7204 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ixp4xx-2.6/image/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch | 2 |
2 files changed, 2 insertions, 2 deletions
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 |