From 1fd6a88bc865de101fed1d2f5e03a0345f2766c0 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Fri, 19 Aug 2022 11:54:36 -0700
Subject: dt-processor.sh: Ignore TOPDIR in the CONFIG_DTFILE

sstate-cache re-use is affected by the value of CONFIG_DTFILE as used by the
device-tree recipe.  If we are setting CONFIG_DTFILE, be sure to exclude
TOPDIR from the hash calculations to avoid unnecessary rebuilds.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
(cherry picked from commit c6f917c289be96ca030a275e0c4d92384ca5bb16)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-core/meta/files/dt-processor.sh        | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'meta-xilinx-standalone-experimental')

diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
index e91e9d34..fab16393 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -168,6 +168,8 @@ cortex_a53_linux() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 MACHINE = "${machine}-generic"
 # We don't want the kernel to build us a device-tree
 KERNEL_DEVICETREE:${machine}-generic = ""
@@ -249,6 +251,8 @@ EOF
   fi
   cat <<EOF >>"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
@@ -305,6 +309,8 @@ cortex_a53_freertos() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
@@ -388,6 +394,8 @@ cortex_a72_linux() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 MACHINE = "${machine}-generic"
 # We don't want the kernel to build us a device-tree
 KERNEL_DEVICETREE:${machine}-generic = ""
@@ -440,6 +448,8 @@ cortex_a72_baremetal() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
@@ -496,6 +506,8 @@ cortex_a72_freertos() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
@@ -581,6 +593,8 @@ EOF
   fi
   cat <<EOF >>"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5"
 
@@ -637,6 +651,8 @@ cortex_r5_freertos() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5"
 
@@ -705,6 +721,8 @@ pmu-microblaze() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "microblaze-pmu"
 
 require conf/microblaze.conf
@@ -761,6 +779,8 @@ pmc-microblaze() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "microblaze-plm"
 
 require conf/microblaze.conf
@@ -817,6 +837,8 @@ psm-microblaze() {
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
+
 ESW_MACHINE = "microblaze-psm"
 
 require conf/microblaze.conf
-- 
cgit v1.2.3-54-g00ecf