From 4ad582298c7cef72fd72c73575971f461fe50624 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Mon, 11 Aug 2025 19:55:29 +0300 Subject: [PATCH] configs/ls1046a-frwy: bump BSP tag to lf-6.12.20-2.0.0 Update the kernel, U-Boot, ATF tags, as well as documentation, used by the LS1046A-FRWY to the latest Linux Factory release. Signed-off-by: Vladimir Oltean [Julien: add missing BR2_TARGET_UBOOT_NEEDS_GNUTLS=y] Signed-off-by: Julien Olivain --- .../arm-trusted-firmware.hash | 2 +- .../ls1046a-frwy/patches/linux/linux.hash | 2 +- .../ls1046a-frwy/patches/uboot/uboot.hash | 2 +- board/freescale/ls1046a-frwy/readme.txt | 23 ++++++++++--------- configs/ls1046a-frwy_defconfig | 7 +++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 41c7ad4068..c05084df76 100644 --- a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2751fcd3eb9080c34531f68ca2e1f571a60f4220853df53a5ebed9835abf8c13 atf-lf-6.12.3-1.0.0.tar.gz +sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/board/freescale/ls1046a-frwy/patches/linux/linux.hash index 43dbe074c2..3aea05469c 100644 --- a/board/freescale/ls1046a-frwy/patches/linux/linux.hash +++ b/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9e2fff1014f1b196be8149c63a6054e40b1b36b222e53db3f445c96c856066e0 linux-lf-6.12.3-1.0.0.tar.gz +sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash index 5e36d93487..1072686160 100644 --- a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash +++ b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8708fc95844d020f79b87f954f29073ae9b230de3e41117e7fb379294da946ac u-boot-lf-6.12.3-1.0.0.tar.gz +sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index 8c83a4eac9..79a2ecdecf 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -11,23 +11,24 @@ For more details about the board and the QorIQ Layerscape SoC, see the following Layerscape platforms are officially supported by NXP under the Layerscape Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project -common with i.MX), currently tag lf-6.6.36-2.1.0, two releases behind the -latest lf-6.12.3-1.0.0. In Buildroot, the latest Linux Factory release tag -is used, which may be considered pre-release software, as it may contain -features which are not yet documented, and it generally undergoes less testing. +common with i.MX), but has a slower release cadence than LF. The currently used +tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +Buildroot, the latest Linux Factory release tag is always used, which may be +considered pre-release software, as it may contain features which are not yet +documented, and it generally undergoes less testing. For the software Layerscape Debian Linux SDK User Guide, see: - https://docs.nxp.com/bundle/UG10143/page/topics/about_this_document.html - https://www.nxp.com/docs/en/user-guide/UG10143.pdf The components from NXP are: - - rcw, lf-6.12.3-1.0.0 - - atf (fork), lf-6.12.3-1.0.0 - - uboot (fork), lf-6.12.3-1.0.0 - - qoriq-fm-ucode (blob), lf-6.12.3-1.0.0 - - linux (fork), lf-6.12.3-1.0.0 - - fmlib, lf-6.12.3-1.0.0 - - fmc, lf-6.12.3-1.0.0 + - rcw, lf-6.12.20-2.0.0 + - atf (fork), lf-6.12.20-2.0.0 + - uboot (fork), lf-6.12.20-2.0.0 + - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 + - linux (fork), lf-6.12.20-2.0.0 + - fmlib, lf-6.12.20-2.0.0 + - fmc, lf-6.12.20-2.0.0 Build ===== diff --git a/configs/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index 0e6f1cd941..f12b27b817 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.3-1.0.0)/linux-lf-6.12.3-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.3-1.0.0)/atf-lf-6.12.3-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,9 +38,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.3-1.0.0)/u-boot-lf-6.12.3-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_QORIQ_RCW=y BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1046afrwy/NN_NNQNNPNP_3040_0506/rcw_1600_sdboot.bin"