From ad565866a0455d4c827545f96b0951ad107cef54 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 11 Nov 2021 14:43:24 -0800 Subject: dt-processor.sh: Convert to new override syntax This script will generate configurations, so move to the new syntax. Signed-off-by: Mark Hatle --- .../recipes-core/meta/files/dt-processor.sh | 18 +++++++++--------- 1 file 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() { CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" MACHINE = "${machine}-generic" # Override the SYSTEM_DTFILE for Linux builds -SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}" +SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}" # We don't want the kernel to build us a device-tree -KERNEL_DEVICETREE_${machine}-generic = "" +KERNEL_DEVICETREE:${machine}-generic = "" # We need u-boot to use the one we passed in -DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" +DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" # Update bootbin to use proper device tree BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" # Remap boot files to ensure the right device tree is listed first @@ -305,11 +305,11 @@ cortex_a72_linux() { CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" MACHINE = "${machine}-generic" # Override the SYSTEM_DTFILE for Linux builds -SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}" +SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}" # We don't want the kernel to build us a device-tree -KERNEL_DEVICETREE_${machine}-generic = "" +KERNEL_DEVICETREE:${machine}-generic = "" # We need u-boot to use the one we passed in -DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" +DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" # Update bootbin to use proper device tree BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" # Remap boot files to ensure the right device tree is listed first @@ -596,7 +596,7 @@ ESW_MACHINE = "microblaze-pmu" require conf/microblaze.conf DEFAULTTUNE = "microblaze" -TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmu-microblaze}" +TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmu-microblaze}" TARGET_CFLAGS += "-DPSU_PMU=1U" @@ -648,7 +648,7 @@ ESW_MACHINE = "microblaze-plm" require conf/microblaze.conf DEFAULTTUNE = "microblaze" -TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmc-microblaze}" +TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmc-microblaze}" TARGET_CFLAGS += "-DVERSAL_PLM=1" @@ -700,7 +700,7 @@ ESW_MACHINE = "microblaze-psm" require conf/microblaze.conf DEFAULTTUNE = "microblaze" -TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-psm-microblaze}" +TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-psm-microblaze}" TARGET_CFLAGS += "-DVERSAL_psm=1" -- cgit v1.2.3-54-g00ecf