diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-11 14:43:24 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-11 14:43:24 -0800 |
commit | ad565866a0455d4c827545f96b0951ad107cef54 (patch) | |
tree | 97dc820dc02fb1789f775726d64bb43a62caf723 /meta-xilinx-standalone-experimental/recipes-core | |
parent | c3c643ac6c2313da96459d4474f22e87eabe6943 (diff) | |
download | meta-xilinx-ad565866a0455d4c827545f96b0951ad107cef54.tar.gz |
dt-processor.sh: Convert to new override syntax
This script will generate configurations, so move to the new syntax.
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 | 18 |
1 files changed, 9 insertions, 9 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 7418dc67..d47ebe52 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,11 +130,11 @@ cortex_a53_linux() { | |||
130 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" | 130 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" |
131 | MACHINE = "${machine}-generic" | 131 | MACHINE = "${machine}-generic" |
132 | # Override the SYSTEM_DTFILE for Linux builds | 132 | # Override the SYSTEM_DTFILE for Linux builds |
133 | SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}" | 133 | SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}" |
134 | # We don't want the kernel to build us a device-tree | 134 | # We don't want the kernel to build us a device-tree |
135 | KERNEL_DEVICETREE_${machine}-generic = "" | 135 | KERNEL_DEVICETREE:${machine}-generic = "" |
136 | # We need u-boot to use the one we passed in | 136 | # We need u-boot to use the one we passed in |
137 | DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" | 137 | DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" |
138 | # Update bootbin to use proper device tree | 138 | # Update bootbin to use proper device tree |
139 | BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" | 139 | BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" |
140 | # Remap boot files to ensure the right device tree is listed first | 140 | # Remap boot files to ensure the right device tree is listed first |
@@ -305,11 +305,11 @@ cortex_a72_linux() { | |||
305 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" | 305 | CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" |
306 | MACHINE = "${machine}-generic" | 306 | MACHINE = "${machine}-generic" |
307 | # Override the SYSTEM_DTFILE for Linux builds | 307 | # Override the SYSTEM_DTFILE for Linux builds |
308 | SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}" | 308 | SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}" |
309 | # We don't want the kernel to build us a device-tree | 309 | # We don't want the kernel to build us a device-tree |
310 | KERNEL_DEVICETREE_${machine}-generic = "" | 310 | KERNEL_DEVICETREE:${machine}-generic = "" |
311 | # We need u-boot to use the one we passed in | 311 | # We need u-boot to use the one we passed in |
312 | DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" | 312 | DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" |
313 | # Update bootbin to use proper device tree | 313 | # Update bootbin to use proper device tree |
314 | BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" | 314 | BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" |
315 | # Remap boot files to ensure the right device tree is listed first | 315 | # Remap boot files to ensure the right device tree is listed first |
@@ -596,7 +596,7 @@ ESW_MACHINE = "microblaze-pmu" | |||
596 | 596 | ||
597 | require conf/microblaze.conf | 597 | require conf/microblaze.conf |
598 | DEFAULTTUNE = "microblaze" | 598 | DEFAULTTUNE = "microblaze" |
599 | TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmu-microblaze}" | 599 | TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmu-microblaze}" |
600 | 600 | ||
601 | TARGET_CFLAGS += "-DPSU_PMU=1U" | 601 | TARGET_CFLAGS += "-DPSU_PMU=1U" |
602 | 602 | ||
@@ -648,7 +648,7 @@ ESW_MACHINE = "microblaze-plm" | |||
648 | 648 | ||
649 | require conf/microblaze.conf | 649 | require conf/microblaze.conf |
650 | DEFAULTTUNE = "microblaze" | 650 | DEFAULTTUNE = "microblaze" |
651 | TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmc-microblaze}" | 651 | TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmc-microblaze}" |
652 | 652 | ||
653 | TARGET_CFLAGS += "-DVERSAL_PLM=1" | 653 | TARGET_CFLAGS += "-DVERSAL_PLM=1" |
654 | 654 | ||
@@ -700,7 +700,7 @@ ESW_MACHINE = "microblaze-psm" | |||
700 | 700 | ||
701 | require conf/microblaze.conf | 701 | require conf/microblaze.conf |
702 | DEFAULTTUNE = "microblaze" | 702 | DEFAULTTUNE = "microblaze" |
703 | TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-psm-microblaze}" | 703 | TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-psm-microblaze}" |
704 | 704 | ||
705 | TARGET_CFLAGS += "-DVERSAL_psm=1" | 705 | TARGET_CFLAGS += "-DVERSAL_psm=1" |
706 | 706 | ||