Skip to contentSkip to conversation

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

PATCH New Dalon Westergreen 3 participants 3 messages Mar 20, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices

From: Dalon Westergreen <[email protected]>

The sfp file is only valid for Gen5 (Cyclone5 & Arria5) and Arria10 devices. The file should only be built for these devices.

---
 Kconfig              | 3 ++-
 scripts/Makefile.spl | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
Kconfig +2 -1
index 512c7beb89..305b265ed7 100644
@@ -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
scripts/Makefile.spl +5 -1
index 9d5921606e..592c5dfe57 100644
@@ -212,7 +212,11 @@ ifdef CONFIG_SAMSUNG
 ALL-y	+= $(obj)/$(BOARD)-spl.bin
 endif
 
-ifdef CONFIG_ARCH_SOCFPGA
+ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
+ALL-y	+= $(obj)/$(SPL_BIN).sfp
+endif
+
+ifdef CONFIG_TARGET_SOCFPGA_GEN5
 ALL-y	+= $(obj)/$(SPL_BIN).sfp
 endif
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices

Quoted 30 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>

The sfp file is only valid for Gen5 (Cyclone5 & Arria5) and Arria10 devices. The file should only be built for these devices.

---
 Kconfig              | 3 ++-
 scripts/Makefile.spl | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
Kconfig +2 -1
index 512c7beb89..305b265ed7 100644
@@ -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
scripts/Makefile.spl +0 -0
index 9d5921606e..592c5dfe57 100644

scripts/Makefile.spl ifdef CONFIG_SAMSUNG · line 215

Quoted 5 lines
scripts/Makefile.spl +1 -1
@@ -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.

Quoted 8 lines
scripts/Makefile.spl +4 -0
+ALL-y	+= $(obj)/$(SPL_BIN).sfp
+endif
+
+ifdef CONFIG_TARGET_SOCFPGA_GEN5
 ALL-y	+= $(obj)/$(SPL_BIN).sfp
 endif
 
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices

Quoted 34 lines · Marek Vasut
Quoted 33 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>

The sfp file is only valid for Gen5 (Cyclone5 & Arria5) and Arria10 devices. The file should only be built for these devices.

---
 Kconfig              | 3 ++-
 scripts/Makefile.spl | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
Kconfig +2 -1
index 512c7beb89..305b265ed7 100644
@@ -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
scripts/Makefile.spl +0 -0
index 9d5921606e..592c5dfe57 100644
@@ -212,7 +212,11 @@ ifdef CONFIG_SAMSUNG
 ALL-y	+= $(obj)/$(BOARD)-spl.bin
 endif
 
Quoted 8 lines

scripts/Makefile.spl ifdef CONFIG_SAMSUNG · line 215

Quoted 2 lines
scripts/Makefile.spl +1 -1
-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.

sure thing.

Quoted 11 lines
Quoted 9 lines
scripts/Makefile.spl +4 -0
+ALL-y	+= $(obj)/$(SPL_BIN).sfp
+endif
+
+ifdef CONFIG_TARGET_SOCFPGA_GEN5
 ALL-y	+= $(obj)/$(SPL_BIN).sfp
 endif