diff options
author | Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com> | 2021-11-08 16:50:00 +0530 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-11 14:42:25 -0800 |
commit | c3c643ac6c2313da96459d4474f22e87eabe6943 (patch) | |
tree | 2037ff9135d7eafc55a936f499c568b860eeb76f /meta-xilinx-standalone-experimental/recipes-core | |
parent | 8e157af6eaf35a5376fe9c6315a7980631aee105 (diff) | |
download | meta-xilinx-c3c643ac6c2313da96459d4474f22e87eabe6943.tar.gz |
meta-xilinx-standalone-experimental: recipes-core: meta: files: Fix domain handling for cortexr5 processor
Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>
Acked-by: John Toomey <jtoomey@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
(cherry picked from commit d18dbc02d9b68edc33bf328e9ce4e40874e7e758)
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-standalone-experimental/recipes-core')
-rwxr-xr-x | meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh | 21 |
1 files changed, 16 insertions, 5 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 4ca7baff..7418dc67 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 | |||
@@ -451,14 +451,25 @@ cortex_r5_baremetal() { | |||
451 | # Build device tree | 451 | # Build device tree |
452 | ( | 452 | ( |
453 | cd dtb || error "Unable to cd to dtb dir" | 453 | cd dtb || error "Unable to cd to dtb dir" |
454 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \ | 454 | if [ -n "$domain_file" ]; then |
455 | "${system_dtb}" "${dtb_file}" || error "lopper.py failed" | 455 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ |
456 | -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \ | ||
457 | || error "lopper.py failed" | ||
458 | else | ||
459 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \ | ||
460 | "${system_dtb}" "${dtb_file}" || error "lopper.py failed" | ||
461 | fi | ||
456 | rm -f lop-r5-imux.dts.dtb | 462 | rm -f lop-r5-imux.dts.dtb |
457 | ) | 463 | ) |
458 | 464 | ||
459 | # Build baremetal multiconfig | 465 | # Build baremetal multiconfig |
460 | ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ | 466 | if [ -n "${domain_file}" ]; then |
461 | || error "lopper.py failed" | 467 | ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ |
468 | -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed" | ||
469 | else | ||
470 | ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ | ||
471 | || error "lopper.py failed" | ||
472 | fi | ||
462 | 473 | ||
463 | mv libxil.conf "${libxil}" | 474 | mv libxil.conf "${libxil}" |
464 | mv distro.conf "${distro}" | 475 | mv distro.conf "${distro}" |
@@ -506,7 +517,7 @@ cortex_r5_freertos() { | |||
506 | # Build baremetal multiconfig | 517 | # Build baremetal multiconfig |
507 | if [ -n "${domain_file}" ]; then | 518 | if [ -n "${domain_file}" ]; then |
508 | ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ | 519 | ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ |
509 | -- baremetaldrvlist_xlnx coretexr5-${machine} "${embeddedsw}" || error "lopper.py failed" | 520 | -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed" |
510 | else | 521 | else |
511 | ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ | 522 | ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ |
512 | || error "lopper.py failed" | 523 | || error "lopper.py failed" |