LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Migrate CONFIG_BUILD_TARGET 

Migrate CONFIG_BUILD_TARGET into Kconfig.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2019-01-18 12:52:49 +05:30 committed by Tom Rini
parent dc57be51e9
commit dc146ca111
20 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Kconfig
View File

@ -224,6 +224,19 @@ config BUILD_ROM
which are not shipped in the U-Boot source tree. which are not shipped in the U-Boot source tree.
Please, see doc/README.x86 for details. 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 endmenu # General setup
menu "Boot images" menu "Boot images"

7
README
View File

@ -1986,13 +1986,6 @@ The following options need to be configured:
200 ms. 200 ms.
- Configuration Management: - 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 CONFIG_IDENT_STRING

5
arch/arm/mach-mvebu/include/mach/config.h
View File

@ -40,11 +40,6 @@
#define CONFIG_SYS_KWD_CONFIG arch/arm/mach-mvebu/kwbimage.cfg #define CONFIG_SYS_KWD_CONFIG arch/arm/mach-mvebu/kwbimage.cfg
#endif /* CONFIG_SYS_KWD_CONFIG */ #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 */ /* end of 16M scrubbed by training in bootrom */
#define CONFIG_SYS_INIT_SP_ADDR 0x00FF0000 #define CONFIG_SYS_INIT_SP_ADDR 0x00FF0000

1
configs/SBx81LIFKW_defconfig
View File

@ -5,6 +5,7 @@ CONFIG_TARGET_SBx81LIFKW=y
CONFIG_IDENT_STRING="\nSBx81LIFKW" CONFIG_IDENT_STRING="\nSBx81LIFKW"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_SILENT_U_BOOT_ONLY=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y

1
configs/SBx81LIFXCAT_defconfig
View File

@ -5,6 +5,7 @@ CONFIG_TARGET_SBx81LIFXCAT=y
CONFIG_IDENT_STRING="\nSBx81LIFXCAT" CONFIG_IDENT_STRING="\nSBx81LIFXCAT"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_SILENT_U_BOOT_ONLY=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y

1
configs/dreamplug_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/ds109_defconfig
View File

@ -5,6 +5,7 @@ CONFIG_TARGET_DS109=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_IDE=y CONFIG_CMD_IDE=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

1
configs/guruplug_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

1
configs/ib62x0_defconfig
View File

@ -5,6 +5,7 @@ CONFIG_TARGET_IB62X0=y
CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0" CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ib62x0 => " CONFIG_SYS_PROMPT="ib62x0 => "

1
configs/nsa310s_defconfig
View File

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NSA310S=y CONFIG_TARGET_NSA310S=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="nsa310s => " CONFIG_SYS_PROMPT="nsa310s => "

1
configs/sheevaplug_defconfig
View File

@ -7,6 +7,7 @@ CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_BUILD_TARGET="u-boot.kwb"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

1
include/configs/SBx81LIFKW.h
View File

@ -13,7 +13,6 @@
#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
#define CONFIG_BUILD_TARGET "u-boot.kwb"
/* additions for new ARM relocation support */ /* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000

1
include/configs/SBx81LIFXCAT.h
View File

@ -13,7 +13,6 @@
#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
#define CONFIG_BUILD_TARGET "u-boot.kwb"
/* additions for new ARM relocation support */ /* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000

3
include/configs/ib62x0.h
View File

@ -15,9 +15,6 @@
#define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #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 * Compression configuration
*/ */

3
include/configs/mv-plug-common.h
View File

@ -13,9 +13,6 @@
#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #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 * mv-common.h should be defined after CMD configs since it used them
* to enable certain macros * to enable certain macros

3
include/configs/nsa310s.h
View File

@ -15,9 +15,6 @@
#define CONFIG_KW88F6702 1 /* SOC Name */ #define CONFIG_KW88F6702 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #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 */ /* compression configuration */
#define CONFIG_BZIP2 #define CONFIG_BZIP2

1
include/configs/rcar-gen3-common.h
View File

@ -12,7 +12,6 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_BUILD_TARGET "u-boot-elf.srec"
/* boot option */ /* boot option */

3
include/configs/socfpga_common.h
View File

@ -14,9 +14,6 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */ #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 * Memory configurations
*/ */

1
include/configs/sunxi-common.h
View File

@ -32,7 +32,6 @@
#endif #endif
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
#define CONFIG_BUILD_TARGET "u-boot.itb"
#define CONFIG_SYS_BOOTM_LEN (32 << 20) #define CONFIG_SYS_BOOTM_LEN (32 << 20)
#endif #endif

1
scripts/config_whitelist.txt
View File

@ -178,7 +178,6 @@ CONFIG_BS_SIZE
CONFIG_BTB CONFIG_BTB
CONFIG_BUFNO_AUTO_INCR_BIT CONFIG_BUFNO_AUTO_INCR_BIT
CONFIG_BUILD_ENVCRC CONFIG_BUILD_ENVCRC
CONFIG_BUILD_TARGET
CONFIG_BUS_WIDTH CONFIG_BUS_WIDTH
CONFIG_BZIP2 CONFIG_BZIP2
CONFIG_CADDY2 CONFIG_CADDY2