[PATCH u-boot-mvebu v2 36/41] arm: mvebu: Remove legacy U-Boot header from kwbimage v1 files

[Stefan Roese]

On 19.07.21 14:20, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> The SPL code now already parses kwbimage v1 headers where all necessary
> information about how to load and execute main U-Boot is present. The
> legacy 64-byte U-Boot header is not used anymore.
> 
> Remove this 64-byte header by putting u-boot.bin binary (instead of
> u-boot.img) into kwbimage v1 and let SPL code or BootROM to load U-Boot
> directly at its execution address.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>
> Reviewed-by: Chris Packham <judge.packham at gmail.com>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   Makefile | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index a5a9aef175..6b521573e6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1405,7 +1405,7 @@ MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
>   	-T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
>   
>   MKIMAGEFLAGS_u-boot-spl.kwb = -n $(KWD_CONFIG_FILE) \
> -	-T kwbimage -a $(shell printf "0x%x" $$(($(CONFIG_SYS_TEXT_BASE)-64))) -e $(CONFIG_SYS_TEXT_BASE) \
> +	-T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \
>   	$(if $(KEYDIR),-k $(KEYDIR))
>   
>   MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
> @@ -1448,7 +1448,7 @@ u-boot.itb: u-boot-nodtb.bin \
>   	$(BOARD_SIZE_CHECK)
>   endif
>   
> -u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
> +u-boot-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE
>   	$(call if_changed,mkimage)
>   
>   u-boot.sha1:	u-boot.bin
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de