[U-Boot] [PATCH v2] socfpga: clean up sfp generation

Marek Vasut marex at denx.de
Sun Oct 14 17:58:17 UTC 2018


On 10/13/2018 12:13 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen at intel.com>
> 
> Move the sfp file generation entirely to the root Makefile.  This
> means that the u-boot-spl.sfp will only be generated when required
> and only for the socfpga variants that require it.
> 
> sfp generation is now entirely controlled by CONFIG_BUILD_TARGET
> being set to either spl/u-boot-spl.sfp or more likely
> u-boot-with-spl.sfp
> 
> Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>
> 
> ---
> v2:
>   -> condense changes to 1 patch to avoid breaking git bisect
> ---
>  Makefile             | 11 ++++++++---
>  scripts/Makefile.spl | 12 ------------
>  2 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index aadd1ec8c6..16ce14d071 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1207,6 +1207,14 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
>  	$(call if_changed,pad_cat)
>  
>  ifneq ($(CONFIG_ARCH_SOCFPGA),)
> +ifdef CONFIG_TARGET_SOCFPGA_ARRIA10

Shouldn't that be ifneq ($(CONFIG....),) ?, just like the line above ?

> +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1
> +else
> +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
> +endif
> +spl/u-boot-spl.sfp: spl/u-boot-spl.bin FORCE
> +	$(call if_changed,mkimage)

Otherwise it looks good I think :)

-- 
Best regards,
Marek Vasut


More information about the U-Boot mailing list