diff options
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ef84e84695..8ee412ed03 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -68,7 +68,7 @@ platform_check_image() { [ "$ARGC" -gt 1 ] && return 1 case "$board" in - ap83 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n) + ap83 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n | bullet-m | nano-m | rocket-m) [ "$magic" != "2705" ] && { echo "Invalid image type." return 1 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 30663f12cb..b61524ecdb 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -138,7 +138,7 @@ define Image/Build/MyLoader $(call imgname,$(1),$(2))-16M.img endef -ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),1024k(kernel),6528k(rootfs),256k(cfg),64k(EEPROM) +ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6528k(rootfs),256k(cfg)ro,64k(EEPROM)ro,7552k@0x50000(firmware) define Image/Build/UBNTXM $(call PatchKernelLzma,$(2),$(3) $(ubntxm_mtdlayout)) mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \ @@ -151,7 +151,11 @@ define Image/Build/UBNTXM -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \ -k $(KDIR)/vmlinux-$(2).uImage \ -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \ - -o $(call imgname,$(1),$(2)).bin + -o $(call imgname,$(1),$(2))-factory.bin + ( \ + dd if=$(KDIR)/vmlinux-$(2).uImage; \ + dd if=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1); \ + ) > $(call imgname,$(1),$(2))-sysupgrade.bin endef define Image/Build/UBNT |