summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-standalone-experimental/recipes-core
diff options
context:
space:
mode:
authorAppana Durga Kedareswara rao <appana.durga.rao@xilinx.com>2022-07-07 19:33:08 +0530
committerMark Hatle <mark.hatle@amd.com>2022-07-07 11:49:58 -0700
commit8da4c07f50f20bee632fc1e547932f258b8af7a1 (patch)
treeb788b53d9400e07a2e27f007a4fd3bc388c14ee4 /meta-xilinx-standalone-experimental/recipes-core
parentd3921e21982367cda7995b1a2b9dca17f5613333 (diff)
downloadmeta-xilinx-8da4c07f50f20bee632fc1e547932f258b8af7a1.tar.gz
meta-xilinx-standalone-experimental: recipes-core: meta: files: dt-processor.sh: Remove permissive flag while processing domain yaml files
Earlier in the lopper, domain yaml support is there only with the permissive flag, With the latest lopper source code passing this flag is optional, When we have this flag in the lopper command and if the output format is dts in that case it will include invalid phandle references also(As this option is designed to maintain all phandle references) in the final dts resulting compilation errors, so to avoid above mentioned issue remove the permissive flag from the domain handling. Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com> (cherry picked from commit 40a8e575737be91414bed98821d9775643b4dd90) 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.sh38
1 files changed, 19 insertions, 19 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 1323e9d0..c1f076d8 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
@@ -130,13 +130,13 @@ cortex_a53_linux() {
130 fi 130 fi
131 dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed" 131 dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
132 elif [ -n "${domain_file}" ]; then 132 elif [ -n "${domain_file}" ]; then
133 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 133 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
134 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ 134 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \
135 -i "${lops_dir}/lop-domain-linux-a53.dts" \ 135 -i "${lops_dir}/lop-domain-linux-a53.dts" \
136 -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ 136 -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
137 "${system_dtb}" "${dtb_file}" \ 137 "${system_dtb}" "${dtb_file}" \
138 || error "lopper failed" 138 || error "lopper failed"
139 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 139 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
140 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ 140 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \
141 -i "${lops_dir}/lop-domain-linux-a53.dts" \ 141 -i "${lops_dir}/lop-domain-linux-a53.dts" \
142 -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ 142 -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
@@ -201,7 +201,7 @@ cortex_a53_baremetal() {
201 ( 201 (
202 cd dtb || error "Unable to cd to dtb dir" 202 cd dtb || error "Unable to cd to dtb dir"
203 if [ -n "${domain_file}" ]; then 203 if [ -n "${domain_file}" ]; then
204 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 204 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
205 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \ 205 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \
206 || error "lopper failed" 206 || error "lopper failed"
207 else 207 else
@@ -213,7 +213,7 @@ cortex_a53_baremetal() {
213 213
214 # Build baremetal multiconfig 214 # Build baremetal multiconfig
215 if [ -n "${domain_file}" ]; then 215 if [ -n "${domain_file}" ]; then
216 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 216 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
217 -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \ 217 -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \
218 || error "lopper failed" 218 || error "lopper failed"
219 else 219 else
@@ -272,7 +272,7 @@ cortex_a53_freertos() {
272 ( 272 (
273 cd dtb || error "Unable to cd to dtb dir" 273 cd dtb || error "Unable to cd to dtb dir"
274 if [ -n "${domain_file}" ]; then 274 if [ -n "${domain_file}" ]; then
275 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 275 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
276 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \ 276 -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \
277 || error "lopper failed" 277 || error "lopper failed"
278 else 278 else
@@ -284,7 +284,7 @@ cortex_a53_freertos() {
284 284
285 # Build baremetal multiconfig 285 # Build baremetal multiconfig
286 if [ -n "${domain_file}" ]; then 286 if [ -n "${domain_file}" ]; then
287 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 287 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
288 -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" || error "lopper failed" 288 -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" || error "lopper failed"
289 else 289 else
290 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \ 290 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \
@@ -352,13 +352,13 @@ cortex_a72_linux() {
352 fi 352 fi
353 dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed" 353 dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
354 elif [ -n "${domain_file}" ]; then 354 elif [ -n "${domain_file}" ]; then
355 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 355 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
356 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \ 356 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \
357 -i "${lops_dir}/lop-domain-a72.dts" \ 357 -i "${lops_dir}/lop-domain-a72.dts" \
358 -i "${lops_dir}/lop-domain-a72-prune.dts" \ 358 -i "${lops_dir}/lop-domain-a72-prune.dts" \
359 "${system_dtb}" "${dtb_file}" \ 359 "${system_dtb}" "${dtb_file}" \
360 || error "lopper failed" 360 || error "lopper failed"
361 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 361 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
362 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \ 362 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \
363 -i "${lops_dir}/lop-domain-a72.dts" \ 363 -i "${lops_dir}/lop-domain-a72.dts" \
364 -i "${lops_dir}/lop-domain-a72-prune.dts" \ 364 -i "${lops_dir}/lop-domain-a72-prune.dts" \
@@ -407,7 +407,7 @@ cortex_a72_baremetal() {
407 ( 407 (
408 cd dtb || error "Unable to cd to dtb dir" 408 cd dtb || error "Unable to cd to dtb dir"
409 if [ -n "${domain_file}" ]; then 409 if [ -n "${domain_file}" ]; then
410 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 410 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
411 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \ 411 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \
412 || error "lopper failed" 412 || error "lopper failed"
413 else 413 else
@@ -419,7 +419,7 @@ cortex_a72_baremetal() {
419 419
420 # Build baremetal multiconfig 420 # Build baremetal multiconfig
421 if [ -n "${domain_file}" ]; then 421 if [ -n "${domain_file}" ]; then
422 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 422 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
423 -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed" 423 -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed"
424 else 424 else
425 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \ 425 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \
@@ -463,7 +463,7 @@ cortex_a72_freertos() {
463 ( 463 (
464 cd dtb || error "Unable to cd to dtb dir" 464 cd dtb || error "Unable to cd to dtb dir"
465 if [ -n "${domain_file}" ]; then 465 if [ -n "${domain_file}" ]; then
466 LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --permissive --enhanced -x '*.yaml' \ 466 LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --enhanced -x '*.yaml' \
467 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \ 467 -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \
468 || error "lopper failed" 468 || error "lopper failed"
469 else 469 else
@@ -475,7 +475,7 @@ cortex_a72_freertos() {
475 475
476 # Build baremetal multiconfig 476 # Build baremetal multiconfig
477 if [ -n "${domain_file}" ]; then 477 if [ -n "${domain_file}" ]; then
478 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 478 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
479 -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed" 479 -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed"
480 else 480 else
481 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \ 481 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \
@@ -534,7 +534,7 @@ cortex_r5_baremetal() {
534 ( 534 (
535 cd dtb || error "Unable to cd to dtb dir" 535 cd dtb || error "Unable to cd to dtb dir"
536 if [ -n "$domain_file" ]; then 536 if [ -n "$domain_file" ]; then
537 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 537 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
538 -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \ 538 -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \
539 || error "lopper failed" 539 || error "lopper failed"
540 else 540 else
@@ -546,7 +546,7 @@ cortex_r5_baremetal() {
546 546
547 # Build baremetal multiconfig 547 # Build baremetal multiconfig
548 if [ -n "${domain_file}" ]; then 548 if [ -n "${domain_file}" ]; then
549 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 549 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
550 -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed" 550 -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed"
551 else 551 else
552 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ 552 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
@@ -604,7 +604,7 @@ cortex_r5_freertos() {
604 ( 604 (
605 cd dtb || error "Unable to cd to dtb dir" 605 cd dtb || error "Unable to cd to dtb dir"
606 if [ -n "$domain_file" ]; then 606 if [ -n "$domain_file" ]; then
607 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ 607 LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
608 -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \ 608 -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \
609 || error "lopper failed" 609 || error "lopper failed"
610 else 610 else
@@ -616,7 +616,7 @@ cortex_r5_freertos() {
616 616
617 # Build baremetal multiconfig 617 # Build baremetal multiconfig
618 if [ -n "${domain_file}" ]; then 618 if [ -n "${domain_file}" ]; then
619 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 619 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
620 -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed" 620 -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed"
621 else 621 else
622 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ 622 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
@@ -684,7 +684,7 @@ pmu-microblaze() {
684 684
685 # Build baremetal multiconfig 685 # Build baremetal multiconfig
686 if [ -n "${domain_file}" ]; then 686 if [ -n "${domain_file}" ]; then
687 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 687 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
688 -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" || error "lopper failed" 688 -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" || error "lopper failed"
689 else 689 else
690 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" \ 690 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" \
@@ -740,7 +740,7 @@ pmc-microblaze() {
740 740
741 # Build baremetal multiconfig 741 # Build baremetal multiconfig
742 if [ -n "${domain_file}" ]; then 742 if [ -n "${domain_file}" ]; then
743 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 743 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
744 -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" || error "lopper failed" 744 -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" || error "lopper failed"
745 else 745 else
746 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" \ 746 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" \
@@ -796,7 +796,7 @@ psm-microblaze() {
796 796
797 # Build baremetal multiconfig 797 # Build baremetal multiconfig
798 if [ -n "${domain_file}" ]; then 798 if [ -n "${domain_file}" ]; then
799 ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ 799 ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
800 -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" || error "lopper failed" 800 -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" || error "lopper failed"
801 else 801 else
802 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" \ 802 ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" \