[U-Boot] [PATCH 0/3] socfpga: clean up sfp generation

[U-Boot] [PATCH 0/3] socfpga: clean up sfp generation

[Dalon Westergreen]

Move gen5 and arria10 to use CONFIG_SPL_TARGET to
specify the required SPL output.

Dalon Westergreen (3):
  spl: socfpga: remove sfp generation
  socfpga: Add sfp generation targets
  socfpga: common: add CONFIG_SPL_TARGET to gen5 and arria10 socfpga
    header

 Makefile                         | 11 +++++++----
 include/configs/socfpga_common.h |  1 +
 scripts/Makefile.spl             | 12 ------------
 3 files changed, 8 insertions(+), 16 deletions(-)

-- 
2.17.1

[U-Boot] [PATCH 1/3] spl: socfpga: remove sfp generation

[Dalon Westergreen]

In preparation to move to using CONFIG_SPL_TARGET,
remove sfp generation targets.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
---
 scripts/Makefile.spl | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 252f13826d..9314365aab 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -187,10 +187,6 @@ ifdef CONFIG_SAMSUNG
 ALL-y	+= $(obj)/$(BOARD)-spl.bin
 endif
 
-ifdef CONFIG_ARCH_SOCFPGA
-ALL-y	+= $(obj)/$(SPL_BIN).sfp
-endif
-
 ifdef CONFIG_ARCH_SUNXI
 ALL-y	+= $(obj)/sunxi-spl.bin
 
@@ -313,14 +309,6 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
 endif
 endif
 
-ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
-MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1
-else
-MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
-endif
-$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
-	$(call if_changed,mkimage)
-
 quiet_cmd_mksunxiboot = MKSUNXI $@
 cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \
 			--default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@
-- 
2.17.1

[U-Boot] [PATCH 2/3] socfpga: Add sfp generation targets

[Dalon Westergreen]

Some SOCFPGA platforms require a header be added to
u-boot-spl and a combined spl / u-boot image.  The
combined image consists of 4 replicated u-boot-spl
images with the afore mentioned header, and a u-boot
image cat'ed together.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 133d7ac773..6c93c6c129 100644
--- a/Makefile
+++ b/Makefile
@@ -1198,14 +1198,12 @@ OBJCOPYFLAGS_u-boot.spr = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \
 u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
 	$(call if_changed,pad_cat)
 
-ifneq ($(CONFIG_ARCH_SOCFPGA),)
 quiet_cmd_socboot = SOCBOOT $@
 cmd_socboot = cat	spl/u-boot-spl.sfp spl/u-boot-spl.sfp	\
 			spl/u-boot-spl.sfp spl/u-boot-spl.sfp	\
 			u-boot.img > $@ || rm -f $@
 u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE
 	$(call if_changed,socboot)
-endif
 
 # x86 uses a large ROM. We fill it with 0xff, put the 16-bit stuff (including
 # reset vector) at the top, Intel ME descriptor at the bottom, and U-Boot in
@@ -1518,8 +1516,13 @@ spl/sunxi-spl.bin: spl/u-boot-spl
 spl/sunxi-spl-with-ecc.bin: spl/sunxi-spl.bin
 	@:
 
-spl/u-boot-spl.sfp: spl/u-boot-spl
-	@:
+ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
+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)
 
 spl/boot.bin: spl/u-boot-spl
 	@:
-- 
2.17.1

[U-Boot] [PATCH 3/3] socfpga: common: add CONFIG_SPL_TARGET to gen5 and arria10 socfpga header

[Dalon Westergreen]

Add CONFIG_SPL_TARGET "u-boot-with-spl.sfp" to common header
to generate the required u-boot-spl and u-boot combined
image.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
---
 include/configs/socfpga_common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 2330143cf1..4777b4522d 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -239,6 +239,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * 0xFFEz_zzzz ...... Malloc area (grows up to top)
  * 0xFFE3_FFFF ...... End of SRAM (top)
  */
+#define CONFIG_SPL_TARGET		"u-boot-with-spl.sfp"
 #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_INIT_RAM_SIZE
 
-- 
2.17.1

[U-Boot] [PATCH 1/3] spl: socfpga: remove sfp generation

[Marek Vasut]

On 09/10/2018 07:51 PM, Dalon Westergreen wrote:
> In preparation to move to using CONFIG_SPL_TARGET,
> remove sfp generation targets.
> 
> Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
> ---
>  scripts/Makefile.spl | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> index 252f13826d..9314365aab 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -187,10 +187,6 @@ ifdef CONFIG_SAMSUNG
>  ALL-y	+= $(obj)/$(BOARD)-spl.bin
>  endif
>  
> -ifdef CONFIG_ARCH_SOCFPGA
> -ALL-y	+= $(obj)/$(SPL_BIN).sfp
> -endif
> -
>  ifdef CONFIG_ARCH_SUNXI
>  ALL-y	+= $(obj)/sunxi-spl.bin
>  
> @@ -313,14 +309,6 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
>  endif
>  endif
>  
> -ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
> -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1
> -else
> -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
> -endif
> -$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
> -	$(call if_changed,mkimage)
> -
>  quiet_cmd_mksunxiboot = MKSUNXI $@
>  cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \
>  			--default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@
> 

Doesn't this break git bisect ?

-- 
Best regards,
Marek Vasut