On Sat, 5 Oct 2024 at 00:08, Marek Vasut <[email protected]> wrote: > > The SPL_FIT_SOURCE is long superseded by SPL_FIT_GENERATOR which > is long superseded by binman, drop SPL_FIT_SOURCE support as there > are no more users. > > Signed-off-by: Marek Vasut <[email protected]>
Reviewed-by: Peter Robinson <[email protected]> > --- > Cc: AKASHI Takahiro <[email protected]> > Cc: Heinrich Schuchardt <[email protected]> > Cc: Ilias Apalodimas <[email protected]> > Cc: Marcel Ziswiler <[email protected]> > Cc: Mattijs Korpershoek <[email protected]> > Cc: Patrice Chotard <[email protected]> > Cc: Patrick Delaunay <[email protected]> > Cc: Peter Robinson <[email protected]> > Cc: Quentin Schulz <[email protected]> > Cc: Rasmus Villemoes <[email protected]> > Cc: Sean Anderson <[email protected]> > Cc: Simon Glass <[email protected]> > Cc: Sumit Garg <[email protected]> > Cc: Tom Rini <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > --- > NOTE: Depends on > https://lore.kernel.org/u-boot/[email protected]/ > --- > Makefile | 6 ------ > boot/Kconfig | 8 -------- > doc/usage/fit/howto.rst | 11 +++-------- > 3 files changed, 3 insertions(+), 22 deletions(-) > > diff --git a/Makefile b/Makefile > index af24de4165e..a70926ec2fa 100644 > --- a/Makefile > +++ b/Makefile > @@ -1417,18 +1417,12 @@ u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE > # or a generator script > # NOTE: Please do not use this. We are migrating away from Makefile rules to > use > # binman instead. > -ifneq ($(CONFIG_SPL_FIT_SOURCE),"") > -U_BOOT_ITS := u-boot.its > -$(U_BOOT_ITS): $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) > - $(call if_changed,copy) > -else > 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 > -endif > > ifdef CONFIG_SPL_LOAD_FIT > MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ > diff --git a/boot/Kconfig b/boot/Kconfig > index 925afe06a19..51e6cd6cb1d 100644 > --- a/boot/Kconfig > +++ b/boot/Kconfig > @@ -282,14 +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 SPL_FIT_SOURCE > - string ".its source file for U-Boot FIT image" > - depends on SPL_FIT > - help > - Specifies a (platform specific) FIT source file to generate the > - U-Boot FIT image. This could specify further image to load and/or > - execute. > - > config USE_SPL_FIT_GENERATOR > bool "Use a script to generate the .its script" > depends on SPL_FIT > diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst > index b5097d4460b..280eff724f6 100644 > --- a/doc/usage/fit/howto.rst > +++ b/doc/usage/fit/howto.rst > @@ -57,14 +57,9 @@ 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. > > -If a platform specific image source file (.its) is shipped with the U-Boot > -source, it can be specified using the CONFIG_SPL_FIT_SOURCE Kconfig symbol. > -In this case it will be automatically used by U-Boot's Makefile to generate > -the image. > -If a static source file is not flexible enough, 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). > +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 > -- > 2.45.2 >
