[PATCH 2/5] ramips: mt7621: drop custom uImage function

[Adrian Schmutzler]

Hi Sander,

> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org]
> On Behalf Of Sander Vanheule
> Sent: Mittwoch, 4. November 2020 10:21
> To: openwrt-devel at lists.openwrt.org
> Cc: Sander Vanheule <sander at svanheule.net>
> Subject: [PATCH 2/5] ramips: mt7621: drop custom uImage function
> 
> Use the mkimage argument overrides provided by uImage to implement the
> customisations required for the initramfs, instead of the near-identical
> custom function.
> 
> Signed-off-by: Sander Vanheule <sander at svanheule.net>
> ---
> Build tested for iodata_wn1167gr2, where
>   uImage lzma -M 0x434f4d42 -n '3.10(XBC.1)b10'
> 
> ... results in the following call made to mkimage:
>   mkimage -A mips -O linux -T kernel -C lzma -a 0x80001000
>     -e 0x80001000 -n 'MIPS OpenWrt Linux-5.4.74'  -M 0x434f4d42
>     -n '3.10(XBC.1)b10' -d initramfs-kernel.bin initramfs-kernel.bin.new

And you are perfectly sure that there is no harm from specifying -n twice?

Apart from that, the question is whether we should rely on such behavior? (As much as I would like to have the redundancy gone, too).

Best

Adrian

> 
>  target/linux/ramips/image/mt7621.mk | 31 ++++++++++-------------------
>  1 file changed, 10 insertions(+), 21 deletions(-)
> 
> diff --git a/target/linux/ramips/image/mt7621.mk
> b/target/linux/ramips/image/mt7621.mk
> index bb7e5a0d48..9b6c7d2311 100644
> --- a/target/linux/ramips/image/mt7621.mk
> +++ b/target/linux/ramips/image/mt7621.mk
> @@ -7,21 +7,7 @@ include ./common-tp-link.mk  DEFAULT_SOC := mt7621
> 
>  KERNEL_DTB += -d21
> -DEVICE_VARS += UIMAGE_MAGIC ELECOM_HWNAME LINKSYS_HWNAME
> -
> -# The OEM webinterface expects an kernel with initramfs which has the
> uImage -# header field ih_name.
> -# We don't want to set the header name field for the kernel include in the -
> # sysupgrade image as well, as this image shouldn't be accepted by the OEM
> -# webinterface. It will soft-brick the board.
> -define Build/custom-initramfs-uimage
> -	mkimage -A $(LINUX_KARCH) \
> -		-O linux -T kernel \
> -		-C lzma -a $(KERNEL_LOADADDR) $(if $(UIMAGE_MAGIC),-M
> $(UIMAGE_MAGIC),) \
> -		-e $(if
> $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
> -		-n '$(1)' -d $@ $@.new
> -	mv $@.new $@
> -endef
> +DEVICE_VARS += ELECOM_HWNAME LINKSYS_HWNAME
> 
>  define Build/elecom-wrc-gs-factory
>  	$(eval product=$(word 1,$(1)))
> @@ -531,32 +517,35 @@ define Device/iodata_nand
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata  endef
> 
> +# The OEM webinterface expects an kernel with initramfs which has the
> +uImage # header field ih_name.
> +# We don't want to set the header name field for the kernel include in
> +the # sysupgrade image as well, as this image shouldn't be accepted by
> +the OEM # webinterface. It will soft-brick the board.
> +
>  define Device/iodata_wn-ax1167gr2
>    $(Device/iodata_nand)
> -  UIMAGE_MAGIC := 0x434f4d42
>    DEVICE_MODEL := WN-AX1167GR2
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
> -	custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header
> +	uImage lzma -M 0x434f4d42 -n '3.10(XBC.1)b10' | iodata-mstc-header
>    DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware  endef
> TARGET_DEVICES += iodata_wn-ax1167gr2
> 
>  define Device/iodata_wn-ax2033gr
>    $(Device/iodata_nand)
> -  UIMAGE_MAGIC := 0x434f4d42
>    DEVICE_MODEL := WN-AX2033GR
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
> -	custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header
> +	uImage lzma -M 0x434f4d42 -n '3.10(VST.1)C10' | iodata-mstc-header
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware  endef  TARGET_DEVICES += iodata_wn-ax2033gr
> 
>  define Device/iodata_wn-dx1167r
>    $(Device/iodata_nand)
> -  UIMAGE_MAGIC := 0x434f4d43
>    DEVICE_MODEL := WN-DX1167R
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
> -	custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header
> +	uImage lzma -M 0x434f4d43 -n '3.10(XIK.1)b10' | iodata-mstc-header
>    DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware  endef
> TARGET_DEVICES += iodata_wn-dx1167r
> --
> 2.28.0
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: openpgp-digital-signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.openwrt.org/pipermail/openwrt-devel/attachments/20201104/00550f73/attachment.sig>