Skip to contentSkip to conversation

Kconfig: Migrate CONFIG_BUILD_TARGET

PATCH New Jagan Teki 4 participants 7 messages Jan 18, 2019 – Feb 11, 2019

Subsystems (5)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

Migrate CONFIG_BUILD_TARGET into Kconfig.

---
Changes for v2:
- build target type 'u-boot.itb' when SPL_LOAD_FIT being used

 Kconfig                                   | 13 +++++++++++++
 README                                    |  7 -------
 arch/arm/mach-mvebu/include/mach/config.h |  5 -----
 configs/SBx81LIFKW_defconfig              |  1 +
 configs/SBx81LIFXCAT_defconfig            |  1 +
 configs/dreamplug_defconfig               |  1 +
 configs/ds109_defconfig                   |  1 +
 configs/guruplug_defconfig                |  1 +
 configs/ib62x0_defconfig                  |  1 +
 configs/nsa310s_defconfig                 |  1 +
 configs/sheevaplug_defconfig              |  1 +
 include/configs/SBx81LIFKW.h              |  1 -
 include/configs/SBx81LIFXCAT.h            |  1 -
 include/configs/ib62x0.h                  |  3 ---
 include/configs/mv-plug-common.h          |  3 ---
 include/configs/nsa310s.h                 |  3 ---
 include/configs/rcar-gen3-common.h        |  1 -
 include/configs/socfpga_common.h          |  3 ---
 include/configs/sunxi-common.h            |  1 -
 scripts/config_whitelist.txt              |  1 -
 20 files changed, 21 insertions(+), 29 deletions(-)
Kconfig +13 -0
index aff7b2e00a..15b79259a8 100644
@@ -224,6 +224,19 @@ config BUILD_ROM
 	  which are not shipped in the U-Boot source tree.
 	  Please, see doc/README.x86 for details.
 
+config BUILD_TARGET
+	string "Build target special images"
+	default "u-boot-with-spl.sfp" if ARCH_SOCFPGA
+	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD
+	default "u-boot-elf.srec" if RCAR_GEN3
+	default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+	help
+	  Some SoCs need special image types (e.g. U-Boot binary
+	  with a special header) as build targets. By defining
+	  CONFIG_BUILD_TARGET in the SoC / board header, this
+	  special image will be automatically built upon calling
+	  make / buildman.
+
 endmenu		# General setup
 
 menu "Boot images"
README +0 -7
index 17d56b8034..01ad69e926 100644
@@ -1998,13 +1998,6 @@ The following options need to be configured:
 		200 ms.
 
 - Configuration Management:
-		CONFIG_BUILD_TARGET
-
-		Some SoCs need special image types (e.g. U-Boot binary
-		with a special header) as build targets. By defining
-		CONFIG_BUILD_TARGET in the SoC / board header, this
-		special image will be automatically built upon calling
-		make / buildman.
 
 		CONFIG_IDENT_STRING
 
arch/arm/mach-mvebu/include/mach/config.h +0 -5
index f165d10018..e3235fc67e 100644
@@ -40,11 +40,6 @@
 #define	CONFIG_SYS_KWD_CONFIG	arch/arm/mach-mvebu/kwbimage.cfg
 #endif /* CONFIG_SYS_KWD_CONFIG */
 
-/* Add target to build it automatically upon "make" */
-#ifdef CONFIG_SPL
-#define CONFIG_BUILD_TARGET	"u-boot-spl.kwb"
-#endif
-
 /* end of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR		0x00FF0000
 
configs/SBx81LIFKW_defconfig +1 -0
index e0ce1595c5..52bb70ae8c 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SBx81LIFKW=y
 CONFIG_IDENT_STRING="\nSBx81LIFKW"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_MISC_INIT_R=y
configs/SBx81LIFXCAT_defconfig +1 -0
index 4a6e05844f..b322ab0959 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_SBx81LIFXCAT=y
 CONFIG_IDENT_STRING="\nSBx81LIFXCAT"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_MISC_INIT_R=y
configs/dreamplug_defconfig +1 -0
index d3263cf9cd..762521f97d 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
 CONFIG_NR_DRAM_BANKS=2
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_FLASH is not set
configs/ds109_defconfig +1 -0
index 352403e573..b72174eada 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_DS109=y
 CONFIG_NR_DRAM_BANKS=2
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_HUSH_PARSER=y
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
configs/guruplug_defconfig +1 -0
index 9998e48ab9..7726f9a769 100644
@@ -6,6 +6,7 @@ CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
 CONFIG_NR_DRAM_BANKS=2
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/ib62x0_defconfig +1 -0
index 985d85e027..03987a4ff1 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_IB62X0=y
 CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ib62x0 => "
configs/nsa310s_defconfig +1 -0
index eb29a70157..971d33b33d 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NSA310S=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="nsa310s => "
configs/sheevaplug_defconfig +1 -0
index 04b00cdea9..33cced9c48 100644
@@ -7,6 +7,7 @@ CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
 CONFIG_NR_DRAM_BANKS=2
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=3
+CONFIG_BUILD_TARGET="u-boot.kwb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
include/configs/SBx81LIFKW.h +0 -1
index 07b65f89f9..d62fd35e81 100644
@@ -13,7 +13,6 @@
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 #define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-#define CONFIG_BUILD_TARGET	"u-boot.kwb"
 
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
include/configs/SBx81LIFXCAT.h +0 -1
index d73752c7f9..3c8c216d89 100644
@@ -13,7 +13,6 @@
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 #define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-#define CONFIG_BUILD_TARGET	"u-boot.kwb"
 
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
include/configs/ib62x0.h +0 -3
index f8d3c3b63f..5e54441c73 100644
@@ -15,9 +15,6 @@
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
-/* Add target to build it automatically upon "make" */
-#define CONFIG_BUILD_TARGET     "u-boot.kwb"
-
 /*
  * Compression configuration
  */
include/configs/mv-plug-common.h +0 -3
index f424e2cc6c..486650f183 100644
@@ -13,9 +13,6 @@
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
-/* Add target to build it automatically upon "make" */
-#define CONFIG_BUILD_TARGET     "u-boot.kwb"
-
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
include/configs/nsa310s.h +0 -3
index 1ca9a01754..eb465e0690 100644
@@ -15,9 +15,6 @@
 #define CONFIG_KW88F6702		1	/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
-/* add target to build it automatically upon "make" */
-#define CONFIG_BUILD_TARGET		"u-boot.kwb"
-
 /* compression configuration */
 #define CONFIG_BZIP2
 
include/configs/rcar-gen3-common.h +0 -1
index 6c2fa6a63c..06d5d3219c 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_BUILD_TARGET	"u-boot-elf.srec"
 
 /* boot option */
 
include/configs/socfpga_common.h +0 -3
index bd8f5c8c41..d3dd2eabac 100644
@@ -14,9 +14,6 @@
 
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
-/* add target to build it automatically upon "make" */
-#define CONFIG_BUILD_TARGET		"u-boot-with-spl.sfp"
-
 /*
  * Memory configurations
  */
include/configs/sunxi-common.h +0 -1
index 9819d9980c..f0c8daad72 100644
@@ -32,7 +32,6 @@
 #endif
 
 #ifdef CONFIG_ARM64
-#define CONFIG_BUILD_TARGET "u-boot.itb"
 #define CONFIG_SYS_BOOTM_LEN		(32 << 20)
 #endif
 
scripts/config_whitelist.txt +0 -1
index 527050de97..17c4b482c7 100644
@@ -181,7 +181,6 @@ CONFIG_BS_SIZE
 CONFIG_BTB
 CONFIG_BUFNO_AUTO_INCR_BIT
 CONFIG_BUILD_ENVCRC
-CONFIG_BUILD_TARGET
 CONFIG_BUS_WIDTH
 CONFIG_BZIP2
 CONFIG_CADDY2
Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#1 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

Tom or anyone,

Quoted 5 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

---

Any comments, if all OK. then these would be good go.

#2 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

Quoted 10 lines · Jagan Teki

Tom or anyone,

Quoted 5 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

---

Any comments, if all OK. then these would be good go.

I'm reviewing this now along with 2/2 and the kirkwood patch.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190201/3849c132/attachment.sig>
#3 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

In reply to Jagan Teki
Quoted 3 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/a4a65b86/attachment.sig>
#4 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

In reply to Jagan Teki

Hi Jagan,

I've just tried this out on x530 and db-88f6820-amc (both ARCH_MVEBU).

Quoted 5 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

---

<snip>

Kconfig config BUILD_ROM · line 230

Quoted 12 lines
Kconfig +4 -0
index aff7b2e00a..15b79259a8 100644
@@ -224,6 +224,19 @@ config BUILD_ROM
          which are not shipped in the U-Boot source tree.
          Please, see doc/README.x86 for details.
 
+config BUILD_TARGET
+       string "Build target special images"
+       default "u-boot-with-spl.sfp" if ARCH_SOCFPGA
+       default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD

It looks like this doesn't work as expected. Perhaps because SPL_BUILD is a bit special. Should this hang of CONFIG_SPL or CONFIG_SUPPORT_SPL instead?

Quoted 11 lines
Kconfig +9 -0
+       default "u-boot-elf.srec" if RCAR_GEN3
+       default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+       help
+         Some SoCs need special image types (e.g. U-Boot binary
+         with a special header) as build targets. By defining
+         CONFIG_BUILD_TARGET in the SoC / board header, this
+         special image will be automatically built upon calling
+         make / buildman.
+
 endmenu                # General setup
 
#5 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

Hi Chris,

Quoted 20 lines · Chris Packham

Hi Jagan,

I've just tried this out on x530 and db-88f6820-amc (both ARCH_MVEBU).

Quoted 5 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

---

<snip>

Quoted 8 lines
Kconfig +0 -0
index aff7b2e00a..15b79259a8 100644
@@ -224,6 +224,19 @@ config BUILD_ROM
           which are not shipped in the U-Boot source tree.
           Please, see doc/README.x86 for details.
 
Quoted 8 lines

Kconfig config BUILD_ROM · line 230

Quoted 4 lines
Kconfig +4 -0
+config BUILD_TARGET
+       string "Build target special images"
+       default "u-boot-with-spl.sfp" if ARCH_SOCFPGA
+       default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD

It looks like this doesn't work as expected. Perhaps because SPL_BUILD is a bit special. Should this hang of CONFIG_SPL or CONFIG_SUPPORT_SPL instead?

Baruch already spotted this problem and did send a patch to fix this issue:

http://patchwork.ozlabs.org/patch/1037973/

Seems to be identical to yours I'll pick it up quickly to fix this build problem.

Thanks,
Stefan

#6 lore raw

PATCH v2 1/2 Kconfig: Migrate CONFIG_BUILD_TARGET

Quoted 33 lines · Stefan Roese

Hi Chris,

Quoted 20 lines · Chris Packham

Hi Jagan,

I've just tried this out on x530 and db-88f6820-amc (both ARCH_MVEBU).

Quoted 5 lines · Jagan Teki

Migrate CONFIG_BUILD_TARGET into Kconfig.

---

<snip>

Quoted 8 lines
Kconfig +0 -0
index aff7b2e00a..15b79259a8 100644
@@ -224,6 +224,19 @@ config BUILD_ROM
           which are not shipped in the U-Boot source tree.
           Please, see doc/README.x86 for details.
 
Quoted 8 lines

Kconfig config BUILD_ROM · line 230

Quoted 4 lines
Kconfig +4 -0
+config BUILD_TARGET
+       string "Build target special images"
+       default "u-boot-with-spl.sfp" if ARCH_SOCFPGA
+       default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD

It looks like this doesn't work as expected. Perhaps because SPL_BUILD is a bit special. Should this hang of CONFIG_SPL or CONFIG_SUPPORT_SPL instead?

Quoted 7 lines

Baruch already spotted this problem and did send a patch to fix this issue:

http://patchwork.ozlabs.org/patch/1037973/

Seems to be identical to yours I'll pick it up quickly to fix this build problem.

OK thanks. I didn't search before sending. I've marked my patch as superseded in patchwork.