summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2019-01-18 10:22:49 +0300
committerTom Rini <trini@konsulko.com>2019-02-02 16:23:57 +0300
commitdc146ca111873b1eabb9d0249ce0c1ec44e82a26 (patch)
tree88b1778829cb7df0945d2ed917802c773fb8526d
parentdc57be51e9dcdb67325b62e7da7992cca9854e0f (diff)
downloadu-boot-dc146ca111873b1eabb9d0249ce0c1ec44e82a26.tar.xz
Kconfig: Migrate CONFIG_BUILD_TARGET
Migrate CONFIG_BUILD_TARGET into Kconfig. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat
-rw-r--r--Kconfig13
-rw-r--r--README7
-rw-r--r--arch/arm/mach-mvebu/include/mach/config.h5
-rw-r--r--configs/SBx81LIFKW_defconfig1
-rw-r--r--configs/SBx81LIFXCAT_defconfig1
-rw-r--r--configs/dreamplug_defconfig1
-rw-r--r--configs/ds109_defconfig1
-rw-r--r--configs/guruplug_defconfig1
-rw-r--r--configs/ib62x0_defconfig1
-rw-r--r--configs/nsa310s_defconfig1
-rw-r--r--configs/sheevaplug_defconfig1
-rw-r--r--include/configs/SBx81LIFKW.h1
-rw-r--r--include/configs/SBx81LIFXCAT.h1
-rw-r--r--include/configs/ib62x0.h3
-rw-r--r--include/configs/mv-plug-common.h3
-rw-r--r--include/configs/nsa310s.h3
-rw-r--r--include/configs/rcar-gen3-common.h1
-rw-r--r--include/configs/socfpga_common.h3
-rw-r--r--include/configs/sunxi-common.h1
-rw-r--r--scripts/config_whitelist.txt1
20 files changed, 21 insertions, 29 deletions
diff --git a/Kconfig b/Kconfig
index a078f7b1b6..ad32c1d36d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -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"
diff --git a/README b/README
index da033dc66f..b81500f6af 100644
--- a/README
+++ b/README
@@ -1986,13 +1986,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
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index f165d10018..e3235fc67e 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -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
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index e0ce1595c5..52bb70ae8c 100644
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -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
diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index 4a6e05844f..b322ab0959 100644
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -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
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index d3263cf9cd..762521f97d 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -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
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 352403e573..b72174eada 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -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
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 9998e48ab9..7726f9a769 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -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
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 985d85e027..03987a4ff1 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -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 => "
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index eb29a70157..971d33b33d 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -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 => "
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 04b00cdea9..33cced9c48 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -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
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 07b65f89f9..d62fd35e81 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -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
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index d73752c7f9..3c8c216d89 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -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
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index f8d3c3b63f..5e54441c73 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -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
*/
diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
index f424e2cc6c..486650f183 100644
--- a/include/configs/mv-plug-common.h
+++ b/include/configs/mv-plug-common.h
@@ -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
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 1ca9a01754..eb465e0690 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -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
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 6c2fa6a63c..06d5d3219c 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -12,7 +12,6 @@
#include <asm/arch/rmobile.h>
#define CONFIG_REMAKE_ELF
-#define CONFIG_BUILD_TARGET "u-boot-elf.srec"
/* boot option */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index ea992fa81b..c9cbf8f5e3 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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
*/
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index ed0cfc24f5..b01d1c3c84 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -32,7 +32,6 @@
#endif
#ifdef CONFIG_ARM64
-#define CONFIG_BUILD_TARGET "u-boot.itb"
#define CONFIG_SYS_BOOTM_LEN (32 << 20)
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c05fc37964..b425cc360f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -178,7 +178,6 @@ CONFIG_BS_SIZE
CONFIG_BTB
CONFIG_BUFNO_AUTO_INCR_BIT
CONFIG_BUILD_ENVCRC
-CONFIG_BUILD_TARGET
CONFIG_BUS_WIDTH
CONFIG_BZIP2
CONFIG_CADDY2
generated by cgit v1.2.3 (git 2.39.0) at 2024-08-31 11:57:46 +0300