summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-standalone-experimental/recipes-core
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2022-08-19 11:54:36 -0700
committerMark Hatle <mark.hatle@amd.com>2022-08-19 17:41:06 -0500
commit1fd6a88bc865de101fed1d2f5e03a0345f2766c0 (patch)
tree04d599feb774b102a7ad940e144fae485afd5552 /meta-xilinx-standalone-experimental/recipes-core
parent961180221f197e15eb8118f4788b0f82e3a24dea (diff)
downloadmeta-xilinx-1fd6a88bc865de101fed1d2f5e03a0345f2766c0.tar.gz
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>
Diffstat (limited to 'meta-xilinx-standalone-experimental/recipes-core')
-rwxr-xr-xmeta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh22
1 files changed, 22 insertions, 0 deletions
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() {
168 168
169 cat <<EOF >"${conf_file}" 169 cat <<EOF >"${conf_file}"
170CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 170CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
171CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
172
171MACHINE = "${machine}-generic" 173MACHINE = "${machine}-generic"
172# We don't want the kernel to build us a device-tree 174# We don't want the kernel to build us a device-tree
173KERNEL_DEVICETREE:${machine}-generic = "" 175KERNEL_DEVICETREE:${machine}-generic = ""
@@ -249,6 +251,8 @@ EOF
249 fi 251 fi
250 cat <<EOF >>"${conf_file}" 252 cat <<EOF >>"${conf_file}"
251CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 253CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
254CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
255
252ESW_MACHINE = "cortexa53-${machine}" 256ESW_MACHINE = "cortexa53-${machine}"
253DEFAULTTUNE = "cortexa53" 257DEFAULTTUNE = "cortexa53"
254 258
@@ -305,6 +309,8 @@ cortex_a53_freertos() {
305 309
306 cat <<EOF >"${conf_file}" 310 cat <<EOF >"${conf_file}"
307CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 311CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
312CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
313
308ESW_MACHINE = "cortexa53-${machine}" 314ESW_MACHINE = "cortexa53-${machine}"
309DEFAULTTUNE = "cortexa53" 315DEFAULTTUNE = "cortexa53"
310 316
@@ -388,6 +394,8 @@ cortex_a72_linux() {
388 394
389 cat <<EOF >"${conf_file}" 395 cat <<EOF >"${conf_file}"
390CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 396CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
397CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
398
391MACHINE = "${machine}-generic" 399MACHINE = "${machine}-generic"
392# We don't want the kernel to build us a device-tree 400# We don't want the kernel to build us a device-tree
393KERNEL_DEVICETREE:${machine}-generic = "" 401KERNEL_DEVICETREE:${machine}-generic = ""
@@ -440,6 +448,8 @@ cortex_a72_baremetal() {
440 448
441 cat <<EOF >"${conf_file}" 449 cat <<EOF >"${conf_file}"
442CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 450CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
451CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
452
443ESW_MACHINE = "cortexa72-${machine}" 453ESW_MACHINE = "cortexa72-${machine}"
444DEFAULTTUNE = "cortexa72" 454DEFAULTTUNE = "cortexa72"
445 455
@@ -496,6 +506,8 @@ cortex_a72_freertos() {
496 506
497 cat <<EOF >"${conf_file}" 507 cat <<EOF >"${conf_file}"
498CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 508CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
509CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
510
499ESW_MACHINE = "cortexa72-${machine}" 511ESW_MACHINE = "cortexa72-${machine}"
500DEFAULTTUNE = "cortexa72" 512DEFAULTTUNE = "cortexa72"
501 513
@@ -581,6 +593,8 @@ EOF
581 fi 593 fi
582 cat <<EOF >>"${conf_file}" 594 cat <<EOF >>"${conf_file}"
583CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 595CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
596CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
597
584ESW_MACHINE = "cortexr5-${machine}" 598ESW_MACHINE = "cortexr5-${machine}"
585DEFAULTTUNE = "cortexr5" 599DEFAULTTUNE = "cortexr5"
586 600
@@ -637,6 +651,8 @@ cortex_r5_freertos() {
637 651
638 cat <<EOF >"${conf_file}" 652 cat <<EOF >"${conf_file}"
639CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 653CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
654CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
655
640ESW_MACHINE = "cortexr5-${machine}" 656ESW_MACHINE = "cortexr5-${machine}"
641DEFAULTTUNE = "cortexr5" 657DEFAULTTUNE = "cortexr5"
642 658
@@ -705,6 +721,8 @@ pmu-microblaze() {
705 721
706 cat <<EOF >"${conf_file}" 722 cat <<EOF >"${conf_file}"
707CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 723CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
724CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
725
708ESW_MACHINE = "microblaze-pmu" 726ESW_MACHINE = "microblaze-pmu"
709 727
710require conf/microblaze.conf 728require conf/microblaze.conf
@@ -761,6 +779,8 @@ pmc-microblaze() {
761 779
762 cat <<EOF >"${conf_file}" 780 cat <<EOF >"${conf_file}"
763CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 781CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
782CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
783
764ESW_MACHINE = "microblaze-plm" 784ESW_MACHINE = "microblaze-plm"
765 785
766require conf/microblaze.conf 786require conf/microblaze.conf
@@ -817,6 +837,8 @@ psm-microblaze() {
817 837
818 cat <<EOF >"${conf_file}" 838 cat <<EOF >"${conf_file}"
819CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" 839CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
840CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
841
820ESW_MACHINE = "microblaze-psm" 842ESW_MACHINE = "microblaze-psm"
821 843
822require conf/microblaze.conf 844require conf/microblaze.conf