* [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9
@ 2024-07-13 21:52 Dario Binacchi
2024-07-13 21:52 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: add hashes Dario Binacchi
2024-07-14 15:08 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Thomas Petazzoni via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Dario Binacchi @ 2024-07-13 21:52 UTC (permalink / raw)
To: buildroot
Cc: Dario Binacchi, Marleen Vos, Bartosz Bilas, Thomas Petazzoni,
Raphael Gallais-Pou, linux-amarula
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(-)
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
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: add hashes
2024-07-13 21:52 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Dario Binacchi
@ 2024-07-13 21:52 ` Dario Binacchi
2024-07-14 15:08 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Dario Binacchi @ 2024-07-13 21:52 UTC (permalink / raw)
To: buildroot
Cc: Dario Binacchi, Marleen Vos, Bartosz Bilas, Thomas Petazzoni,
Raphael Gallais-Pou, linux-amarula
Now that the configurations of boards stm32mp157a-dk1 and stm32mp157c-dk2
have the same software versions, it is possible to share the hash files as
well.
The patch uses the hash files for Arm Trusted Firmware, Linux, Linux
headers and U-Boot of stm32mp175a_dk1 also for stm32mp175c_dk2, and then
enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the
defconfig from .checkpackageignore.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
.checkpackageignore | 1 -
.../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 0
| 0
.../stm32mp157}/patches/linux/linux.hash | 0
.../stm32mp157}/patches/uboot/uboot.hash | 0
configs/stm32mp157a_dk1_defconfig | 2 +-
configs/stm32mp157c_dk2_defconfig | 2 ++
7 files changed, 3 insertions(+), 2 deletions(-)
rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/arm-trusted-firmware/arm-trusted-firmware.hash (100%)
rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/linux-headers/linux-headers.hash (100%)
rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/linux/linux.hash (100%)
rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/uboot/uboot.hash (100%)
diff --git a/.checkpackageignore b/.checkpackageignore
index db28680f40e8..da5fa2685ae6 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -278,7 +278,6 @@ configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash
configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash
configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash
configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash
-configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash
configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash
configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash
configs/toradex_apalis_imx6_defconfig lib_defconfig.ForceCheckHash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index cf42b29a7c0b..310e179cf782 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -6,7 +6,7 @@ BR2_cortex_a7=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
# System configuration
-BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157a-dk1/patches"
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index c923d2cd60bb..2a9c31df37c2 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -6,6 +6,8 @@ BR2_cortex_a7=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
# System configuration
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9
2024-07-13 21:52 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Dario Binacchi
2024-07-13 21:52 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: add hashes Dario Binacchi
@ 2024-07-14 15:08 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-14 15:08 UTC (permalink / raw)
To: Dario Binacchi
Cc: linux-amarula, Bartosz Bilas, Raphael Gallais-Pou, Marleen Vos,
buildroot
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
--
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-14 15:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-13 21:52 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Dario Binacchi
2024-07-13 21:52 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: add hashes Dario Binacchi
2024-07-14 15:08 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 Thomas Petazzoni via buildroot
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.