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