From: Stefan Roese Date: Tue, 19 Mar 2019 16:56:30 +0100 Subject: [U-Boot] [PATCH 09/11] Makefile: Add Kconfig option CONFIG_SPL_IMAGE to select the SPL binary In-Reply-To: <20190319155632.5680-1-sr@denx.de> References: <20190319155632.5680-1-sr@denx.de> Message-ID: <20190319155632.5680-9-sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de This patch adds the CONFIG_SPL_IMAGE option to select the SPL image that shall be used to generate the combined SPL + U-Boot image. The default value is the current value "spl/u-boot-spl.bin". This patch also sets CONFIG_SPL_IMAGE to "spl/boot.bin" for AT91 targets which use SPL NAND support (boot from NAND). Signed-off-by: Stefan Roese Cc: Heiko Schocher Cc: Andreas Bie=C3=9Fmann Cc: Eugen Hristev --- Kconfig | 10 ++++++++++ Makefile | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 512c7beb89..6ad58926eb 100644 --- a/Kconfig +++ b/Kconfig @@ -224,6 +224,15 @@ config BUILD_ROM which are not shipped in the U-Boot source tree. Please, see doc/README.x86 for details. =20 +config SPL_IMAGE + string "SPL image filename that is generated" + default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT + default "spl/u-boot-spl.bin" + help + The SPL image filename that is generated by the build process. + This image might be used to generated a combined image with + SPL and main U-Boot proper as well. + config BUILD_TARGET string "Build target special images" default "u-boot-with-spl.sfp" if ARCH_SOCFPGA @@ -231,6 +240,7 @@ config BUILD_TARGET 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 diff --git a/Makefile b/Makefile index c52a33b403..7397724a2b 100644 --- a/Makefile +++ b/Makefile @@ -1219,9 +1219,11 @@ else SPL_PAYLOAD :=3D u-boot.bin endif =20 +SPL_IMAGE :=3D $(CONFIG_SPL_IMAGE:"%"=3D%) + OBJCOPYFLAGS_u-boot-with-spl.bin =3D -I binary -O binary \ --pad-to=3D$(CONFIG_SPL_PAD_TO) -u-boot-with-spl.bin: spl/u-boot-spl.bin $(SPL_PAYLOAD) FORCE +u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE $(call if_changed,pad_cat) =20 ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) --=20 2.21.0