[1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9

Message ID 20240713215218.2665512-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9
Related show

Commit Message

Dario Binacchi July 13, 2024, 9:52 p.m. UTC
The patch, following the suggestion expressed in [1], aligns the
software versions of stm32mp157a_dk1 to stm32mp157c_dk2. Indeed, the two
boards have many more similarities than differences.

[1] https://patchwork.ozlabs.org/project/buildroot/patch/20240713130847.4097389-1-dario.binacchi@amarulasolutions.com
Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../arm-trusted-firmware/arm-trusted-firmware.hash       | 2 +-
 .../stm32mp157a-dk1/patches/linux/linux.hash             | 2 +-
 configs/stm32mp157a_dk1_defconfig                        | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

Comments

'Jan Kiszka' via Amarula Linux July 14, 2024, 3:08 p.m. UTC | #1
On Sat, 13 Jul 2024 23:52:17 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> The patch, following the suggestion expressed in [1], aligns the
> software versions of stm32mp157a_dk1 to stm32mp157c_dk2. Indeed, the two
> boards have many more similarities than differences.
> 
> [1] https://patchwork.ozlabs.org/project/buildroot/patch/20240713130847.4097389-1-dario.binacchi@amarulasolutions.com
> Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  .../arm-trusted-firmware/arm-trusted-firmware.hash       | 2 +-
>  .../stm32mp157a-dk1/patches/linux/linux.hash             | 2 +-
>  configs/stm32mp157a_dk1_defconfig                        | 9 +++++----
>  3 files changed, 7 insertions(+), 6 deletions(-)

Patches applied, thanks!

Thomas

Patch

diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash
index 97c4500711fd..8b69a5a96453 100644
--- a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -1,2 +1,2 @@ 
 # Locally calculated
-sha256  068325043b7c8ecc47ebb8b4f241f01e86d3f69dc49a63f340aa94bd41a9e6df  arm-trusted-firmware/arm-trusted-firmware-lts-v2.8.16.tar.gz
+sha256  06d32acf42808b682859008292f0591d2d872f19aa1a8021bfcd1c1c626285e6  arm-trusted-firmware-v2.9.tar.gz
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash
index f4b1146f83b6..95bd23c8d022 100644
--- a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash
+++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash
@@ -1,2 +1,2 @@ 
 # Locally calculated
-sha256  2783d42112095f95c510e1b421f056df8cbfa845f9040c6115080434a77a776b  linux-6.6.39.tar.xz
+sha256  f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281  linux-6.9.8.tar.xz
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index 31c52a7723a2..cf42b29a7c0b 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -2,8 +2,8 @@ 
 BR2_arm=y
 BR2_cortex_a7=y
 
-# Linux headers same as kernel, a 6.6 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+# Linux headers same as kernel, a 6.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
 
 # System configuration
 BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157a-dk1/patches"
@@ -14,7 +14,7 @@  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-im
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8"
 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
@@ -29,7 +29,8 @@  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y