On Mon, Oct 21, 2019 at 11:33 AM Simon Glass <sjg@chromium.org> wrote: > > We have the ability to enforce a maximum size for SPL but not yet for TPL. > Add a new option for this. > > Document the size check macro while we are here. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v3: None > Changes in v2: None > > Makefile | 7 +++++++ > common/spl/Kconfig | 8 ++++++++ > 2 files changed, 15 insertions(+) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Mon, Oct 28, 2019 at 2:34 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Mon, Oct 21, 2019 at 11:33 AM Simon Glass <sjg@chromium.org> wrote: > > > > We have the ability to enforce a maximum size for SPL but not yet for TPL. > > Add a new option for this. > > > > Document the size check macro while we are here. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > --- > > > > Changes in v3: None > > Changes in v2: None > > > > Makefile | 7 +++++++ > > common/spl/Kconfig | 8 ++++++++ > > 2 files changed, 15 insertions(+) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/Makefile b/Makefile index cbacf1cfe2c..3a29b5a90f9 100644 --- a/Makefile +++ b/Makefile @@ -806,6 +806,12 @@ else SPL_SIZE_CHECK = endif +ifneq ($(CONFIG_TPL_SIZE_LIMIT),0) +TPL_SIZE_CHECK = @$(call size_check,$@,$(CONFIG_TPL_SIZE_LIMIT)) +else +TPL_SIZE_CHECK = +endif + # Statically apply RELA-style relocations (currently arm64 only) # This is useful for arm64 where static relocation needs to be performed on # the raw binary, but certain simulators only accept an ELF file (but don't @@ -1795,6 +1801,7 @@ spl/boot.bin: spl/u-boot-spl tpl/u-boot-tpl.bin: tools prepare \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all + $(TPL_SIZE_CHECK) TAG_SUBDIRS := $(patsubst %,$(srctree)/%,$(u-boot-dirs) include) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 86d7edfee1b..c661809923a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1232,6 +1232,14 @@ config TPL if TPL +config TPL_SIZE_LIMIT + hex "Maximum size of TPL image" + depends on TPL + default 0 + help + Specifies the maximum length of the U-Boot TPL image. + If this value is zero, it is ignored. + config TPL_HANDOFF bool "Pass hand-off information from TPL to SPL and U-Boot proper" depends on HANDOFF && TPL_BLOBLIST
We have the ability to enforce a maximum size for SPL but not yet for TPL. Add a new option for this. Document the size check macro while we are here. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: None Changes in v2: None Makefile | 7 +++++++ common/spl/Kconfig | 8 ++++++++ 2 files changed, 15 insertions(+)