From 82ef0cce84ee3025316d057967ebdddd2ceed3eb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 4 Jan 2022 15:35:53 +0000 Subject: [PATCH] arm/hafnium: add missing headers to native-dtc.patch Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../hafnium/hafnium/native-dtc.patch | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch b/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch index 8cdb0601..840c0bc9 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch +++ b/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch @@ -1,14 +1,16 @@ +Use our dtc tools instead of the prebuilt (x86-64-only) binaries. + +Upstream-Status: Pending [part of a larger effort to remove prebuilt] +Signed-off-by: Ross Burton + diff --git a/build/image/dtc.py b/build/image/dtc.py -index d0778186..a5d831be 100755 +index d077818..1513120 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" +@@ -16,4 +16,2 @@ import sys +-HF_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) +-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,