From d5512a32f683120f7e2d88b148bad1836f667a3c Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 18 Jan 2019 20:46:43 +1300 Subject: Kconfig: set default BUILD_TARGET for kirkwood Now that BUILD_TARGET is in Kconfig we can define a default for boards using the Kirkwood SoC. Signed-off-by: Chris Packham Cc: Jagan Teki --- Kconfig | 1 + 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 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index ad32c1d..2a48f53 100644 --- a/Kconfig +++ b/Kconfig @@ -230,6 +230,7 @@ config BUILD_TARGET 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 + default "u-boot.kwb" if KIRKWOOD help Some SoCs need special image types (e.g. U-Boot binary with a special header) as build targets. By defining diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 52bb70a..e0ce159 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -5,7 +5,6 @@ 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 b322ab0..4a6e058 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -5,7 +5,6 @@ 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 762521f..d3263cf 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -6,7 +6,6 @@ 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 b72174e..352403e 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -5,7 +5,6 @@ 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 7726f9a..9998e48 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -6,7 +6,6 @@ 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 03987a4..985d85e 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -5,7 +5,6 @@ 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 971d33b..eb29a70 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -4,7 +4,6 @@ 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 33cced9..04b00cd 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -7,7 +7,6 @@ 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 -- cgit v1.1