On Sat, 5 Oct 2024 at 00:08, Marek Vasut marex@denx.de wrote:
The SPL_FIT_GENERATOR is long superseded by binman, drop SPL_FIT_GENERATOR support as there are no more users.
Signed-off-by: Marek Vasut marex@denx.de
Reviewed-by: Peter Robinson pbrobinson@gmail.com
Cc: AKASHI Takahiro akashi.tkhro@gmail.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Ilias Apalodimas ilias.apalodimas@linaro.org Cc: Marcel Ziswiler marcel.ziswiler@toradex.com Cc: Mattijs Korpershoek mkorpershoek@baylibre.com Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: Peter Robinson pbrobinson@gmail.com Cc: Quentin Schulz quentin.schulz@cherry.de Cc: Rasmus Villemoes rasmus.villemoes@prevas.dk Cc: Sean Anderson seanga2@gmail.com Cc: Simon Glass sjg@chromium.org Cc: Sumit Garg sumit.garg@linaro.org Cc: Tom Rini trini@konsulko.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
NOTE: Depends on https://lore.kernel.org/u-boot/20241004225916.361000-1-marex@denx.de/
Makefile | 18 ------------------ boot/Kconfig | 15 --------------- doc/usage/fit/howto.rst | 4 ---- 3 files changed, 37 deletions(-)
diff --git a/Makefile b/Makefile index a70926ec2fa..45592eb2bac 100644 --- a/Makefile +++ b/Makefile @@ -1139,13 +1139,6 @@ ifeq ($(CONFIG_OF_EMBED)$(CONFIG_EFI_APP),y) @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." @echo >&2 "See doc/develop/devicetree/control.rst for more info." @echo >&2 "====================================================" -endif -ifneq ($(CONFIG_SPL_FIT_GENERATOR),)
@echo >&2 "===================== WARNING ======================"@echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate"@echo >&2 "to binman instead, to avoid the proliferation of"@echo >&2 "arch-specific scripts with no tests."@echo >&2 "===================================================="endif $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) @@ -1413,17 +1406,6 @@ OBJCOPYFLAGS_u-boot.ldr.srec := -I binary -O srec u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE $(call if_changed,objcopy)
-# Boards with more complex image requirements can provide an .its source file -# or a generator script -# NOTE: Please do not use this. We are migrating away from Makefile rules to use -# binman instead. -ifneq ($(CONFIG_USE_SPL_FIT_GENERATOR),) -U_BOOT_ITS := u-boot.its -$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE
$(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \$(patsubst %,$(dt_dir)/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@-endif
ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ diff --git a/boot/Kconfig b/boot/Kconfig index 51e6cd6cb1d..4314227d5f8 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -282,21 +282,6 @@ config SPL_FIT_IMAGE_POST_PROCESS injected into the FIT creation (i.e. the blobs would have been pre- processed before being added to the FIT image).
-config USE_SPL_FIT_GENERATOR
bool "Use a script to generate the .its script"depends on SPL_FITdefault y if SPL_FIT && ARCH_ZYNQMP-config SPL_FIT_GENERATOR
string ".its file generator script for U-Boot FIT image"depends on USE_SPL_FIT_GENERATORdefault "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMPhelpSpecifies a (platform specific) script file to generate the FITsource file used to build the U-Boot FIT image file. This getspassed a list of supported device tree file stub names toinclude in the generated image.if VPL
config VPL_FIT diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst index 280eff724f6..675c9aa5bb0 100644 --- a/doc/usage/fit/howto.rst +++ b/doc/usage/fit/howto.rst @@ -57,10 +57,6 @@ own subnode under the /images node, which should then be referenced from one or multiple /configurations subnodes. The required images must be enumerated in the "loadables" property as a list of strings.
-CONFIG_SPL_FIT_GENERATOR can point to a script which generates this image source -file during the build process. It gets passed a list of device tree files (taken -from the CONFIG_OF_LIST symbol).
The SPL also records to a DT all additional images (called loadables) which are loaded. The information about loadables locations is passed via the DT node with fit-images name. -- 2.45.2