From e3c8525089adf5ca2f7f0ebfc7b4267bdac63dba Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Fri, 28 Mar 2025 20:04:14 +0200 Subject: [PATCH] configs/ls1046a-frwy: bump BSP tag to lf-6.12.3-1.0.0 The latest Linux Factory tag is lf-6.12.3-1.0.0 (Q1 2025), update to that. The LS1046A-FRWY board is currently supported by NXP through a BSP called LDLSDK. That isn't what we use, so update the documentation to reflect that for awareness, and provide a link. Signed-off-by: Vladimir Oltean 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 | 28 +++++++++++++------ configs/ls1046a-frwy_defconfig | 8 +++--- 5 files changed, 26 insertions(+), 16 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 344a6299d8..41c7ad4068 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 f03dad74e5c3df8059554def03e9298b6fbd4ffdd3e940a18b7e84a60b12a37a atf-lf-6.6.52-2.2.0.tar.gz +sha256 2751fcd3eb9080c34531f68ca2e1f571a60f4220853df53a5ebed9835abf8c13 atf-lf-6.12.3-1.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 fa38fb1f75..43dbe074c2 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 5665b927616a7e27e69f3f8fface6dd693b01f35d42ae4f9a0f0a10be3621487 linux-lf-6.6.52-2.2.0.tar.gz +sha256 9e2fff1014f1b196be8149c63a6054e40b1b36b222e53db3f445c96c856066e0 linux-lf-6.12.3-1.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 a1e3b69376..5e36d93487 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 00fc7bd053de19d02c990b3aa214a27c6103f4306e756f3f6d4afb12314556e4 u-boot-lf-6.6.52-2.2.0.tar.gz +sha256 8708fc95844d020f79b87f954f29073ae9b230de3e41117e7fb379294da946ac u-boot-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index fb1c82067c..8c83a4eac9 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -4,20 +4,30 @@ NXP LS1046A-FRWY This file documents the Buildroot support for the LS1046A Freeway Board. -for more details about the board and the QorIQ Layerscape SoC, see the following pages: +For more details about the board and the QorIQ Layerscape SoC, see the following pages: - https://www.nxp.com/design/software/qoriq-developer-resources/ls1046a-freeway-board:FRWY-LS1046A - https://www.nxp.com/FRWY-LS1046A - https://www.nxp.com/docs/en/quick-reference-guide/FRWY-LS1046AGSG.pdf -for the software NXP LSDK (Layerscape Software Development Kit), see - - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf +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. -the components from NXP are: - - rcw, lf-6.6.52-2.2.0 - - atf (fork), lf-6.6.52-2.2.0 - - uboot (fork), lf-6.6.52-2.2.0 - - qoriq-fm-ucode (blob), lf-6.6.52-2.2.0 - - linux (fork), lf-6.6.52-2.2.0 +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 Build ===== diff --git a/configs/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index cc3333c684..0e6f1cd941 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/freescale/ls1046a-frwy/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y @@ -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.6.52-2.2.0)/linux-lf-6.6.52-2.2.0.tar.gz" +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_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.6.52-2.2.0)/atf-lf-6.6.52-2.2.0.tar.gz" +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_PLATFORM="ls1046afrwy" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,7 +38,7 @@ 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.6.52-2.2.0)/u-boot-lf-6.6.52-2.2.0.tar.gz" +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_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y