Skip to contentSkip to conversation

configs: rk3288: Tinker Board SPL file must fit into 32 KiB

PATCH Superseded Heinrich Schuchardt 3 participants 6 messages Feb 14, 2019 – Feb 28, 2019 Kbuild

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

---
v3
The maximum size should of the image should be 30 KiB. Allowing 2 KiB for the header. This is 30720 and not 32700 bytes.
v2
Instead of using CONFIG_SPL_MAX_SIZE with an estimate of the FDT size introduce a new test in scripts/Makefile.spl.

---
 Kconfig                         |  8 ++++++++
 configs/tinker-rk3288_defconfig |  1 +
 scripts/Makefile.spl            | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
Kconfig +8 -0
index 512c7beb89..7cce53da74 100644
@@ -172,6 +172,14 @@ config TPL_SYS_MALLOC_F_LEN
 	  particular needs this to operate, so that it can allocate the
 	  initial serial device and any others that are needed.
 
+config SPL_WITH_DTB_SIZE_LIMIT
+	int "Maximum size of SPL image including device tree"
+	depends on SPL
+	default 0
+	help
+	  Specifies the maximum length of the U-Boot SPL image including the
+	  device tree. If this value is zero, it is ignored.
+
 menuconfig EXPERT
 	bool "Configure standard U-Boot features (expert users)"
 	default y
configs/tinker-rk3288_defconfig +1 -0
index fdcab28185..cc5e59bcf1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_SPL_WITH_DTB_SIZE_LIMIT=30720
 CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_DEBUG_UART_BASE=0xff690000
scripts/Makefile.spl +16 -0
index 9d5921606e..afc329a410 100644
@@ -254,11 +254,27 @@ FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
 endif
 
 
+ifneq ($(CONFIG_SPL_WITH_DTB_SIZE_LIMIT),0)
+SPL_WITH_DTB_SIZE_CHECK = \
+	@actual=`wc -c $@ | awk '{print $$1}'`; \
+	limit=`printf "%d" $(CONFIG_SPL_WITH_DTB_SIZE_LIMIT)`; \
+	if test $$actual -gt $$limit; then \
+		echo "$@ exceeds file size limit:" >&2 ; \
+		echo "  limit:  $$limit bytes" >&2 ; \
+		echo "  actual: $$actual bytes" >&2 ; \
+		echo "  excess: $$((actual - limit)) bytes" >&2; \
+		exit 1; \
+	fi
+else
+SPL_WITH_DTB_SIZE_CHECK =
+endif
+
 ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
 $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \
 		$(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \
 		$(FINAL_DTB_CONTAINER)  FORCE
 	$(call if_changed,cat)
+	$(SPL_WITH_DTB_SIZE_CHECK)
 
 $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE
 	$(call if_changed,copy)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

Quoted 8 lines · Heinrich Schuchardt

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

Quoted 79 lines

---
v3
The maximum size should of the image should be 30 KiB. Allowing 2 KiB for the header. This is 30720 and not 32700 bytes.
v2
Instead of using CONFIG_SPL_MAX_SIZE with an estimate of the FDT size introduce a new test in scripts/Makefile.spl.

---
 Kconfig                         |  8 ++++++++
 configs/tinker-rk3288_defconfig |  1 +
 scripts/Makefile.spl            | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
Kconfig +8 -0
index 512c7beb89..7cce53da74 100644
@@ -172,6 +172,14 @@ config TPL_SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
+config SPL_WITH_DTB_SIZE_LIMIT
+       int "Maximum size of SPL image including device tree"
+       depends on SPL
+       default 0
+       help
+         Specifies the maximum length of the U-Boot SPL image including the
+         device tree. If this value is zero, it is ignored.
+
 menuconfig EXPERT
        bool "Configure standard U-Boot features (expert users)"
        default y
configs/tinker-rk3288_defconfig +1 -0
index fdcab28185..cc5e59bcf1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_SPL_WITH_DTB_SIZE_LIMIT=30720
 CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_DEBUG_UART_BASE=0xff690000
scripts/Makefile.spl +16 -1
index 9d5921606e..afc329a410 100644
@@ -254,11 +254,27 @@ FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
 endif
 
 
+ifneq ($(CONFIG_SPL_WITH_DTB_SIZE_LIMIT),0)
+SPL_WITH_DTB_SIZE_CHECK = \
+       @actual=`wc -c $@ | awk '{print $$1}'`; \
+       limit=`printf "%d" $(CONFIG_SPL_WITH_DTB_SIZE_LIMIT)`; \
+       if test $$actual -gt $$limit; then \
+               echo "$@ exceeds file size limit:" >&2 ; \
+               echo "  limit:  $$limit bytes" >&2 ; \
+               echo "  actual: $$actual bytes" >&2 ; \
+               echo "  excess: $$((actual - limit)) bytes" >&2; \
+               exit 1; \
+       fi
+else
+SPL_WITH_DTB_SIZE_CHECK =
+endif
+
 ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
 $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \
                $(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \
                $(FINAL_DTB_CONTAINER)  FORCE
        $(call if_changed,cat)
+       $(SPL_WITH_DTB_SIZE_CHECK)
 
 $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE
        $(call if_changed,copy)
--

2.20.1

#2 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

Tom,

Quoted 6 lines · Simon Goldschmidt
Quoted 4 lines · Heinrich Schuchardt

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

Quoted 6 lines
Quoted 4 lines

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

Is this planned for v2019.04? I know we're in rc phase, but this patch adds a new config
option so shouldn't interfere with boards not using it.

Plus if we have this SPL size check in v2019.04, it would probably enable more board
maintainers testing/fixing the SPL size check after the release.

Regards,
Simon

Quoted 80 lines
Quoted 80 lines

---
v3
The maximum size should of the image should be 30 KiB. Allowing 2 KiB for the header. This is 30720 and not 32700 bytes.
v2
Instead of using CONFIG_SPL_MAX_SIZE with an estimate of the FDT size introduce a new test in scripts/Makefile.spl.

---
 Kconfig                         |  8 ++++++++
 configs/tinker-rk3288_defconfig |  1 +
 scripts/Makefile.spl            | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
Kconfig +8 -0
index 512c7beb89..7cce53da74 100644
@@ -172,6 +172,14 @@ config TPL_SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
+config SPL_WITH_DTB_SIZE_LIMIT
+       int "Maximum size of SPL image including device tree"
+       depends on SPL
+       default 0
+       help
+         Specifies the maximum length of the U-Boot SPL image including the
+         device tree. If this value is zero, it is ignored.
+
 menuconfig EXPERT
        bool "Configure standard U-Boot features (expert users)"
        default y
configs/tinker-rk3288_defconfig +1 -0
index fdcab28185..cc5e59bcf1 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_SPL_WITH_DTB_SIZE_LIMIT=30720
 CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_DEBUG_UART_BASE=0xff690000
scripts/Makefile.spl +16 -1
index 9d5921606e..afc329a410 100644
@@ -254,11 +254,27 @@ FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
 endif
 
 
+ifneq ($(CONFIG_SPL_WITH_DTB_SIZE_LIMIT),0)
+SPL_WITH_DTB_SIZE_CHECK = \
+       @actual=`wc -c $@ | awk '{print $$1}'`; \
+       limit=`printf "%d" $(CONFIG_SPL_WITH_DTB_SIZE_LIMIT)`; \
+       if test $$actual -gt $$limit; then \
+               echo "$@ exceeds file size limit:" >&2 ; \
+               echo "  limit:  $$limit bytes" >&2 ; \
+               echo "  actual: $$actual bytes" >&2 ; \
+               echo "  excess: $$((actual - limit)) bytes" >&2; \
+               exit 1; \
+       fi
+else
+SPL_WITH_DTB_SIZE_CHECK =
+endif
+
 ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
 $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \
                $(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \
                $(FINAL_DTB_CONTAINER)  FORCE
        $(call if_changed,cat)
+       $(SPL_WITH_DTB_SIZE_CHECK)
 
 $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE
        $(call if_changed,copy)
--

2.20.1

#3 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

Quoted 17 lines · Simon Goldschmidt

Tom,

Quoted 6 lines · Simon Goldschmidt
Quoted 4 lines · Heinrich Schuchardt

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

Quoted 6 lines
Quoted 4 lines

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

Quoted 7 lines

Is this planned for v2019.04? I know we're in rc phase, but this patch adds a new config
option so shouldn't interfere with boards not using it.

Plus if we have this SPL size check in v2019.04, it would probably enable more board
maintainers testing/fixing the SPL size check after the release.

I really want to get the generic version of this in, yes.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190227/df736eff/attachment.sig>
#4 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

Am 27.02.2019 um 19:55 schrieb Tom Rini:

Quoted 22 lines · Simon Goldschmidt
Quoted 21 lines

Tom,

Quoted 6 lines · Simon Goldschmidt
Quoted 4 lines · Heinrich Schuchardt

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

Quoted 6 lines
Quoted 4 lines

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

Is this planned for v2019.04? I know we're in rc phase, but this patch adds a new config
option so shouldn't interfere with boards not using it.

Quoted 5 lines
Quoted 3 lines

Plus if we have this SPL size check in v2019.04, it would probably enable more board
maintainers testing/fixing the SPL size check after the release.

I really want to get the generic version of this in, yes.

Which generic version? Was there some kind of generic follow-up patch I missed?

I would like to implement a real & working SPL size check for socfpga (including pre-reloc malloc, gd and stack) which builds on this.

Regards,
Simon

#5 lore raw

PATCH v3 1/1 configs: rk3288: Tinker Board SPL file must fit into 32 KiB

Quoted 23 lines · Simon Goldschmidt

Am 27.02.2019 um 19:55 schrieb Tom Rini:

Quoted 22 lines · Simon Goldschmidt
Quoted 21 lines

Tom,

Quoted 6 lines · Simon Goldschmidt
Quoted 4 lines · Heinrich Schuchardt

The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header.

Quoted 6 lines
Quoted 4 lines

A new configuration variable CONFIG_SPL_WITH_DTB_SIZE_LIMIT is introduced to define the board specific limit.

Is this planned for v2019.04? I know we're in rc phase, but this patch adds a new config
option so shouldn't interfere with boards not using it.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Plus if we have this SPL size check in v2019.04, it would probably enable more board
maintainers testing/fixing the SPL size check after the release.

I really want to get the generic version of this in, yes.

Which generic version? Was there some kind of generic follow-up patch I missed?

No, there wasn't I believe which is why nothing has been applied. I don't want to add a 3rd copy of the BOARD_SIZE_CHECK logic, I want it to be re-usable and then used by CONFIG_SPL_MAX_SIZE / CONFIG_TPL_MAX_SIZE because as with the switch (compared to when these checks were first introduced, pre-SPL-DM) we now have image content that's not caught by the linker check, so we need to use those variables in the right place now.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190228/2c1783a5/attachment.sig>