[U-Boot] [PATCH] spl, Makefile: Take external offset into account for fit images

When building a FIT image for SPL to load also take into account the configured external offset. This allows the SPL to load the u-boot FIT image correctly when configuring SECURE_BOOT on i.mx6 is enabled (with CONFIG_FIT_EXTERNAL_OFFSET=0x3000).
Note this doesn't allow secure booting; but it does allow an unsigned SPL/u-boot with secure boot support eanbled to boot on open device.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
---
Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index c55ffa265f..a8808aeefd 100644 --- a/Makefile +++ b/Makefile @@ -1240,6 +1240,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) else

On 6/18/19 10:13 PM, Sjoerd Simons wrote:
When building a FIT image for SPL to load also take into account the configured external offset. This allows the SPL to load the u-boot FIT image correctly when configuring SECURE_BOOT on i.mx6 is enabled (with CONFIG_FIT_EXTERNAL_OFFSET=0x3000).
Note this doesn't allow secure booting; but it does allow an unsigned SPL/u-boot with secure boot support eanbled to boot on open device.
Does this change behavior on systems which don't use CONFIG_FIT_EXTERNAL_OFFSET ?
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index c55ffa265f..a8808aeefd 100644 --- a/Makefile +++ b/Makefile @@ -1240,6 +1240,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
- -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST)))
else

On Tue, 2019-06-18 at 22:20 +0200, Marek Vasut wrote:
On 6/18/19 10:13 PM, Sjoerd Simons wrote:
When building a FIT image for SPL to load also take into account the configured external offset. This allows the SPL to load the u-boot FIT image correctly when configuring SECURE_BOOT on i.mx6 is enabled (with CONFIG_FIT_EXTERNAL_OFFSET=0x3000).
Note this doesn't allow secure booting; but it does allow an unsigned SPL/u-boot with secure boot support eanbled to boot on open device.
Does this change behavior on systems which don't use CONFIG_FIT_EXTERNAL_OFFSET ?
Nope; in that case the default CONFIG_FIT_EXTERNAL_OFFSET is 0x0, which gets essentially ignored if passed as a argument to -p
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index c55ffa265f..a8808aeefd 100644 --- a/Makefile +++ b/Makefile @@ -1240,6 +1240,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
- -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst
",,$(CONFIG_OF_LIST))) else
participants (2)
-
Marek Vasut
-
Sjoerd Simons