From 8da4c07f50f20bee632fc1e547932f258b8af7a1 Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Thu, 7 Jul 2022 19:33:08 +0530 Subject: 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 Signed-off-by: Mark Hatle (cherry picked from commit 40a8e575737be91414bed98821d9775643b4dd90) Signed-off-by: Mark Hatle --- .../recipes-core/meta/files/dt-processor.sh | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'meta-xilinx-standalone-experimental/recipes-core') 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() { fi dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed" elif [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ -i "${lops_dir}/lop-domain-linux-a53.dts" \ -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ "${system_dtb}" "${dtb_file}" \ || error "lopper failed" - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ -i "${lops_dir}/lop-domain-linux-a53.dts" \ -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ @@ -201,7 +201,7 @@ cortex_a53_baremetal() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -213,7 +213,7 @@ cortex_a53_baremetal() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \ || error "lopper failed" else @@ -272,7 +272,7 @@ cortex_a53_freertos() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -284,7 +284,7 @@ cortex_a53_freertos() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \ @@ -352,13 +352,13 @@ cortex_a72_linux() { fi dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed" elif [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \ -i "${lops_dir}/lop-domain-a72.dts" \ -i "${lops_dir}/lop-domain-a72-prune.dts" \ "${system_dtb}" "${dtb_file}" \ || error "lopper failed" - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \ -i "${lops_dir}/lop-domain-a72.dts" \ -i "${lops_dir}/lop-domain-a72-prune.dts" \ @@ -407,7 +407,7 @@ cortex_a72_baremetal() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -419,7 +419,7 @@ cortex_a72_baremetal() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \ @@ -463,7 +463,7 @@ cortex_a72_freertos() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "${domain_file}" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -475,7 +475,7 @@ cortex_a72_freertos() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \ @@ -534,7 +534,7 @@ cortex_r5_baremetal() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "$domain_file" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -546,7 +546,7 @@ cortex_r5_baremetal() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ @@ -604,7 +604,7 @@ cortex_r5_freertos() { ( cd dtb || error "Unable to cd to dtb dir" if [ -n "$domain_file" ]; then - LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ + LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else @@ -616,7 +616,7 @@ cortex_r5_freertos() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \ @@ -684,7 +684,7 @@ pmu-microblaze() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" \ @@ -740,7 +740,7 @@ pmc-microblaze() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" \ @@ -796,7 +796,7 @@ psm-microblaze() { # Build baremetal multiconfig if [ -n "${domain_file}" ]; then - ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ + ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \ -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" || error "lopper failed" else ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" \ -- cgit v1.2.3-54-g00ecf