diff options
| author | Ben Levinsky <ben.levinsky@xilinx.com> | 2022-04-06 10:42:29 -0700 |
|---|---|---|
| committer | Mark Hatle <mhatle@xilinx.com> | 2022-04-06 11:04:43 -0700 |
| commit | 1df9b28d5284e2ee333c705ce0b41686a87decba (patch) | |
| tree | ad9367f9ce2476fd7629eae075f6efe1f229e0cf | |
| parent | 6945929681a1466a5310e7cce1c30e0aa9d6b7d3 (diff) | |
| download | meta-xilinx-1df9b28d5284e2ee333c705ce0b41686a87decba.tar.gz | |
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 <ben.levinsky@xilinx.com>
Signed-off-by: Mark Hatle <mhatle@xilinx.com>
| -rw-r--r-- | meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend | 2 | ||||
| -rwxr-xr-x | meta-xilinx-standalone-experimental/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" | |||
| 6 | FILESEXTRAPATHS:append := ":${THISDIR}/lopper" | 6 | FILESEXTRAPATHS:append := ":${THISDIR}/lopper" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https" | 8 | SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https" |
| 9 | SRCREV = "f70eb86385f49545070a84ad756902b3cd607e21" | 9 | SRCREV = "0d56f35e739c62aba2a47523590241e6bfe1db65" |
| 10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
| 11 | 11 | ||
| 12 | PV="v1.0.2+git${SRCPV}" | 12 | 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() { | |||
| 123 | elif [ -n "${domain_file}" ]; then | 123 | elif [ -n "${domain_file}" ]; then |
| 124 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ | 124 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \ |
| 125 | -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ | 125 | -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \ |
| 126 | -i "${lops_dir}/lop-domain-linux-a53.dts" "${system_dtb}" "${dtb_file}" \ | 126 | -i "${lops_dir}/lop-domain-linux-a53.dts" \ |
| 127 | -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ | ||
| 128 | "${system_dtb}" "${dtb_file}" \ | ||
| 127 | || error "lopper failed" | 129 | || error "lopper failed" |
| 128 | else | 130 | else |
| 129 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \ | 131 | LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \ |
| 130 | -i "${lops_dir}/lop-domain-linux-a53.dts" "${system_dtb}" "${dtb_file}" \ | 132 | -i "${lops_dir}/lop-domain-linux-a53.dts" \ |
| 133 | -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \ | ||
| 134 | "${system_dtb}" "${dtb_file}" \ | ||
| 131 | || error "lopper failed" | 135 | || error "lopper failed" |
| 132 | fi | 136 | fi |
| 133 | rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb | 137 | rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb |
