[U-Boot] [Patch v2] Makefile: Concatenation of u-boot-spl.bin and u-boot.img

[York Sun]

On 07/26/2017 12:57 AM, Ashish Kumar wrote:
> Concatenation of u-boot-spl.bin and u-boot.img for NXP layerscape
> platform SoC: LS1088A/LS2080A and their variants
> 
> This patch also depricates UBOOT_BINLOAD in favour of SPL_PAYLOAD
> 
> Signed-off-by: Ashish Kumar <Ashish.Kumar at nxp.com>
> ---
> 
> v2:
> This is v2 version of https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F755904%2F&data=01%7C01%7Cyork.sun%40nxp.com%7Cf780fc995f954b2198d308d4d3fbffb5%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=kz47PT%2FPCGeBbhjJeucbreQefQFkUcTZqFSJ7vFRq60%3D&reserved=0
> 
> Also considers recommendation made in following mail chain
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flinux.freescale.net%2Fpipermail%2Fu-boot%2F2016-September%2F041592.html&data=01%7C01%7Cyork.sun%40nxp.com%7Cf780fc995f954b2198d308d4d3fbffb5%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=tds5BLj1lCHgJOfeJuJuFRsmNzOLZQHiOPKWHR%2BQqQg%3D&reserved=0
> to depricate UBOOT_BINLOAD
> 

Bad practice to mix internal discussion thread. The archive is not 
accessible by external reviewers.

>   Makefile | 21 ++++++++++++++-------
>   1 file changed, 14 insertions(+), 7 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 4c4c8d8..ff22bda 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1030,8 +1030,20 @@ u-boot.dis:	u-boot
>   ifdef CONFIG_TPL
>   SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
>   else
> +ifeq ($(ARCH),arm)
> +ifdef CONFIG_OF_CONTROL
> +SPL_PAYLOAD := u-boot-dtb.img
> +else
> +SPL_PAYLOAD := u-boot.img
> +endif	#ifdef CONFIG_OF_CONTROL
> +else
> +ifdef CONFIG_OF_CONTROL
> +SPL_PAYLOAD := u-boot-dtb.bin
> +else
>   SPL_PAYLOAD := u-boot.bin
> -endif
> +endif	#ifdef CONFIG_OF_CONTROL
> +endif	#ifdef arm
> +endif	#ifdef CONFIG_TPL
> 

Look like you are going back to check arch to decide raw format or not. 
Let's hear from other reviewers.

York