1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-06 04:42:16 +00:00

arm/hafnium: use our gn/ninja/dtc

Instead of relying on the prebuilt GN/Ninja/dtc binaries that come with
Hafnium via the hafnium-prebuilts repository, use the recipes that we
build.

We still need to use the prebuilt compilers, but that is being worked
on upstream.

Change-Id: Ife4172d74f7877eaee3c4c414d7afda61332f220
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2021-10-04 20:56:11 +01:00
committed by Jon Mason
parent b277050bc9
commit 3d935719c8
2 changed files with 21 additions and 3 deletions

View File

@@ -0,0 +1,14 @@
diff --git a/build/image/dtc.py b/build/image/dtc.py
index d0778186..a5d831be 100755
--- a/build/image/dtc.py
+++ b/build/image/dtc.py
@@ -18,6 +18,9 @@ DTC_ROOT = os.path.join(HF_ROOT, "prebuilts", "linux-x64", "dtc")
DTC = os.path.join(DTC_ROOT, "dtc")
FDTOVERLAY = os.path.join(DTC_ROOT, "fdtoverlay")
+DTC = "dtc"
+FDTOVERLAY = "fdtoverlay"
+
def cmd_compile(args):
exec_args = [
DTC,

View File

@@ -1,5 +1,7 @@
SUMMARY = "Hafnium"
DESCRIPTION = "A reference Secure Partition Manager (SPM) for systems that implement the Armv8.4-A Secure-EL2 extension"
DEPENDS = "gn-native ninja-native bison-native bc-native dtc-native openssl-native"
LICENSE = "BSD-3-Clause & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=782b40c14bad5294672c500501edc103"
@@ -9,7 +11,8 @@ inherit deploy python3native pkgconfig
SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https \
file://hashbang.patch \
file://pkg-config-native.patch"
file://pkg-config-native.patch \
file://native-dtc.patch"
SRCREV = "3a149eb219467c0d9336467ea1fb9d3fb65da94b"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
@@ -26,13 +29,14 @@ HAFNIUM_PLATFORM ?= "invalid"
# default to hafnium
HAFNIUM_INSTALL_TARGET ?= "hafnium"
DEPENDS = "bison-native bc-native openssl-native"
# set project to build
EXTRA_OEMAKE += "PROJECT=${HAFNIUM_PROJECT}"
EXTRA_OEMAKE += "OUT_DIR=${B}"
# Don't use prebuilt binaries for gn and ninja
EXTRA_OEMAKE += "GN=${STAGING_BINDIR_NATIVE}/gn NINJA=${STAGING_BINDIR_NATIVE}/ninja"
do_configure[cleandirs] += "${B}"
do_compile() {