* [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option
@ 2021-07-09 9:49 Kory Maincent
2021-07-09 9:49 ` [Buildroot] [PATCH 2/2] boot/arm-trusted-firmware: Add out-of-source ATF device tree support Kory Maincent
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kory Maincent @ 2021-07-09 9:49 UTC (permalink / raw)
To: buildroot
Update the FIP image generation by adding the BL33_CFG parameter.
This is needed for the ST version of ATF.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
boot/arm-trusted-firmware/Config.in | 9 +++++++++
boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 7e46a10270..80f6161597 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -133,6 +133,15 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
Name of the U-Boot BL33 image to include in ATF, it must
have been installed to BINARIES_DIR by the U-Boot package.
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG
+ string "U-Boot BL33 image devicetree name"
+ default ""
+ help
+ Name of the U-Boot BL33 image devicetree to include in ATF.
+ It must have been installed to BINARIES_DIR by the U-Boot
+ package.
+ Needed for the stm32mp1 platform.
+
endif
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 1f08f5dabb..9fc8b51a80 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -92,6 +92,10 @@ endif
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE))
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN)
+ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG))
+ifneq ($(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG),)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33_CFG=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG)
+endif
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
endif
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] boot/arm-trusted-firmware: Add out-of-source ATF device tree support
2021-07-09 9:49 [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Kory Maincent
@ 2021-07-09 9:49 ` Kory Maincent
2021-08-19 21:27 ` Thomas Petazzoni
2021-08-17 9:13 ` [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Köry Maincent
2021-08-19 21:26 ` Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Kory Maincent @ 2021-07-09 9:49 UTC (permalink / raw)
To: buildroot
Similarly to Uboot, this patch adds the ability to copy in and build
out-of-source device tree sources during an ATF build.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
boot/arm-trusted-firmware/Config.in | 9 +++++++++
boot/arm-trusted-firmware/arm-trusted-firmware.mk | 5 +++++
2 files changed, 14 insertions(+)
diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 80f6161597..7bd289137b 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -68,6 +68,15 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
help
Target plaform to build for.
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH
+ string "Device Tree Source file paths"
+ help
+ Space-separated list of paths to device tree source files
+ that will be copied to fdts/ before starting the build.
+
+ To use this device tree source file, the ATF configuration
+ file must refer to it.
+
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
bool "Build FIP image"
help
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 9fc8b51a80..e902c1aca9 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -166,7 +166,12 @@ endif
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS))
+ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH))
+
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
+ $(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH),
+ cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/
+ )
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option
2021-07-09 9:49 [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Kory Maincent
2021-07-09 9:49 ` [Buildroot] [PATCH 2/2] boot/arm-trusted-firmware: Add out-of-source ATF device tree support Kory Maincent
@ 2021-08-17 9:13 ` Köry Maincent
2021-08-19 21:26 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Köry Maincent @ 2021-08-17 9:13 UTC (permalink / raw)
To: buildroot; +Cc: thomas.petazzoni
Hello,
I am just following up with these two patches, to make sure you did not forget
or miss it. Thanks.
Regards,
On Fri, 9 Jul 2021 11:49:24 +0200
Kory Maincent <kory.maincent@bootlin.com> wrote:
> Update the FIP image generation by adding the BL33_CFG parameter.
> This is needed for the ST version of ATF.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> boot/arm-trusted-firmware/Config.in | 9 +++++++++
> boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/boot/arm-trusted-firmware/Config.in
> b/boot/arm-trusted-firmware/Config.in index 7e46a10270..80f6161597 100644
> --- a/boot/arm-trusted-firmware/Config.in
> +++ b/boot/arm-trusted-firmware/Config.in
> @@ -133,6 +133,15 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
> Name of the U-Boot BL33 image to include in ATF, it must
> have been installed to BINARIES_DIR by the U-Boot package.
>
> +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG
> + string "U-Boot BL33 image devicetree name"
> + default ""
> + help
> + Name of the U-Boot BL33 image devicetree to include in ATF.
> + It must have been installed to BINARIES_DIR by the U-Boot
> + package.
> + Needed for the stm32mp1 platform.
> +
> endif
>
> config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index
> 1f08f5dabb..9fc8b51a80 100644 ---
> a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++
> b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -92,6 +92,10 @@ endif
> ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
> ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call
> qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE))
> ARM_TRUSTED_FIRMWARE_MAKE_OPTS +=
> BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN)
> +ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG = $(call
> qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG)) +ifneq
> ($(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG),) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS +=
> BL33_CFG=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG) +endif
> ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot endif
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option
2021-07-09 9:49 [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Kory Maincent
2021-07-09 9:49 ` [Buildroot] [PATCH 2/2] boot/arm-trusted-firmware: Add out-of-source ATF device tree support Kory Maincent
2021-08-17 9:13 ` [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Köry Maincent
@ 2021-08-19 21:26 ` Thomas Petazzoni
2021-08-31 8:51 ` Köry Maincent
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2021-08-19 21:26 UTC (permalink / raw)
To: Kory Maincent; +Cc: buildroot
Hello Köry,
On Fri, 9 Jul 2021 11:49:24 +0200
Kory Maincent <kory.maincent@bootlin.com> wrote:
> Update the FIP image generation by adding the BL33_CFG parameter.
> This is needed for the ST version of ATF.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> boot/arm-trusted-firmware/Config.in | 9 +++++++++
> boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
> index 7e46a10270..80f6161597 100644
> --- a/boot/arm-trusted-firmware/Config.in
> +++ b/boot/arm-trusted-firmware/Config.in
> @@ -133,6 +133,15 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
> Name of the U-Boot BL33 image to include in ATF, it must
> have been installed to BINARIES_DIR by the U-Boot package.
>
> +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG
> + string "U-Boot BL33 image devicetree name"
> + default ""
> + help
> + Name of the U-Boot BL33 image devicetree to include in ATF.
> + It must have been installed to BINARIES_DIR by the U-Boot
> + package.
> + Needed for the stm32mp1 platform.
> +
> endif
>
> config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> index 1f08f5dabb..9fc8b51a80 100644
> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> @@ -92,6 +92,10 @@ endif
> ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
> ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE))
> ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN)
> +ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE_CFG))
> +ifneq ($(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG),)
> +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33_CFG=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN_CFG)
> +endif
What I don't like about this is that (for now) this BL33_CFG variable
is specific to the ST fork of TF-A. If we start adding support for all
the random variables that vendor-specific forks create, it's soon going
to be a nightmare.
Instead of this, could you try to add something like:
BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL33_CFG=$(BINARIES_DIR)/your-dtb.dtb"
and see if that works ?
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option
2021-08-19 21:26 ` Thomas Petazzoni
@ 2021-08-31 8:51 ` Köry Maincent
0 siblings, 0 replies; 6+ messages in thread
From: Köry Maincent @ 2021-08-31 8:51 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: buildroot
Hello Thomas,
On Thu, 19 Aug 2021 23:26:30 +0200
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> What I don't like about this is that (for now) this BL33_CFG variable
> is specific to the ST fork of TF-A. If we start adding support for all
> the random variables that vendor-specific forks create, it's soon going
> to be a nightmare.
Ok, that's fair.
>
> Instead of this, could you try to add something like:
>
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL33_CFG=$(BINARIES_DIR)/your-dtb.dtb"
>
> and see if that works ?
It works. Thanks.
Regards,
Köry
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-31 8:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-09 9:49 [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Kory Maincent
2021-07-09 9:49 ` [Buildroot] [PATCH 2/2] boot/arm-trusted-firmware: Add out-of-source ATF device tree support Kory Maincent
2021-08-19 21:27 ` Thomas Petazzoni
2021-08-17 9:13 ` [Buildroot] [PATCH 1/2] boot/arm-trusted-firmware: Update FIP image generation with BL33_CFG option Köry Maincent
2021-08-19 21:26 ` Thomas Petazzoni
2021-08-31 8:51 ` Köry Maincent
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.