diff mbox series

[v5,2/2] configs/stm32mp157*_dk*: bump TF-A to 2.10, Linux to 6.11.6 and U-Boot to 2024.10

Message ID 20241106094346.3694622-2-dario.binacchi@amarulasolutions.com
State New
Headers show
Series [v5,1/2] boot/arm-trusted-firmware: v2.11: fix building ST elf file | expand

Commit Message

Dario Binacchi Nov. 6, 2024, 9:43 a.m. UTC 
The patch bumps Arm Trusted Firmware (TF-A) to version 2.10 LTS the Linux
kernel to version 6.11.6 and U-Boot to version 2024.10.

Tested on STM32MP157C-DK2 Discovery Board.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

Changes v4 -> v5:
- bump TF-A to 2.10 LTS
- bump Linux to 6.11.6

No changes since v3

Changes v2 -> v3:
 - Update TF-A hash file.

Changes v1 -> v2:
 - Bump TF-A.
 
 .../arm-trusted-firmware/arm-trusted-firmware.hash     |  2 --
 .../common/stm32mp1xx/patches/linux/linux.hash         |  2 +-
 .../common/stm32mp1xx/patches/uboot/uboot.hash         |  2 +-
 configs/stm32mp157a_dk1_defconfig                      |  9 ++++-----
 configs/stm32mp157c_dk2_defconfig                      | 10 +++++-----
 5 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash

Comments

Romain Naour Dec. 11, 2024, 4:41 p.m. UTC | #1 
Hello Dario, All,

Le 06/11/2024 à 10:43, Dario Binacchi a écrit :
> The patch bumps Arm Trusted Firmware (TF-A) to version 2.10 LTS the Linux
> kernel to version 6.11.6 and U-Boot to version 2024.10.

The patch 1/2 of this series backported a fix for ATF v2.11 for the ST platforms
but here ATF v2.10 LTS is used.

Why only AFT v2.11 is affected by the PIE option?

Best regards,
Romain


> 
> Tested on STM32MP157C-DK2 Discovery Board.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> 
> Changes v4 -> v5:
> - bump TF-A to 2.10 LTS
> - bump Linux to 6.11.6
> 
> No changes since v3
> 
> Changes v2 -> v3:
>  - Update TF-A hash file.
> 
> Changes v1 -> v2:
>  - Bump TF-A.
>  
>  .../arm-trusted-firmware/arm-trusted-firmware.hash     |  2 --
>  .../common/stm32mp1xx/patches/linux/linux.hash         |  2 +-
>  .../common/stm32mp1xx/patches/uboot/uboot.hash         |  2 +-
>  configs/stm32mp157a_dk1_defconfig                      |  9 ++++-----
>  configs/stm32mp157c_dk2_defconfig                      | 10 +++++-----
>  5 files changed, 11 insertions(+), 14 deletions(-)
>  delete mode 100644 board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> 
> diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> deleted file mode 100644
> index 2bc5030cf2ff..000000000000
> --- a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# Locally calculated
> -sha256  72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8  arm-trusted-firmware-v2.9-git4.tar.gz
> diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> index 95bd23c8d022..42d02c9f7836 100644
> --- a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> @@ -1,2 +1,2 @@
>  # Locally calculated
> -sha256  f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281  linux-6.9.8.tar.xz
> +sha256  c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce  linux-6.11.6.tar.xz
> diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> index fe9b4f53dc63..904fa56c02a3 100644
> --- a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> @@ -1,2 +1,2 @@
>  # Locally calculated
> -sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
> +sha256  b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0  u-boot-2024.10.tar.bz2
> diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
> index c1ecbd22c198..7c813bf21be7 100644
> --- a/configs/stm32mp157a_dk1_defconfig
> +++ b/configs/stm32mp157a_dk1_defconfig
> @@ -1,13 +1,13 @@
>  BR2_arm=y
>  BR2_cortex_a7=y
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
>  BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
>  BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>  BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
>  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
>  BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> @@ -18,8 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
>  # BR2_TARGET_ROOTFS_TAR is not set
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> @@ -31,7 +30,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
>  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
>  BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
> index c35d75853f06..5241acd711f4 100644
> --- a/configs/stm32mp157c_dk2_defconfig
> +++ b/configs/stm32mp157c_dk2_defconfig
> @@ -1,13 +1,13 @@
>  BR2_arm=y
>  BR2_cortex_a7=y
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
>  BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
>  BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>  BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
>  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
>  BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> @@ -18,8 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
>  # BR2_TARGET_ROOTFS_TAR is not set
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> @@ -31,10 +30,11 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
>  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
>  BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
>  # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>  BR2_TARGET_UBOOT_FORMAT_DTB=y
>  BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
Dario Binacchi Dec. 12, 2024, 7:56 a.m. UTC | #2 
Hello Romain,

On Wed, Dec 11, 2024 at 5:41 PM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Dario, All,
>
> Le 06/11/2024 à 10:43, Dario Binacchi a écrit :
> > The patch bumps Arm Trusted Firmware (TF-A) to version 2.10 LTS the Linux
> > kernel to version 6.11.6 and U-Boot to version 2024.10.
>
> The patch 1/2 of this series backported a fix for ATF v2.11 for the ST platforms
> but here ATF v2.10 LTS is used.

In version v4, Arnout suggested using the LTS version for ATF, so I
switched from 2.11 to
LTS 2.10:

https://patchwork.ozlabs.org/project/buildroot/patch/20241031093311.636608-2-dario.binacchi@amarulasolutions.com/

The patch for version 2.11 of TFA is no longer required for this
series, but I didn't drop it
since it still fixes a regression in TFA for building the ST platform,
which was resolved only
starting from version 2.12:

6d26d75c374bc ("fix(st): set no-pie option when building ST elf file")

Thanks and regards,
Dario

>
> Why only AFT v2.11 is affected by the PIE option?
>
> Best regards,
> Romain
>
>
> >
> > Tested on STM32MP157C-DK2 Discovery Board.
> >
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > ---
> >
> > Changes v4 -> v5:
> > - bump TF-A to 2.10 LTS
> > - bump Linux to 6.11.6
> >
> > No changes since v3
> >
> > Changes v2 -> v3:
> >  - Update TF-A hash file.
> >
> > Changes v1 -> v2:
> >  - Bump TF-A.
> >
> >  .../arm-trusted-firmware/arm-trusted-firmware.hash     |  2 --
> >  .../common/stm32mp1xx/patches/linux/linux.hash         |  2 +-
> >  .../common/stm32mp1xx/patches/uboot/uboot.hash         |  2 +-
> >  configs/stm32mp157a_dk1_defconfig                      |  9 ++++-----
> >  configs/stm32mp157c_dk2_defconfig                      | 10 +++++-----
> >  5 files changed, 11 insertions(+), 14 deletions(-)
> >  delete mode 100644 board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> >
> > diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> > deleted file mode 100644
> > index 2bc5030cf2ff..000000000000
> > --- a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -# Locally calculated
> > -sha256  72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8  arm-trusted-firmware-v2.9-git4.tar.gz
> > diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> > index 95bd23c8d022..42d02c9f7836 100644
> > --- a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> > +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
> > @@ -1,2 +1,2 @@
> >  # Locally calculated
> > -sha256  f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281  linux-6.9.8.tar.xz
> > +sha256  c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce  linux-6.11.6.tar.xz
> > diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> > index fe9b4f53dc63..904fa56c02a3 100644
> > --- a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> > +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
> > @@ -1,2 +1,2 @@
> >  # Locally calculated
> > -sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
> > +sha256  b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0  u-boot-2024.10.tar.bz2
> > diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
> > index c1ecbd22c198..7c813bf21be7 100644
> > --- a/configs/stm32mp157a_dk1_defconfig
> > +++ b/configs/stm32mp157a_dk1_defconfig
> > @@ -1,13 +1,13 @@
> >  BR2_arm=y
> >  BR2_cortex_a7=y
> > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
> > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
> >  BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
> >  BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> >  BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/"
> >  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
> >  BR2_LINUX_KERNEL=y
> >  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
> >  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
> >  BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config"
> >  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> > @@ -18,8 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
> >  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> >  # BR2_TARGET_ROOTFS_TAR is not set
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> > @@ -31,7 +30,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
> >  BR2_TARGET_UBOOT=y
> >  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> >  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
> > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
> >  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
> >  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> >  BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> > diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
> > index c35d75853f06..5241acd711f4 100644
> > --- a/configs/stm32mp157c_dk2_defconfig
> > +++ b/configs/stm32mp157c_dk2_defconfig
> > @@ -1,13 +1,13 @@
> >  BR2_arm=y
> >  BR2_cortex_a7=y
> > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
> > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
> >  BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
> >  BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> >  BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
> >  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
> >  BR2_LINUX_KERNEL=y
> >  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
> >  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
> >  BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
> >  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> > @@ -18,8 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
> >  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> >  # BR2_TARGET_ROOTFS_TAR is not set
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
> >  BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> > @@ -31,10 +30,11 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
> >  BR2_TARGET_UBOOT=y
> >  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> >  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
> > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
> >  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
> >  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> >  BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> > +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
> >  # BR2_TARGET_UBOOT_FORMAT_BIN is not set
> >  BR2_TARGET_UBOOT_FORMAT_DTB=y
> >  BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
>
diff mbox series

Patch

diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
deleted file mode 100644
index 2bc5030cf2ff..000000000000
--- a/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
+++ /dev/null
@@ -1,2 +0,0 @@ 
-# Locally calculated
-sha256  72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8  arm-trusted-firmware-v2.9-git4.tar.gz
diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
index 95bd23c8d022..42d02c9f7836 100644
--- a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
+++ b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash
@@ -1,2 +1,2 @@ 
 # Locally calculated
-sha256  f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281  linux-6.9.8.tar.xz
+sha256  c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce  linux-6.11.6.tar.xz
diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
index fe9b4f53dc63..904fa56c02a3 100644
--- a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
+++ b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash
@@ -1,2 +1,2 @@ 
 # Locally calculated
-sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
+sha256  b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0  u-boot-2024.10.tar.bz2
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index c1ecbd22c198..7c813bf21be7 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -1,13 +1,13 @@ 
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
 BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -18,8 +18,7 @@  BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@@ -31,7 +30,7 @@  BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index c35d75853f06..5241acd711f4 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -1,13 +1,13 @@ 
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
 BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -18,8 +18,7 @@  BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@@ -31,10 +30,11 @@  BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_DTB=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y