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 <judge.packham@gmail.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/Kconfig b/Kconfig
index ad32c1d36d25f30ad134592600c9c9772e38e7c1..2a48f5325663c88790748347092efa7cacbb7afb 100644 (file)
--- 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 52bb70ae8c0935ef3232916a54192115063c4561..e0ce1595c5ee5b3e0f85b7058b4dd556224f2fe4 100644 (file)
--- 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 b322ab0959db67ca1097c8dacf19adb991f30506..4a6e05844fec187c627ab79149ab7adde075c574 100644 (file)
--- 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 762521f97d7cfca177eb24f01e817cc47b5c77dc..d3263cf9cd3fb0e4f946d112316bfffaad8aefc6 100644 (file)
--- 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 b72174eada3cd3a542232ba3fa9dc68a803a8930..352403e57385812b20491e5cc2a2458da6a14f64 100644 (file)
--- 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 7726f9a76990d2e0c5d1e36f990c992327bad733..9998e48ab9c26e71ffc8a9f93cd48e79133fbead 100644 (file)
--- 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 03987a4ff19251d1bab743c8c984cacef7b68c06..985d85e0274663efe5f29688fe20e2edff6edff6 100644 (file)
--- 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 971d33b33dd29be97697dfe2da8fb6b706b9e30a..eb29a70157c9ddff663b3d29a517fabd4c53d259 100644 (file)
--- 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 33cced9c48dbddc2b026615d61f4e94c9c872bd8..04b00cdea9d4643eb5968a6b023c6c839a7b2826 100644 (file)
--- 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