X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Kconfig;h=7a5491bd6775b5d0420777f6cb1a42790940cc09;hb=08621424ce3b8ce99c22df4b2b4a13ce89fa40a1;hp=2a48f5325663c88790748347092efa7cacbb7afb;hpb=d5512a32f683120f7e2d88b148bad1836f667a3c;p=oweals%2Fu-boot.git

diff --git a/Kconfig b/Kconfig
index 2a48f53256..7a5491bd67 100644
--- a/Kconfig
+++ b/Kconfig
@@ -224,13 +224,25 @@ config BUILD_ROM
 	  which are not shipped in the U-Boot source tree.
 	  Please, see doc/README.x86 for details.
 
+config SPL_IMAGE
+	string "SPL image used in the combined SPL+U-Boot image"
+	default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
+	default "spl/u-boot-spl.bin"
+	help
+	  Select the SPL build target that shall be generated by the SPL
+	  build process (default spl/u-boot-spl.bin). This image will be
+	  used to generate a combined image with SPL and main U-Boot
+	  proper as one single image.
+
 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-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
+	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
+	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
 	default "u-boot-elf.srec" if RCAR_GEN3
 	default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
 	default "u-boot.kwb" if KIRKWOOD
+	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
 	help
 	  Some SoCs need special image types (e.g. U-Boot binary
 	  with a special header) as build targets. By defining