From 20bdea31fd72571eea76271a1c7c6b2e72816a2d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 3 Feb 2025 15:11:12 -0700 Subject: meta-xilinx-core: arm-trusted-firmware: Move to new TFA_CONSOLE gen-machine-conf is moving to using TFA_CONSOLE to match the newer TFA recipe implementations. Adjust the older arm-trusted-firmware to match while retaining compatibility with prior ATF_CONSOLE if required. Signed-off-by: Mark Hatle --- .../arm-trusted-firmware/arm-trusted-firmware.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 485d3b17..fec6a994 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -50,15 +50,16 @@ ATF_CONSOLE_DEFAULT:zynqmp = "cadence" ATF_CONSOLE_DEFAULT:versal = "pl011" ATF_CONSOLE_DEFAULT:versal-net = "pl011" ATF_CONSOLE ?= "${ATF_CONSOLE_DEFAULT}" +TFA_CONSOLE ?= "${ATF_CONSOLE}" DEBUG_ATF_DEFAULT = "" DEBUG_ATF_DEFAULT:versal = "1" DEBUG_ATF_DEFAULT:versal-net = "1" DEBUG_ATF ?= "${DEBUG_ATF_DEFAULT}" -EXTRA_OEMAKE:append:zynqmp = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}" -EXTRA_OEMAKE:append:versal = "${@' VERSAL_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}" -EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}" +EXTRA_OEMAKE:append:zynqmp = "${@' ZYNQMP_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}" +EXTRA_OEMAKE:append:versal = "${@' VERSAL_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}" +EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_CONSOLE=${TFA_CONSOLE}' if d.getVar('TFA_CONSOLE', True) != '' else ''}" EXTRA_OEMAKE:append = " ${@bb.utils.contains('DEBUG_ATF', '1', ' DEBUG=${DEBUG_ATF}', '', d)}" OUTPUT_DIR = "${@bb.utils.contains('DEBUG_ATF', '1', '${B}/${PLATFORM}/debug', '${B}/${PLATFORM}/release', d)}" @@ -129,16 +130,16 @@ INSANE_SKIP:${PN}:append:versal-net = " buildpaths" python() { soc_family = d.getVar('SOC_FAMILY') - atf_console = d.getVar('ATF_CONSOLE') + atf_console = d.getVar('TFA_CONSOLE') # See plat/xilinx//platform.mk if soc_family and soc_family == "zynqmp": if not atf_console in [ 'cadence', 'cadence0', 'cadence1', 'dcc' ]: - raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for ZynqMP, only cadence, cadence0, cadence1, and dcc are valid options.' % (atf_console)) + raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for ZynqMP, only cadence, cadence0, cadence1, and dcc are valid options.' % (atf_console)) elif soc_family and soc_family == "versal": if not atf_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]: - raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for Versal, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console)) + raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for Versal, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console)) elif soc_family and soc_family == "versal-net": if not atf_console in [ 'pl011', 'pl011_0', 'pl011_1', 'dcc' ]: - raise bb.parse.SkipRecipe('ATF_CONSOLE (%s) is not configured properly for Versal-Net, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console)) + raise bb.parse.SkipRecipe('TFA_CONSOLE (%s) is not configured properly for Versal-Net, only pl011, pl011_0, pl011_1, and dcc are valid options.' % (atf_console)) } -- cgit v1.2.3-54-g00ecf