From 1df9b28d5284e2ee333c705ce0b41686a87decba Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Wed, 6 Apr 2022 10:42:29 -0700 Subject: dt-processor: Update to use latest lopper Latest lopper separates the pruning of nodes into separate lop files. Ensure that: 1. Latest lopper is used 2. These pruning operations are included in the A53 and A72 Linux lopper runs. Signed-off-by: Ben Levinsky Signed-off-by: Mark Hatle --- .../virtualization-layer/recipes-kernel/lopper/lopper.bbappend | 2 +- .../recipes-core/meta/files/dt-processor.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend index ccbc19e2..78fbe92d 100644 --- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend +++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend @@ -6,7 +6,7 @@ SECTION = "bootloader" FILESEXTRAPATHS:append := ":${THISDIR}/lopper" SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https" -SRCREV = "f70eb86385f49545070a84ad756902b3cd607e21" +SRCREV = "0d56f35e739c62aba2a47523590241e6bfe1db65" S = "${WORKDIR}/git" PV="v1.0.2+git${SRCPV}" 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 4aba672d..c0c9df18 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 @@ -123,11 +123,15 @@ cortex_a53_linux() { elif [ -n "${domain_file}" ]; then LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ - -i "${lops_dir}/lop-domain-linux-a53.dts" "${system_dtb}" "${dtb_file}" \ + -i "${lops_dir}/lop-domain-linux-a53.dts" \ + -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ + "${system_dtb}" "${dtb_file}" \ || error "lopper failed" else LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \ - -i "${lops_dir}/lop-domain-linux-a53.dts" "${system_dtb}" "${dtb_file}" \ + -i "${lops_dir}/lop-domain-linux-a53.dts" \ + -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ + "${system_dtb}" "${dtb_file}" \ || error "lopper failed" fi rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb -- cgit v1.2.3-54-g00ecf