[Buildroot] [PATCH 0/7] Updates for boards based on stm32mp157, related to arm-trusted-firmware

[Buildroot] [PATCH 0/7] Updates for boards based on stm32mp157, related to arm-trusted-firmware

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

This series of patches is intended to update the boards based on
stm32mp157, in order to use FIP instead of stm32 to boot. This allows
more recent versions of arm-trusted-firmware to be used instead of being
stuck on v2.5

Notes:
1) When testing arm-trusted-firmware lts-2.8.13 on avenger96, the boot
   is halted with a panic:

		NOTICE:  CPU: STM32MP157AAC Rev.B
		NOTICE:  Model: Arrow Electronics STM32MP157A Avenger96 board
		ERROR:   nvmem node board_id not found
		ERROR:   Product_below_2v5=1:
		ERROR:          HSLVEN update is destructive,
		ERROR:          no update as VDD > 2.7V
		PANIC at PC : 0x2ffee76b

   Therefor, the avenger96 board has only been updated to
   arm-trusted-firmware v2.6

2) Testing arm-trusted-firmware v2.10 on stm32mp157a-dk1 results in a
   boot that hangs as follows:

		NOTICE:  CPU: STM32MP157DAC Rev.Z                                                                           
		NOTICE:  Model: STMicroelectronics STM32MP157A-DK1 Discovery Board                                          
		NOTICE:  Board: MB1272 Var3.0 Rev.C-03                                                                      
		NOTICE:  BL2: v2.10.0   (release):v2.10
		NOTICE:  BL2: Built : 14:24:58, Dec 18 2023
		NOTICE:  BL2: Booting BL32
		NOTICE:  SP_MIN: v2.10.0        (release):v2.10
		NOTICE:  SP_MIN: Built : 14:24:58, Dec 18 2023

   For stm32mp157c-dk2, a similar hang:

		NOTICE:  CPU: STM32MP157FAC Rev.Z                                                                           
		NOTICE:  Model: STMicroelectronics STM32MP157C-DK2 Discovery Board                                          
		NOTICE:  Board: MB1272 Var4.0 Rev.C-02                                                                      
		NOTICE:  BL2: v2.10.0   (release):v2.10
		NOTICE:  BL2: Built : 15:02:33, Dec 18 2023
		NOTICE:  BL2: Booting BL32
		NOTICE:  SP_MIN: v2.10.0        (release):v2.10
		NOTICE:  SP_MIN: Built : 15:02:33, Dec 18 2023

   No boards currently use the 'latest' version of arm-trusted-firmware,
   so it has no impact to bump the latest version from v2.7 to v2.10

Marleen Vos (7):
  DEVELOPERS: added marleen.vos@mind.be for boards/configs based on
    stm32mp15
  board/stmicroelectronics: generalise
    BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex
  configs/stm32mp157*: bump ATF to v2.6
  boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13
  configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to
    lts-v2.8.13
  configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to
    lts-v2.8.13
  boot/arm-trusted-firmware: bump latest version to v2.10

 DEVELOPERS                                    |  6 ++
 .../common/stm32mp157/genimage.cfg.template   |  4 +-
 .../common/stm32mp157/post-image.sh           |  2 +-
 boot/arm-trusted-firmware/Config.in           | 10 ++-
 .../arm-trusted-firmware.hash                 |  3 +-
 ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++
 configs/avenger96_defconfig                   | 28 +++++--
 configs/stm32mp157a_dk1_defconfig             | 15 ++--
 configs/stm32mp157c_dk2_defconfig             | 15 ++--
 9 files changed, 139 insertions(+), 21 deletions(-)
 create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch

-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/7] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

The buildroot manual says this kind of commit should be done together
with the actual changes made to a config/board. But since a number of
changes will follow for some boards and configs, it seemed more
logical to make a separate commit for this.

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 DEVELOPERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/DEVELOPERS b/DEVELOPERS
index 311dcd9504..810f853c64 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2053,6 +2053,12 @@ F:	board/qemu/riscv64-virt/
 F:	configs/qemu_riscv32_virt_defconfig
 F:	configs/qemu_riscv64_virt_defconfig
 
+N:	Marleen Vos <marleen.vos@mind.be>
+F:	board/stmicroelectronics/common/stm32mp157/
+F:	configs/avenger96_defconfig
+F:	configs/stm32mp157a_dk1_defconfig
+F:	configs/stm32mp157c_dk2_defconfig
+
 N:	Martin Bark <martin@barkynet.com>
 F:	board/raspberrypi/
 F:	configs/raspberrypi3_defconfig
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/7] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:02 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> The buildroot manual says this kind of commit should be done together
> with the actual changes made to a config/board. But since a number of
> changes will follow for some boards and configs, it seemed more
> logical to make a separate commit for this.
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  DEVELOPERS | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/7] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

The regex was a bit too strict in which characters it allowed. Thus,
if e.g. a file name appears in the
BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no
longer matches, and we end up with an empty ATF_VARIABLES. This makes
the subsequent grep fail, and the post-image.sh script fails without
any error message (thanks to the -e option).

Simplify the regex to match everything except the closing quotation
mark. Note that Kconfig doesn't allow quotation marks at all inside a
string (even escaped ones), so this regular expression is always OK.

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp157/post-image.sh
index 65809e46a4..0cf52f4564 100755
--- a/board/stmicroelectronics/common/stm32mp157/post-image.sh
+++ b/board/stmicroelectronics/common/stm32mp157/post-image.sh
@@ -8,7 +8,7 @@
 #
 atf_image()
 {
-	ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})"
+	ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([^\"]*\)"$/\1/p' ${BR2_CONFIG})"
 	# make sure DTB_FILE_NAME is set
 	printf '%s\n' "${ATF_VARIABLES}" | grep -Eq 'DTB_FILE_NAME=[0-9A-Za-z_\-]*'
 	# extract the value
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/7] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:03 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> The regex was a bit too strict in which characters it allowed. Thus,
> if e.g. a file name appears in the
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no
> longer matches, and we end up with an empty ATF_VARIABLES. This makes
> the subsequent grep fail, and the post-image.sh script fails without
> any error message (thanks to the -e option).
> 
> Simplify the regex to match everything except the closing quotation
> mark. Note that Kconfig doesn't allow quotation marks at all inside a
> string (even escaped ones), so this regular expression is always OK.
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/7] configs/stm32mp157*: bump ATF to v2.6

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

- v2.6 changes to FIP instead of SSBL boot.
- This requires switching to u-boot.bin in U-Boot, and using that
  instead of .stm32 in ATF.
- fiptool expects dtb to be split off from u-boot.bin, so need custom
  u-boot-nodtb.bin in addition to u-boot.dtb.
  Caveat: this is perhaps not really obligatory, but the ATF
          documentation explains it like that.
- The partition must be named fip (while it must be named ssbl for
  SSBL boot).
- Since the partition name is set in the common template, all
  defconfigs using that template must be bumped in a single commit
- ATF now produces both fip.bin and <boardname>.stm32, so fip.bin has
  been added to the configs
- While we're at it, add the structuring comments to
  avenger96_defconfig similar like the other defconfigs

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 .../common/stm32mp157/genimage.cfg.template   |  4 +--
 configs/avenger96_defconfig                   | 28 +++++++++++++++----
 configs/stm32mp157a_dk1_defconfig             | 14 +++++++---
 configs/stm32mp157c_dk2_defconfig             | 14 +++++++---
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template
index ff4aeceeed..c2affd98ea 100644
--- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template
+++ b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template
@@ -11,8 +11,8 @@ image sdcard.img {
 		image = "%ATFBIN%"
 	}
 
-	partition ssbl {
-		image = "u-boot.stm32"
+	partition fip {
+		image = "fip.bin"
 		size = 2M
 	}
 
diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
index 142f6dd8c9..536899583c 100644
--- a/configs/avenger96_defconfig
+++ b/configs/avenger96_defconfig
@@ -1,9 +1,16 @@
+# Architecture
 BR2_arm=y
 BR2_cortex_a7=y
+
+# Linux headers same as kernel, a 5.8 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y
+
+# System configuration
 BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches"
 BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
+
+# Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13"
@@ -12,16 +19,24 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
+
+# Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -29,7 +44,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_STM32=y
-BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96"
+
+# Additional tools
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index e764a1558d..3122c9647a 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_STM32=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1"
 
 # Additional tools
diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index aa0fcfa843..7472be38bb 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_STM32=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2"
 
 # Additional tools
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/7] configs/stm32mp157*: bump ATF to v2.6

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:04 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> - v2.6 changes to FIP instead of SSBL boot.
> - This requires switching to u-boot.bin in U-Boot, and using that
>   instead of .stm32 in ATF.
> - fiptool expects dtb to be split off from u-boot.bin, so need custom
>   u-boot-nodtb.bin in addition to u-boot.dtb.
>   Caveat: this is perhaps not really obligatory, but the ATF
>           documentation explains it like that.
> - The partition must be named fip (while it must be named ssbl for
>   SSBL boot).
> - Since the partition name is set in the common template, all
>   defconfigs using that template must be bumped in a single commit
> - ATF now produces both fip.bin and <boardname>.stm32, so fip.bin has
>   been added to the configs
> - While we're at it, add the structuring comments to
>   avenger96_defconfig similar like the other defconfigs
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  .../common/stm32mp157/genimage.cfg.template   |  4 +--
>  configs/avenger96_defconfig                   | 28 +++++++++++++++----
>  configs/stm32mp157a_dk1_defconfig             | 14 +++++++---
>  configs/stm32mp157c_dk2_defconfig             | 14 +++++++---
>  4 files changed, 45 insertions(+), 15 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as
found in v2.8 patch dir has already been applied in lts-v2.8.13
Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has
been included as 0001-build-tools-avoid-unnecessary-link.patch for
lts-v2.8.13

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 boot/arm-trusted-firmware/Config.in           |  6 ++
 .../arm-trusted-firmware.hash                 |  1 +
 ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index a5ac987172..7ebe616365 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -16,6 +16,11 @@ choice
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	bool "v2.7"
 
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION
+	bool "latest lts-v2.8.x"
+	help
+	  Select the latest LTS v2.8.x version available
+
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION
 	bool "Custom version"
 	help
@@ -42,6 +47,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
+	default "lts-v2.8.13"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION
 	default "v2.7"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash
index d931610dc4..ed16fc1c0f 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256  327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e  arm-trusted-firmware-v2.7.tar.gz
+sha256  e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274  trusted-firmware-a-lts-v2.8.13.tar.gz
 sha256  130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9  docs/license.rst
diff --git a/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch
new file mode 100644
index 0000000000..9e0ea74248
--- /dev/null
+++ b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch
@@ -0,0 +1,77 @@
+From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@arm.com>
+Date: Tue, 4 Jul 2023 16:14:02 +0200
+Subject: [PATCH] build(tools): avoid unnecessary link
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In their respective makefiles, cert_create, encrypt_fw and fiptool
+depend on the --openssl phony target as a prerequisite. This forces
+those tools to be re-linked each time.
+
+Move the dependencies on the --openssl target from the tools to their
+makefiles all targets, to avoid unnecessary linking while preserving the
+OpenSSL version printing done in the --openssl targets when in debug.
+
+Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility")
+Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
+Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d
+Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab
+---
+ tools/cert_create/Makefile | 4 ++--
+ tools/encrypt_fw/Makefile  | 4 ++--
+ tools/fiptool/Makefile     | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile
+index 042e844626..b911d19d2b 100644
+--- a/tools/cert_create/Makefile
++++ b/tools/cert_create/Makefile
+@@ -85,9 +85,9 @@ HOSTCC ?= gcc
+ 
+ .PHONY: all clean realclean --openssl
+ 
+-all: ${BINARY}
++all: --openssl ${BINARY}
+ 
+-${BINARY}: --openssl ${OBJECTS} Makefile
++${BINARY}: ${OBJECTS} Makefile
+ 	@echo "  HOSTLD  $@"
+ 	@echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \
+                 const char platform_msg[] = "${PLAT_MSG}";' | \
+diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile
+index 2939b142be..924e5febab 100644
+--- a/tools/encrypt_fw/Makefile
++++ b/tools/encrypt_fw/Makefile
+@@ -65,9 +65,9 @@ HOSTCC ?= gcc
+ 
+ .PHONY: all clean realclean --openssl
+ 
+-all: ${BINARY}
++all: --openssl ${BINARY}
+ 
+-${BINARY}: --openssl ${OBJECTS} Makefile
++${BINARY}: ${OBJECTS} Makefile
+ 	@echo "  HOSTLD  $@"
+ 	@echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \
+                 ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o
+diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile
+index 2ebee33931..4bdebd9235 100644
+--- a/tools/fiptool/Makefile
++++ b/tools/fiptool/Makefile
+@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS))
+ 
+ .PHONY: all clean distclean --openssl
+ 
+-all: ${PROJECT}
++all: --openssl ${PROJECT}
+ 
+-${PROJECT}: --openssl ${OBJECTS} Makefile
++${PROJECT}: ${OBJECTS} Makefile
+ 	@echo "  HOSTLD  $@"
+ 	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
+ 	@${ECHO_BLANK_LINE}
+-- 
+2.25.1
+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Thomas Petazzoni via buildroot]

Hello Marleen,

On Tue, 19 Dec 2023 13:15:05 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as
> found in v2.8 patch dir has already been applied in lts-v2.8.13
> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has
> been included as 0001-build-tools-avoid-unnecessary-link.patch for
> lts-v2.8.13
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  boot/arm-trusted-firmware/Config.in           |  6 ++
>  .../arm-trusted-firmware.hash                 |  1 +
>  ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++
>  3 files changed, 84 insertions(+)
>  create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch

Thanks a lot for this patch. However, I don't think we want to add
explicit choice options for all "random" versions of TF-A. Instead, if
you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you
should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you
need to apply on top of it.

Due to this, I will mark your patches 4, 5 and 6 in this series as
Changes Requested. If you have the chance to do this update and send a
new iteration, it would be nice!

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Arnout Vandecappelle via buildroot]

On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote:
> Hello Marleen,
> 
> On Tue, 19 Dec 2023 13:15:05 +0100
> Marleen Vos via buildroot <buildroot@buildroot.org> wrote:
> 
>> From: Marleen Vos <marleen.vos@mind.be>
>>
>> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as
>> found in v2.8 patch dir has already been applied in lts-v2.8.13
>> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has
>> been included as 0001-build-tools-avoid-unnecessary-link.patch for
>> lts-v2.8.13
>>
>> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
>> ---
>>   boot/arm-trusted-firmware/Config.in           |  6 ++
>>   .../arm-trusted-firmware.hash                 |  1 +
>>   ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++
>>   3 files changed, 84 insertions(+)
>>   create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch
> 
> Thanks a lot for this patch. However, I don't think we want to add
> explicit choice options for all "random" versions of TF-A.

  This is the current situation however:

$ ls -R boot/arm-trusted-firmware/
boot/arm-trusted-firmware/:
Config.in  arm-trusted-firmware.hash  arm-trusted-firmware.mk  v2.2/  v2.3/ 
v2.4/  v2.5/  v2.6/  v2.7/  v2.8/  v2.9/

boot/arm-trusted-firmware/v2.2:
0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch

boot/arm-trusted-firmware/v2.3:
0001-feat-build-add-support-for-new-binutils-versions.patch

boot/arm-trusted-firmware/v2.4:
0001-feat-build-add-support-for-new-binutils-versions.patch

boot/arm-trusted-firmware/v2.5:
0001-feat-build-add-support-for-new-binutils-versions.patch

boot/arm-trusted-firmware/v2.6:
0001-feat-build-add-support-for-new-binutils-versions.patch

boot/arm-trusted-firmware/v2.7:
0001-feat-build-add-support-for-new-binutils-versions.patch

boot/arm-trusted-firmware/v2.8:
0001-feat-build-add-support-for-new-binutils-versions.patch 
0002-build-tools-avoid-unnecessary-link.patch

boot/arm-trusted-firmware/v2.9:
0001-build-tools-avoid-unnecessary-link.patch



  Regards,
  Arnout


> Instead, if
> you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you
> should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
> to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you
> need to apply on top of it.
> 
> Due to this, I will mark your patches 4, 5 and 6 in this series as
> Changes Requested. If you have the chance to do this update and send a
> new iteration, it would be nice!
> 
> Best regards,
> 
> Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Thomas Petazzoni via buildroot]

On Tue, 6 Feb 2024 14:38:31 +0100
Arnout Vandecappelle <arnout@mind.be> wrote:

> > Thanks a lot for this patch. However, I don't think we want to add
> > explicit choice options for all "random" versions of TF-A.  
> 
>   This is the current situation however:

Yes, but there is no explicit choice options for all those versions.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Arnout Vandecappelle via buildroot]

On 06/02/2024 14:38, Arnout Vandecappelle wrote:
>
>
> On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote:
>> Hello Marleen,
>>
>> On Tue, 19 Dec 2023 13:15:05 +0100
>> Marleen Vos via buildroot <buildroot@buildroot.org> wrote:
>>
>>> From: Marleen Vos <marleen.vos@mind.be>
>>>
>>> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as
>>> found in v2.8 patch dir has already been applied in lts-v2.8.13
>>> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has
>>> been included as 0001-build-tools-avoid-unnecessary-link.patch for
>>> lts-v2.8.13
>>>
>>> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
>>> ---
>>>   boot/arm-trusted-firmware/Config.in           |  6 ++
>>>   .../arm-trusted-firmware.hash                 |  1 +
>>>   ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++
>>>   3 files changed, 84 insertions(+)
>>>   create mode 100644 
>>> boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch
>>
>> Thanks a lot for this patch. However, I don't think we want to add
>> explicit choice options for all "random" versions of TF-A.
>
>  This is the current situation however:


  Sorry, I misread your comment.


  The idea is not to create version options for all "random" versions of TF-A. 
Instead, the idea is to have 3 options: latest, lts, and custom.

  The idea is also that board configs should be able to use the lts version, 
since the assumption is that lts is not going to break things. I've taken a look 
at the TF-A LTS branch and the commits in there look relatively safe. From a 
user perspective, I think it makes sense that you can update Buildroot and get 
an automatic update of TF-A on the lts branch as well (which is not possible if 
you specify a custom version). I.e. from a practical point of view, I think this 
lts version is the one that people should use. It should probably even be the 
default...

  We could also have removed the "latest" option entirely. Perhaps we should, 
really, I don't have a really good use case for it. Maybe for "hobby" users who 
want bleeding edge when they follow Buildroot master.

  So that's the background for adding the LTS option, and using it in the 
defconfig. That leaves the question why it is called 
BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION instead of 
BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_VERSION. The reason behind that is 
that when we move to a new LTS, we want this to be explicit, with legacy 
handling and everything - you really _don't_ want a silent update from 2.8 to 
2.12 (or whatever) when you update Buildroot. So by giving a different name to 
the config symbol when the LTS branch is updated, we can make sure that there is 
legacy handling and things break loudly instead of silently.


  Is this sufficient explanation?


  Regards,
  Arnout


>
>> Instead, if
>> you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you
>> should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
>> to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you
>> need to apply on top of it.
>>
>> Due to this, I will mark your patches 4, 5 and 6 in this series as
>> Changes Requested. If you have the chance to do this update and send a
>> new iteration, it would be nice!
>>
>> Best regards,
>>
>> Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13

[Thomas Petazzoni via buildroot]

Hello Marleen,

On Tue, 19 Dec 2023 13:15:05 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as
> found in v2.8 patch dir has already been applied in lts-v2.8.13
> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has
> been included as 0001-build-tools-avoid-unnecessary-link.patch for
> lts-v2.8.13
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>

Thanks for the good arguments from Arnout, we got convinced and applied
your patch to master, with a few changes, see below.

> +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION

                                                     ^^^ we dropped the "v" from here

>  sha256  327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e  arm-trusted-firmware-v2.7.tar.gz
> +sha256  e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274  trusted-firmware-a-lts-v2.8.13.tar.gz

We were surprised by the files having different base names here. Turns
out the hash of trusted-firmware-a-lts-v2.8.13.tar.gz was in fact never
checked, which is why you didn't release that
trusted-firmware-a-lts-v2.8.13.tar.gz was an incorrect file name. So we
added a preliminary commit to make sure that this hash will be checked,
and fixed the file name.

See:

  https://gitlab.com/buildroot.org/buildroot/-/commit/c6ab9328e13c6c9a1538b4a33824525a990b623d
  https://gitlab.com/buildroot.org/buildroot/-/commit/2a310666e06c9c5edd6879d32295c63b7851c817

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 5/7] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

The assumption is that updates to the stable branch should not break anything,
so we use the latest LTS rather than a specific version.

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 configs/stm32mp157a_dk1_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index 3122c9647a..170034f0e6 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 5/7] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:06 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> The assumption is that updates to the stable branch should not break anything,
> so we use the latest LTS rather than a specific version.
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  configs/stm32mp157a_dk1_defconfig | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied to master after adjusting the changes in the defconfig file to
the changes we made to the option name, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 6/7] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

The assumption is that updates to the stable branch should not break anything,
so we use the latest LTS rather than a specific version.

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 configs/stm32mp157c_dk2_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index 7472be38bb..8ef6c82f2e 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 6/7] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:07 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> The assumption is that updates to the stable branch should not break anything,
> so we use the latest LTS rather than a specific version.
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  configs/stm32mp157c_dk2_defconfig | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied to master after adjusting the changes in the defconfig file to
the changes we made to the option name, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 7/7] boot/arm-trusted-firmware: bump latest version to v2.10

[Marleen Vos via buildroot]

From: Marleen Vos <marleen.vos@mind.be>

Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to
v2.9 is already in v2.10, so no new patch dir for v2.10 is added

Signed-off-by: Marleen Vos <marleen.vos@mind.be>
---
 boot/arm-trusted-firmware/Config.in                 | 4 ++--
 boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 7ebe616365..025cb0f2d6 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -14,7 +14,7 @@ choice
 	  Select the specific ATF version you want to use
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
-	bool "v2.7"
+	bool "v2.10"
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION
 	bool "latest lts-v2.8.x"
@@ -48,7 +48,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
 	default "lts-v2.8.13"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION
-	default "v2.7"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v2.10"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash
index ed16fc1c0f..eafd8e69c4 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e  arm-trusted-firmware-v2.7.tar.gz
 sha256  e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274  trusted-firmware-a-lts-v2.8.13.tar.gz
+sha256  2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c  arm-trusted-firmware-v2.10.tar.gz
 sha256  130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9  docs/license.rst
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 7/7] boot/arm-trusted-firmware: bump latest version to v2.10

[Thomas Petazzoni via buildroot]

On Tue, 19 Dec 2023 13:15:08 +0100
Marleen Vos via buildroot <buildroot@buildroot.org> wrote:

> From: Marleen Vos <marleen.vos@mind.be>
> 
> Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to
> v2.9 is already in v2.10, so no new patch dir for v2.10 is added
> 
> Signed-off-by: Marleen Vos <marleen.vos@mind.be>
> ---
>  boot/arm-trusted-firmware/Config.in                 | 4 ++--
>  boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot