| Message ID | 20241031093311.636608-2-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On 31/10/2024 10:33, Dario Binacchi wrote: > The patch bumps Arm Trusted Firmware (TF-A) to version 2.11 the Linux It was my intention to use as much as possible BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_X_VERSION in defconfigs, with the idea that we get LTS updates automatically when that version is updated. This was reverted in commit d40b0c9403346ba63dfbd22a518ce50fcd22d34d for stm32mp157c_dk2 and then later by you for stm32mp157a_dk1. We never really discussed if it was a good idea to use this LATEST_LTS_X_VERSION symbol in defconfigs to begin with - but I saw the fact that Thomas merged the patch that introduced it as agreement :-) That said, even if we stick to an explicit version for defconfigs, I do think it's better to choose one which is LTS upstream - so 2.10, not 2.11. > kernel to version 6.9.12 and U-Boot to version 2024.10. For the kernel, I also think we should stick to longterm versions - so we never should have updated to 6.9. I think updating to the last release of an EOL branch now is pretty pointless for sure... At this point, I think the only reasonable thing we can do is bump to 6.11.6. Regards, Arnout > > Tested on STM32MP157C-DK2 Discovery Board. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > > No changes since v3 > > Changes v2 -> v3: > - Update TF-A hash file. > > Changes v1 -> v2: > - Bump TF-A. > > .../patches/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 | 6 +++--- > configs/stm32mp157c_dk2_defconfig | 7 ++++--- > 5 files changed, 10 insertions(+), 9 deletions(-) > > 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 > index 2bc5030cf2ff..8b77e1f1653a 100644 > --- 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 > @@ -1,2 +1,2 @@ > # Locally calculated > -sha256 72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8 arm-trusted-firmware-v2.9-git4.tar.gz > +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-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..8cde9f620b0d 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 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 linux-6.9.12.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..1a851946b022 100644 > --- a/configs/stm32mp157a_dk1_defconfig > +++ b/configs/stm32mp157a_dk1_defconfig > @@ -7,7 +7,7 @@ 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.9.12" > 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 > @@ -19,7 +19,7 @@ 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_CUSTOM_VERSION_VALUE="v2.11" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > @@ -31,7 +31,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..89555244049f 100644 > --- a/configs/stm32mp157c_dk2_defconfig > +++ b/configs/stm32mp157c_dk2_defconfig > @@ -7,7 +7,7 @@ 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.9.12" > 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 > @@ -19,7 +19,7 @@ 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_CUSTOM_VERSION_VALUE="v2.11" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > @@ -31,10 +31,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 To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
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 index 2bc5030cf2ff..8b77e1f1653a 100644 --- 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 @@ -1,2 +1,2 @@ # Locally calculated -sha256 72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8 arm-trusted-firmware-v2.9-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-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..8cde9f620b0d 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 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 linux-6.9.12.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..1a851946b022 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -7,7 +7,7 @@ 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.9.12" 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 @@ -19,7 +19,7 @@ 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_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -31,7 +31,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..89555244049f 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -7,7 +7,7 @@ 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.9.12" 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 @@ -19,7 +19,7 @@ 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_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -31,10 +31,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
The patch bumps Arm Trusted Firmware (TF-A) to version 2.11 the Linux kernel to version 6.9.12 and U-Boot to version 2024.10. Tested on STM32MP157C-DK2 Discovery Board. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- No changes since v3 Changes v2 -> v3: - Update TF-A hash file. Changes v1 -> v2: - Bump TF-A. .../patches/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 | 6 +++--- configs/stm32mp157c_dk2_defconfig | 7 ++++--- 5 files changed, 10 insertions(+), 9 deletions(-)