Merge branch 'master' of git://git.denx.de/u-boot-socfpga

- ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices

diff --git a/Kconfig b/Kconfig
index 512c7beb89f99261cc586b1ed9b5d08af365f657..305b265ed7134aaf6b3198de6c90e6c9b91aa133 100644 (file)
--- 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 9d5921606e1d1b89aa4721553d7f857f671ab031..54b160d72bbd95106e4d32fe7ed253a521527225 100644 (file)
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -212,7 +212,7 @@ ifdef CONFIG_SAMSUNG
 ALL-y  += $(obj)/$(BOARD)-spl.bin
 endif
 
-ifdef CONFIG_ARCH_SOCFPGA
+ifneq ($(CONFIG_TARGET_SOCFPGA_GEN5)$(CONFIG_TARGET_SOCFPGA_ARRIA10),)
 ALL-y  += $(obj)/$(SPL_BIN).sfp
 endif