These targets need custom image names specified in the uImage header.
MkImage accepts an optional 4th argument to do exactly that. Reuse the
facility to generate proper sysupgrade images suitable also for
upgrading the factory firmware.
Compile-tested, the generated files inspected with "file" utility.
Signed-off-by: Paul Fertser <fercer...@gmail.com>
---
target/linux/ramips/image/Makefile | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/target/linux/ramips/image/Makefile
b/target/linux/ramips/image/Makefile
index d9e562f..1e6d482 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -167,11 +167,7 @@
mtdlayout_broadway=192k(bootloader)ro,64k(config)ro,64k(factory)ro,1024k(kernel)
mtd_broadway_kernel_part_size=1048576
mtd_broadway_rootfs_part_size=6881280
define BuildFirmware/BROADWAY
- $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5))
$(call
mkmtd/$(6),$(mtdlayout_broadway)),$(mtd_broadway_kernel_part_size),$(mtd_broadway_rootfs_part_size))
- mkimage -A mips -O linux -T kernel -C lzma $(call kernel_entry)\
- -n 'Broadway Kernel Image' \
- -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage
- $(call
CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(mtd_broadway_kernel_part_size),$(KDIR)/root.$(1),$(mtd_broadway_rootfs_part_size),$(call
imgname,$(1),$(2))-factory.bin)
+ $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5))
$(call
mkmtd/$(6),$(mtdlayout_broadway)),$(mtd_broadway_kernel_part_size),$(mtd_broadway_rootfs_part_size),Broadway
Kernel Image)
endef
define BuildFirmware/BROADWAY/initramfs
@@ -289,13 +285,7 @@ kernel_size_nw718=917504
rootfs_size_nw718=2883584
cmdline_nw718=$(call mkcmdline,NW718,ttyS1,57600) $(call
mkmtd/spi,$(mtdlayout_nw718))
define BuildFirmware/NW718
- $(call
BuildFirmware/Generic,$(1),$(2),$(cmdline_nw718),$(kernel_size_nw718),$(rootfs_size_nw718))
- $(call PatchKernelLzma,$(2),$(cmdline_nw718))
- mkimage -A mips -O linux -T kernel -C lzma $(call kernel_entry) \
- -n "ARA1B4NCRNW718;1" \
- -d "$(KDIR)/vmlinux-$(2).bin.lzma" \
- "$(KDIR)/vmlinux-$(2).uImage"
- $(call
CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(kernel_size_nw718),$(KDIR)/root.$(1),$(rootfs_size_nw718),$(call
imgname,$(1),$(2))-factory.bin)
+ $(call
BuildFirmware/Generic,$(1),$(2),$(cmdline_nw718),$(kernel_size_nw718),$(rootfs_size_nw718),ARA1B4NCRNW718;1)
endef
mtdlayout_rtg32b1=192k(u-boot)ro,64k(devdata)ro,64k(devconf)ro,896k(kernel),2880k(rootfs),3776k@0x50000(firmware)
@@ -366,15 +356,7 @@ define BuildFirmware/UMedia/initramfs
endef
define BuildFirmware/W306R_4M
- $(call BuildFirmware/w306r,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5))
$(call mkmtd/$(6),$(mtdlayout_4M)),917504,2949120)
-endef
-
-define BuildFirmware/w306r
- $(call PatchKernelLzma,$(2),$(3))
- mkimage -A mips -O linux -T kernel -C lzma $(call kernel_entry)\
- -n 'linkn Kernel Image' \
- -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage
- $(call
CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(4),$(KDIR)/root.$(1),$(5),$(call
imgname,$(1),$(2))-factory.bin)
+ $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5))
$(call mkmtd/$(6),$(mtdlayout_4M)),917504,2949120,linkn Kernel Image)
endef
mtdlayout_whrg300n=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,960k(kernel),2752k(rootfs),64k(user)ro,3712k@0x50000(firmware)
@@ -599,7 +581,6 @@ define Image/Build/Profile/V22RW2X2
endef
define Image/Build/Profile/W306R_V20
- $(call
Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,w306r-v20,W306R_V20,ttyS1,57600,phys)
$(call
Image/Build/Template/$(fs_squash)/$(1),W306R_4M,w306r-v20,W306R_V20,ttyS1,57600,phys)
endef
--
1.7.9.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
