On Sun, 2018-10-14 at 19:58 +0200, Marek Vasut wrote:
On 10/13/2018 12:13 AM, Dalon Westergreen wrote: From: Dalon Westergreen dalon.westergreen@intel.com Move the sfp file generation entirely to the root Makefile. Thismeans that the u-boot-spl.sfp will only be generated when requiredand only for the socfpga variants that require it. sfp generation is now entirely controlled by CONFIG_BUILD_TARGETbeing set to either spl/u-boot-spl.sfp or more likelyu-boot-with-spl.sfp Signed-off-by: Dalon Westergreen dalon.westergreen@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/Makefileindex 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 ?
That was just cut and paste from scripts/Makefile.spl, but i will change it. --dalon
+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 :)