From 6e934fbbcbec8f66f45f6f3498dcdb67e95eb8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Csaba=20Szil=C3=A1gyi?= Date: Wed, 30 Jul 2025 07:45:48 +0000 Subject: [PATCH] arm/hafnium: Select valid platform for hafnium and properly pass to make MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'qemu_aarch64' is not a valid hafnium platform. Supported platforms are: * 'secure_rd_v3' * 'secure_rd_v3_cfg1' * 'secure_aem_v8a_fvp_vhe' * 'aem_v8a_fvp_vhe' * 'aem_v8a_fvp_vhe_ffa_v1_1' * 'qemu_aarch64_vhe' * 'secure_qemu_aarch64' * 'rpi4' * 'secure_tc' Previusly selected 'qemu_aarch64' did not cause error because it was NOT passed to make. It had no effect. Within this commit, platform 'secure_qemu_aarch64' is selected and passed to make. Signed-off-by: Csaba Szilágyi Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb index 9b84fa14..693e81f2 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -27,7 +27,7 @@ HAFNIUM_PROJECT ?= "reference" # Platform must be set for each machine HAFNIUM_PLATFORM ?= "invalid" -HAFNIUM_PLATFORM:qemuarm64 = "qemu_aarch64" +HAFNIUM_PLATFORM:qemuarm64 = "secure_qemu_aarch64" # do_deploy will install everything listed in this variable. It is set by # default to hafnium @@ -38,6 +38,8 @@ EXTRA_OEMAKE += "PROJECT=${HAFNIUM_PROJECT}" EXTRA_OEMAKE += "OUT_DIR=${B}" +EXTRA_OEMAKE += "PLATFORM=${HAFNIUM_PLATFORM}" + # Don't use prebuilt binaries for gn and ninja EXTRA_OEMAKE += "GN=${STAGING_BINDIR_NATIVE}/gn NINJA=${STAGING_BINDIR_NATIVE}/ninja"