From 893ff255e01cc99116873ecbf9a8c2859e5b7b62 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 26 Jul 2023 12:48:03 +0300 Subject: imx-atf: Update 6.1.1-1.0.0 to 6.1.22-2.0.0 Update to the 2.8 version aligned with NXP BSP release L6.1.22-2.0.0. Relevant changes: - 99195a23d MA-21286 imx8m: habv4: support dram dynamic mapping - 57e74c226 MA-21277 imx93: fix boot failure on opteed - 8c5bfc946 MA-21257 imx93: enable trusty support - 5ce0b6827 MA-21254 remove static declaration for rank_setting_update() - 8ab375a81 LF-9014 imx8ulp: pd: Fix EPDC update issue - 70db244d4 MA-21229 android: imx8mq: fix build break - 4dfe57384 MA-21228 trusty: sync spmd ffa handler function - a78eb7c37 LF-8090 imx93: TRDC: Fix wrong fuse bits for USB1 and eQOS disable - d25473f6f LF-8893 feat(imx8ulp): add some delay before cmc1 access - 64de3dc30 LF-8890 feat(imx8ulp): update the upower pmic_cfg setting - 856a80e65 LF-8838 feat(imx93): skip system level power config when m33 active - cf678144d LF-8817 feat(imx93): update the swffc/retention flow for i.mx93 - 36de99cac LF-8614 fix(imx8m): disable auto self refresh before swffc - f27b39ecd LF-8453 imx8ulp: Update XRDC for ELE to access DDR with CA35 DID - e1577f8d7 LF-8648 feat(imx93): add get ddr fsp info for imx93 - b8bfb4b4b LF-8459-02: fix(imx): add the missing copyright - 57eff4fb6 LF-8459-01 refine(imx8ulp): remove the unused header file Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-atf/imx-atf_2.6.bb | 80 -------------------------------------- recipes-bsp/imx-atf/imx-atf_2.8.bb | 80 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 recipes-bsp/imx-atf/imx-atf_2.6.bb create mode 100644 recipes-bsp/imx-atf/imx-atf_2.8.bb diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb deleted file mode 100644 index 40b13fff..00000000 --- a/recipes-bsp/imx-atf/imx-atf_2.6.bb +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2017-2022 NXP - -DESCRIPTION = "i.MX ARM Trusted Firmware" -SECTION = "BSP" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf_v2.6" -SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75" - -S = "${WORKDIR}/git" - -inherit deploy - -ATF_PLATFORM ??= "INVALID" - -# FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART -# base address in source code. -ATF_BOOT_UART_BASE ?= "" - -EXTRA_OEMAKE += " \ - CROSS_COMPILE=${TARGET_PREFIX} \ - PLAT=${ATF_PLATFORM} \ -" - -# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -# Baremetal, just need a compiler -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/${HOST_PREFIX}gcc" - -# Bring in clang compiler if using clang as default -DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}" - -BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" - -# CC and LD introduce arguments which conflict with those otherwise provided by -# this recipe. The heads of these variables excluding those arguments -# are therefore used instead. -def remove_options_tail (in_string): - from itertools import takewhile - return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' '))) - -EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"' - -EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' - -# Set the UART to use during the boot. -EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}' - -do_configure[noexec] = "1" - -do_compile() { - # Clear LDFLAGS to avoid the option -Wl recognize issue - oe_runmake bl31 - if ${BUILD_OPTEE}; then - oe_runmake clean BUILD_BASE=build-optee - oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 - fi -} - -do_install[noexec] = "1" - -addtask deploy after do_compile -do_deploy() { - install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin - if ${BUILD_OPTEE}; then - install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee - fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)" diff --git a/recipes-bsp/imx-atf/imx-atf_2.8.bb b/recipes-bsp/imx-atf/imx-atf_2.8.bb new file mode 100644 index 00000000..b6acd13d --- /dev/null +++ b/recipes-bsp/imx-atf/imx-atf_2.8.bb @@ -0,0 +1,80 @@ +# Copyright (C) 2017-2023 NXP + +DESCRIPTION = "i.MX ARM Trusted Firmware" +SECTION = "BSP" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf_v2.8" +SRCREV = "99195a23d3aef485fb8f10939583b1bdef18881c" + +S = "${WORKDIR}/git" + +inherit deploy + +ATF_PLATFORM ??= "INVALID" + +# FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART +# base address in source code. +ATF_BOOT_UART_BASE ?= "" + +EXTRA_OEMAKE += " \ + CROSS_COMPILE=${TARGET_PREFIX} \ + PLAT=${ATF_PLATFORM} \ +" + +# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + +# Baremetal, just need a compiler +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "virtual/${HOST_PREFIX}gcc" + +# Bring in clang compiler if using clang as default +DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}" + +BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" + +# CC and LD introduce arguments which conflict with those otherwise provided by +# this recipe. The heads of these variables excluding those arguments +# are therefore used instead. +def remove_options_tail (in_string): + from itertools import takewhile + return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' '))) + +EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"' + +EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' + +# Set the UART to use during the boot. +EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}' + +do_configure[noexec] = "1" + +do_compile() { + # Clear LDFLAGS to avoid the option -Wl recognize issue + oe_runmake bl31 + if ${BUILD_OPTEE}; then + oe_runmake clean BUILD_BASE=build-optee + oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 + fi +} + +do_install[noexec] = "1" + +addtask deploy after do_compile +do_deploy() { + install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin + if ${BUILD_OPTEE}; then + install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee + fi +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)" -- cgit v1.2.3-54-g00ecf