[U-Boot] [PATCH] ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices

[Marek Vasut]

On 3/20/19 4:40 PM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen at intel.com>
> 
> The sfp file is only valid for Gen5 (Cyclone5 & Arria5) and Arria10
> devices.  The file should only be built for these devices.
> 
> Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>
> ---
>  Kconfig              | 3 ++-
>  scripts/Makefile.spl | 6 +++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Kconfig b/Kconfig
> index 512c7beb89..305b265ed7 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -226,7 +226,8 @@ config BUILD_ROM
>  
>  config BUILD_TARGET
>  	string "Build target special images"
> -	default "u-boot-with-spl.sfp" if ARCH_SOCFPGA
> +	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
> +	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
>  	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
>  	default "u-boot-elf.srec" if RCAR_GEN3
>  	default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> index 9d5921606e..592c5dfe57 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -212,7 +212,11 @@ ifdef CONFIG_SAMSUNG
>  ALL-y	+= $(obj)/$(BOARD)-spl.bin
>  endif
>  
> -ifdef CONFIG_ARCH_SOCFPGA
> +ifdef CONFIG_TARGET_SOCFPGA_ARRIA10

ifneq ($(CONFIG_TARGET_SOCFPGA_GEN5)$(CONFIG_TARGET_SOCFPGA_ARRIA10),)
ALL-y ...
endif

Then you don't need to duplicate the entry.

> +ALL-y	+= $(obj)/$(SPL_BIN).sfp
> +endif
> +
> +ifdef CONFIG_TARGET_SOCFPGA_GEN5
>  ALL-y	+= $(obj)/$(SPL_BIN).sfp
>  endif
>  
> 


-- 
Best regards,
Marek Vasut