convert to use ":" as the override instead of "_".
Signed-off-by: Liwei Song <[email protected]>
---
README.md | 2 +-
classes/fpgamanager_custom.bbclass | 8 +-
classes/fpgamanager_dtg.bbclass | 14 +--
classes/xsct-tc.bbclass | 8 +-
classes/xsctapp.bbclass | 6 +-
classes/xsctbase.bbclass | 8 +-
classes/xsctbit.bbclass | 4 +-
classes/xsctdt.bbclass | 4 +-
classes/xsctfsboot.bbclass | 4 +-
classes/xsctyaml.bbclass | 10 +-
conf/layer.conf | 2 +-
recipes-bsp/ai-engine/ai-engine-driver_1.0.bb | 8 +-
recipes-bsp/ai-engine/ai-engine-driver_2.1.bb | 8 +-
recipes-bsp/ai-engine/aiefal_1.0.bb | 10 +-
recipes-bsp/base-pdi/base-pdi_1.0.bb | 4 +-
.../bitstream/bitstream-extraction_git.bb | 4 +-
.../bitstream/bitstream-microblaze_1.0.bb | 6 +-
recipes-bsp/bootbin/xilinx-bootbin_1.0.bb | 6 +-
recipes-bsp/bootbin/xilinx-mcs_1.0.bb | 4 +-
recipes-bsp/cdo/extract-cdo_1.0.bb | 2 +-
recipes-bsp/device-tree/device-tree.bbappend | 104 +++++++++---------
recipes-bsp/device-tree/device-tree.inc | 2 +-
recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb | 2 +-
.../emebeddedsw/fsbl-firmware_git.bbappend | 26 ++---
.../emebeddedsw/plm-firmware_git.bbappend | 8 +-
.../emebeddedsw/pmu-firmware_git.bbappend | 14 +--
.../emebeddedsw/psm-firmware_git.bbappend | 8 +-
.../fpga-manager-script_1.0.bb | 4 +-
.../fpga-manager-util_1.0.bb | 20 ++--
recipes-bsp/fsboot/fs-boot_git.bb | 4 +-
recipes-bsp/hdf/external-hdf.bb | 4 +-
recipes-bsp/imgrcry/imgrcry_git.bb | 10 +-
recipes-bsp/imgsel/imgsel_git.bb | 10 +-
recipes-bsp/libdfx/libdfx_1.0.bb | 10 +-
recipes-bsp/u-boot/u-boot-xlnx_%.bbappend | 2 +-
.../uboot-device-tree/uboot-device-tree.bb | 20 ++--
recipes-openamp/examples/openamp-fw.inc | 20 ++--
recipes-utils/mb-realoc/mb-realoc.bb | 4 +-
38 files changed, 197 insertions(+), 197 deletions(-)
diff --git a/README.md b/README.md
index 17777b1a8df2..a14b77c35707 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ BIF attributes and Partition BIF attributes. Attributes of
BIF need to be
specified in local.conf while using xilinx-bootbin recipe for generating
boot.bin
-Use IMAGE_INSTALL_append = " xilinx-bootbin" in local.conf
+Use IMAGE_INSTALL:append = " xilinx-bootbin" in local.conf
Examples for adding dependencies
================================
diff --git a/classes/fpgamanager_custom.bbclass
b/classes/fpgamanager_custom.bbclass
index ea9ddec9bd6c..39952b68e591 100644
--- a/classes/fpgamanager_custom.bbclass
+++ b/classes/fpgamanager_custom.bbclass
@@ -6,8 +6,8 @@ inherit devicetree
DEPENDS = "dtc-native bootgen-native"
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
PROVIDES = ""
@@ -54,7 +54,7 @@ python do_configure() {
shutil.move(new_dtsi,orig_dtsi)
}
-python devicetree_do_compile_append() {
+python devicetree_do_compile:append() {
import glob, subprocess
pn = d.getVar('PN')
biffile = pn + '.bif'
@@ -82,4 +82,4 @@ do_install() {
do_deploy[noexec] = "1"
-FILES_${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/classes/fpgamanager_dtg.bbclass b/classes/fpgamanager_dtg.bbclass
index 14983be12f94..f7fe4fcd3a33 100644
--- a/classes/fpgamanager_dtg.bbclass
+++ b/classes/fpgamanager_dtg.bbclass
@@ -9,8 +9,8 @@ require recipes-bsp/device-tree/device-tree.inc
DEPENDS = "dtc-native bootgen-native"
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
DT_PADDING_SIZE = "0x1000"
@@ -44,19 +44,19 @@ python (){
}
-do_configure_prepend() {
+do_configure:prepend() {
if ${@bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', 'false',
'true', d)}; then
bbwarn "Using fpga-manager.bbclass requires fpga-overlay
MACHINE_FEATURE to be enabled"
fi
}
-do_configure_append () {
+do_configure:append () {
if ls ${WORKDIR}/${CUSTOMPLINCLUDE_PATH}/*.dtsi >/dev/null 2>&1; then
cp ${WORKDIR}/${CUSTOMPLINCLUDE_PATH}/*.dtsi
${XSCTH_WS}/${XSCTH_PROJ}/pl-custom.dtsi
fi
}
-do_compile_prepend() {
+do_compile:prepend() {
listpath = d.getVar("DT_FILES_PATH")
try:
os.remove(os.path.join(listpath, "system.dts"))
@@ -64,7 +64,7 @@ do_compile_prepend() {
pass
}
-python devicetree_do_compile_append() {
+python devicetree_do_compile:append() {
import glob, subprocess
pn = d.getVar('PN')
biffile = pn + '.bif'
@@ -92,4 +92,4 @@ do_install() {
do_deploy[noexec] = "1"
-FILES_${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/xilinx/${PN}"
diff --git a/classes/xsct-tc.bbclass b/classes/xsct-tc.bbclass
index c7b306a115a8..48df1c5f4b2f 100644
--- a/classes/xsct-tc.bbclass
+++ b/classes/xsct-tc.bbclass
@@ -4,8 +4,8 @@ XSCT_PATH_ADD = "${XILINX_SDK_TOOLCHAIN}/bin:"
# When building in a Linux target config, we need to use the provided XSCT
# compiler, don't bother to build compilers for this...
-INHIBIT_DEFAULT_DEPS_linux = "1"
-INHIBIT_DEFAULT_DEPS_linux-gnueabi = "1"
+INHIBIT_DEFAULT_DEPS:linux = "1"
+INHIBIT_DEFAULT_DEPS:linux-gnueabi = "1"
TC_XSCT_PATH = "\
${XILINX_SDK_TOOLCHAIN}/gnu/microblaze/lin/bin:\
@@ -13,8 +13,8 @@
${XILINX_SDK_TOOLCHAIN}/gnu/aarch32/lin/gcc-arm-none-eabi/bin:\
${XILINX_SDK_TOOLCHAIN}/gnu/armr5/lin/gcc-arm-none-eabi/bin:\
${XILINX_SDK_TOOLCHAIN}/gnu/aarch64/lin/aarch64-none/bin:"
-XSCT_PATH_ADD_append_linux = "${TC_XSCT_PATH}"
-XSCT_PATH_ADD_append_linux-gnueabi = "${TC_XSCT_PATH}"
+XSCT_PATH_ADD:append:linux = "${TC_XSCT_PATH}"
+XSCT_PATH_ADD:append:linux-gnueabi = "${TC_XSCT_PATH}"
PATH =. "${XSCT_PATH_ADD}"
TOOL_PATH = "${XILINX_SDK_TOOLCHAIN}/bin"
diff --git a/classes/xsctapp.bbclass b/classes/xsctapp.bbclass
index ee970613830b..4e763b7d106c 100644
--- a/classes/xsctapp.bbclass
+++ b/classes/xsctapp.bbclass
@@ -6,8 +6,8 @@ PACKAGE_ARCH ?= "${MACHINE_ARCH}"
XSCTH_BASE_NAME ?=
"${PN}${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append = " file://app.tcl"
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
+SRC_URI:append = " file://app.tcl"
XSCTH_SCRIPT ?= "${WORKDIR}/app.tcl"
XSCTH_BUILD_DEBUG ?= "0"
@@ -36,4 +36,4 @@ do_deploy() {
}
addtask do_deploy after do_compile
-FILES_${PN} = "/boot/${PN}-${SRCPV}.elf"
+FILES:${PN} = "/boot/${PN}-${SRCPV}.elf"
diff --git a/classes/xsctbase.bbclass b/classes/xsctbase.bbclass
index 987447ef8013..02945d739148 100644
--- a/classes/xsctbase.bbclass
+++ b/classes/xsctbase.bbclass
@@ -2,10 +2,10 @@ inherit xsct-tc
B ?= "${WORKDIR}/build"
-XSCTH_PROC_DEFAULT_zynqmp ??= "psu_cortexa53"
-XSCTH_PROC_DEFAULT_zynq ??= "ps7_cortexa9"
-XSCTH_PROC_DEFAULT_microblaze ??= "microblaze"
-XSCTH_PROC_DEFAULT_versal ??= "psv_cortexa72"
+XSCTH_PROC_DEFAULT:zynqmp ??= "psu_cortexa53"
+XSCTH_PROC_DEFAULT:zynq ??= "ps7_cortexa9"
+XSCTH_PROC_DEFAULT:microblaze ??= "microblaze"
+XSCTH_PROC_DEFAULT:versal ??= "psv_cortexa72"
XSCTH_PROC_IP ??= "${XSCTH_PROC_DEFAULT}"
diff --git a/classes/xsctbit.bbclass b/classes/xsctbit.bbclass
index f8e5dd797e80..b52ba622a131 100644
--- a/classes/xsctbit.bbclass
+++ b/classes/xsctbit.bbclass
@@ -1,7 +1,7 @@
inherit xsctbase
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append = " file://bitstream.tcl"
+SRC_URI:append = " file://bitstream.tcl"
XSCTH_SCRIPT = "${WORKDIR}/bitstream.tcl"
diff --git a/classes/xsctdt.bbclass b/classes/xsctdt.bbclass
index 255000d4ffbc..93a8c05314ce 100644
--- a/classes/xsctdt.bbclass
+++ b/classes/xsctdt.bbclass
@@ -1,8 +1,8 @@
inherit xsctbase
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://dtgen.tcl \
file://base-hsi.tcl \
"
diff --git a/classes/xsctfsboot.bbclass b/classes/xsctfsboot.bbclass
index c51421bfc08b..7a5b74ab160e 100644
--- a/classes/xsctfsboot.bbclass
+++ b/classes/xsctfsboot.bbclass
@@ -1,7 +1,7 @@
inherit xsctapp
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append =" \
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
+SRC_URI:append =" \
file://fsboot.tcl \
file://base-hsi.tcl \
"
diff --git a/classes/xsctyaml.bbclass b/classes/xsctyaml.bbclass
index 2f418023a1b8..65affd83917f 100644
--- a/classes/xsctyaml.bbclass
+++ b/classes/xsctyaml.bbclass
@@ -21,13 +21,13 @@ YAML_OVERLAY_CUSTOM_DTS ?= ''
YAML_BSP_COMPILER_FLAGS ?= ''
YAML_ENABLE_NO_ALIAS ?= ''
-YAML_SERIAL_CONSOLE_STDIN_ultra96 ?= "psu_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT_ultra96 ?= "psu_uart_1"
+YAML_SERIAL_CONSOLE_STDIN:ultra96 ?= "psu_uart_1"
+YAML_SERIAL_CONSOLE_STDOUT:ultra96 ?= "psu_uart_1"
-YAML_COMPILER_FLAGS_append_ultra96 = " -DBOARD_SHUTDOWN_PIN=2
-DBOARD_SHUTDOWN_PIN_STATE=0 "
+YAML_COMPILER_FLAGS:append:ultra96 = " -DBOARD_SHUTDOWN_PIN=2
-DBOARD_SHUTDOWN_PIN_STATE=0 "
YAML_FILE_PATH = "${WORKDIR}/${PN}.yaml"
-XSCTH_MISC_append = " -yamlconf ${YAML_FILE_PATH}"
+XSCTH_MISC:append = " -yamlconf ${YAML_FILE_PATH}"
YAML_BUILD_CONFIG ?= "${@d.getVar('XSCTH_BUILD_CONFIG').lower()}"
YAML_APP_CONFIG += "${@'build-config' if d.getVar('YAML_BUILD_CONFIG') != ''
else ''}"
@@ -119,4 +119,4 @@ python do_create_yaml() {
addtask create_yaml after do_prepare_recipe_sysroot before do_configure
-PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"
+PACKAGE_ARCH:ultra96 = "${BOARD_ARCH}"
diff --git a/conf/layer.conf b/conf/layer.conf
index 82f83e3d5508..609c48dbc04c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,7 +16,7 @@ LAYERDEPENDS_xilinx-tools = "core xilinx xilinx-standalone
meta-python"
XLNX_SCRIPTS_DIR = "${LAYERDIR}/scripts/"
XILINX_VER_MAIN ??= "2021.1"
-SDK_LOCAL_CONF_WHITELIST_append = " XILINX_SDK_TOOLCHAIN XILINX_VER_MAIN"
+SDK_LOCAL_CONF_WHITELIST:append = " XILINX_SDK_TOOLCHAIN XILINX_VER_MAIN"
HOSTTOOLS += "ps"
INHERIT += "xsct-tarball"
diff --git a/recipes-bsp/ai-engine/ai-engine-driver_1.0.bb
b/recipes-bsp/ai-engine/ai-engine-driver_1.0.bb
index 6fa42bd18194..ac5a53c47c43 100644
--- a/recipes-bsp/ai-engine/ai-engine-driver_1.0.bb
+++ b/recipes-bsp/ai-engine/ai-engine-driver_1.0.bb
@@ -8,13 +8,13 @@ S = "${WORKDIR}/git"
I = "${AIEDIR}/include"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal-ai-core = "versal-ai-core"
+COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
PV = "1.0"
DEPENDS = "libmetal openamp"
-RDEPENDS_${PN} = "libmetal"
+RDEPENDS:${PN} = "libmetal"
PROVIDES = "libxaiengine"
-RPROVIDES_${PN} = "libxaiengine"
+RPROVIDES:${PN} = "libxaiengine"
# The makefile isn't ready for parallel execution at the moment
PARALLEL_MAKE = "-j 1"
@@ -34,4 +34,4 @@ do_install(){
cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
}
-PACKAGE_ARCH_versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
diff --git a/recipes-bsp/ai-engine/ai-engine-driver_2.1.bb
b/recipes-bsp/ai-engine/ai-engine-driver_2.1.bb
index 7db767b6ac04..3ff67962563a 100644
--- a/recipes-bsp/ai-engine/ai-engine-driver_2.1.bb
+++ b/recipes-bsp/ai-engine/ai-engine-driver_2.1.bb
@@ -10,16 +10,16 @@ S = "${WORKDIR}/git"
I = "${AIEDIR}/include"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal-ai-core = "versal-ai-core"
+COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
PV = "2.1"
IOBACKENDS ?= "Linux"
DEPENDS = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
-RDEPENDS_${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '',
d)}"
+RDEPENDS:${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '',
d)}"
PROVIDES = "libxaiengine"
-RPROVIDES_${PN} = "libxaiengine"
+RPROVIDES:${PN} = "libxaiengine"
# The makefile isn't ready for parallel execution at the moment
PARALLEL_MAKE = "-j 1"
@@ -43,4 +43,4 @@ do_install(){
cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
}
-PACKAGE_ARCH_versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
diff --git a/recipes-bsp/ai-engine/aiefal_1.0.bb
b/recipes-bsp/ai-engine/aiefal_1.0.bb
index d5105724bb10..5e3e0ac99a7d 100644
--- a/recipes-bsp/ai-engine/aiefal_1.0.bb
+++ b/recipes-bsp/ai-engine/aiefal_1.0.bb
@@ -9,12 +9,12 @@ XAIEFAL_DIR ?= "XilinxProcessorIPLib/drivers/aiefal"
S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal-ai-core = "versal-ai-core"
+COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
IOBACKENDS ?= "Linux"
PROVIDES = "aiefal"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
inherit pkgconfig cmake yocto-cmake-translation
@@ -23,10 +23,10 @@ DEPENDS = "libxaiengine"
OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}"
EXTRA_OECMAKE = "-DWITH_TESTS=OFF "
-EXTRA_OECMAKE_append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES')
== 'y' else '-DWITH_EXAMPLES=OFF'}"
+EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES')
== 'y' else '-DWITH_EXAMPLES=OFF'}"
-FILES_${PN}-demos = " \
+FILES:${PN}-demos = " \
${bindir}/* \
"
-PACKAGE_ARCH_versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
diff --git a/recipes-bsp/base-pdi/base-pdi_1.0.bb
b/recipes-bsp/base-pdi/base-pdi_1.0.bb
index 81a986605498..060f2d50f9ed 100644
--- a/recipes-bsp/base-pdi/base-pdi_1.0.bb
+++ b/recipes-bsp/base-pdi/base-pdi_1.0.bb
@@ -16,7 +16,7 @@ inherit xsctbit
XSCTH_MISC = "-hwpname ${XSCTH_PROJ}_hwproj -hdf_type ${HDF_EXT}"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
PACKAGE_ARCH ?= "${MACHINE_ARCH}"
@@ -41,4 +41,4 @@ do_install() {
}
SYSROOT_DIRS += "/boot"
-FILES_${PN} += "/boot/*"
+FILES:${PN} += "/boot/*"
diff --git a/recipes-bsp/bitstream/bitstream-extraction_git.bb
b/recipes-bsp/bitstream/bitstream-extraction_git.bb
index cce14b14b806..d34b8b11794e 100644
--- a/recipes-bsp/bitstream/bitstream-extraction_git.bb
+++ b/recipes-bsp/bitstream/bitstream-extraction_git.bb
@@ -16,7 +16,7 @@ XSCTH_MISC = "-hwpname ${XSCTH_PROJ}_hwproj -hdf_type
${HDF_EXT}"
do_compile[noexec] = "1"
BITSTREAM_NAME ?= "download"
-BITSTREAM_NAME_microblaze ?= "system"
+BITSTREAM_NAME:microblaze ?= "system"
BITSTREAM_BASE_NAME ?= "${BITSTREAM_NAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
@@ -54,4 +54,4 @@ do_deploy() {
}
addtask do_deploy after do_install
-FILES_${PN} += "/boot/bitstream/*.bit /boot/bitstream/*.mmi"
+FILES:${PN} += "/boot/bitstream/*.bit /boot/bitstream/*.mmi"
diff --git a/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
b/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
index 296e878c79b6..381150c5c868 100644
--- a/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
+++ b/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
@@ -11,7 +11,7 @@ DEPENDS = "virtual/fsboot virtual/bitstream"
inherit deploy
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_microblaze = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
MMI_FILE ?= "${RECIPE_SYSROOT}/boot/bitstream/system.mmi"
BIT_FILE ?= "${RECIPE_SYSROOT}/boot/bitstream/system.bit"
@@ -19,7 +19,7 @@ DATA_FILE ?= "${RECIPE_SYSROOT}/boot/fs-boot.elf"
B = "${WORKDIR}/build"
PROC ??= "kc705_i/microblaze_0"
-PROC_kc705 = "kc705_i/microblaze_0"
+PROC:kc705 = "kc705_i/microblaze_0"
SYSROOT_DIRS += "/boot/bitstream"
@@ -58,4 +58,4 @@ do_deploy() {
addtask do_deploy before do_build after do_compile
-FILES_${PN} = "/boot/bitstream/download.bit"
+FILES:${PN} = "/boot/bitstream/download.bit"
diff --git a/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 2401f5ff53c6..26fe5ef4da08 100644
--- a/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -26,7 +26,7 @@ SRC_URI += "${@('file://' + d.getVar("BIF_FILE_PATH")) if
d.getVar("BIF_FILE_PAT
BOOTGEN_EXTRA_ARGS ?= ""
-BIF_PARTITION_ATTR_zynqmp = "${@bb.utils.contains('MACHINE_FEATURES',
'fpga-overlay', 'fsbl pmu atf dtb u-boot', 'fsbl bitstream pmu atf dtb u-boot',
d)}"
+BIF_PARTITION_ATTR:zynqmp = "${@bb.utils.contains('MACHINE_FEATURES',
'fpga-overlay', 'fsbl pmu atf dtb u-boot', 'fsbl bitstream pmu atf dtb u-boot',
d)}"
do_patch[noexec] = "1"
@@ -150,7 +150,7 @@ do_compile() {
fi
}
-do_compile_append_versal() {
+do_compile:append:versal() {
dd if=/dev/zero bs=256M count=1 > ${B}/QEMU_qspi.bin
dd if=${B}/BOOT.bin of=${B}/QEMU_qspi.bin bs=1 seek=0 conv=notrunc
dd if=${DEPLOY_DIR_IMAGE}/boot.scr of=${B}/QEMU_qspi.bin bs=1
seek=66584576 conv=notrunc
@@ -171,7 +171,7 @@ do_deploy() {
ln -sf ${BOOTBIN_BASE_NAME}.bin ${DEPLOYDIR}/boot.bin
}
-do_deploy_append_versal () {
+do_deploy:append:versal () {
install -m 0644 ${B}/BOOT_bh.bin ${DEPLOYDIR}/${BOOTBIN_BASE_NAME}_bh.bin
ln -sf ${BOOTBIN_BASE_NAME}_bh.bin ${DEPLOYDIR}/BOOT-${MACHINE}_bh.bin
diff --git a/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
b/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
index 4e3b11dba851..bcfe900da8cb 100644
--- a/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
+++ b/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
@@ -10,7 +10,7 @@ DEPENDS = "bitstream-microblaze"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_microblaze = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
inherit deploy image-artifact-names
@@ -19,7 +19,7 @@ do_unpack[noexec] = "1"
do_patch[noexec] = "1"
PROC ??= "kc705_i/microblaze_0"
-PROC_kc705 = "kc705_i/microblaze_0"
+PROC:kc705 = "kc705_i/microblaze_0"
FLASH_SIZE ??= "0x80"
FLASH_INTERFACE ??= "BPIx16"
diff --git a/recipes-bsp/cdo/extract-cdo_1.0.bb
b/recipes-bsp/cdo/extract-cdo_1.0.bb
index dedb3559dd11..37c284ada635 100644
--- a/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/recipes-bsp/cdo/extract-cdo_1.0.bb
@@ -11,7 +11,7 @@ DEPENDS += "bootgen-native"
do_compile[depends] += "virtual/boot-bin:do_deploy"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
PACKAGE_ARCH ?= "${MACHINE_ARCH}"
diff --git a/recipes-bsp/device-tree/device-tree.bbappend
b/recipes-bsp/device-tree/device-tree.bbappend
index 083130aaef8a..3e1467184dcc 100644
--- a/recipes-bsp/device-tree/device-tree.bbappend
+++ b/recipes-bsp/device-tree/device-tree.bbappend
@@ -9,7 +9,7 @@ require recipes-bsp/device-tree/device-tree.inc
inherit xsctdt xsctyaml image-artifact-names
BASE_DTS ?= "system-top"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
S = "${WORKDIR}/git"
@@ -21,64 +21,64 @@ YAML_COMPILER_FLAGS ?= ""
XSCTH_APP = "device-tree"
XSCTH_MISC = " -hdf_type ${HDF_EXT}"
-YAML_MAIN_MEMORY_CONFIG_ultra96 ?= "psu_ddr_0"
-YAML_CONSOLE_DEVICE_CONFIG_ultra96 ?= "psu_uart_1"
-
-YAML_MAIN_MEMORY_CONFIG_kc705 ?= "mig_7series_0"
-YAML_CONSOLE_DEVICE_CONFIG_kc705 ?= "axi_uartlite_0"
-
-YAML_DT_BOARD_FLAGS_ultra96 ?= "{BOARD avnet-ultra96-rev1}"
-YAML_DT_BOARD_FLAGS_zcu102 ?= "{BOARD zcu102-rev1.0}"
-YAML_DT_BOARD_FLAGS_zcu106 ?= "{BOARD zcu106-reva}"
-YAML_DT_BOARD_FLAGS_zc702 ?= "{BOARD zc702}"
-YAML_DT_BOARD_FLAGS_zc706 ?= "{BOARD zc706}"
-YAML_DT_BOARD_FLAGS_zedboard ?= "{BOARD zedboard}"
-YAML_DT_BOARD_FLAGS_zc1254 ?= "{BOARD zc1254-reva}"
-YAML_DT_BOARD_FLAGS_kc705 ?= "{BOARD kc705-full}"
-YAML_DT_BOARD_FLAGS_zcu104 ?= "{BOARD zcu104-revc}"
-YAML_DT_BOARD_FLAGS_zcu111 ?= "{BOARD zcu111-reva}"
-YAML_DT_BOARD_FLAGS_zcu1275 ?= "{BOARD zcu1275-revb}"
-YAML_DT_BOARD_FLAGS_zcu1285 ?= "{BOARD zcu1285-reva}"
-YAML_DT_BOARD_FLAGS_zcu216 ?= "{BOARD zcu216-reva}"
-YAML_DT_BOARD_FLAGS_zcu208 ?= "{BOARD zcu208-reva}"
-YAML_DT_BOARD_FLAGS_virt-versal ?= "{BOARD versal-virt}"
-YAML_DT_BOARD_FLAGS_vck-sc ?= "{BOARD zynqmp-e-a2197-00-reva}"
-YAML_DT_BOARD_FLAGS_v350 ?= "{BOARD versal-v350-reva}"
-YAML_DT_BOARD_FLAGS_vck5000 ?= "{BOARD versal-vck5000-reva}"
-YAML_DT_BOARD_FLAGS_vck190 ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
-YAML_DT_BOARD_FLAGS_vmk180 ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}"
-YAML_DT_BOARD_FLAGS_vc-p-a2197-00 ?= "{BOARD
versal-vc-p-a2197-00-reva-x-prc-01-reva}"
-YAML_DT_BOARD_FLAGS_ac701 ?= "{BOARD ac701-full}"
-YAML_DT_BOARD_FLAGS_kc705 ?= "{BOARD kc705-full}"
-YAML_DT_BOARD_FLAGS_kcu105 ?= "{BOARD kcu105}"
-YAML_DT_BOARD_FLAGS_sp701 ?= "{BOARD sp701-rev1.0}"
-YAML_DT_BOARD_FLAGS_vcu118 ?= "{BOARD vcu118-rev2.0}"
-YAML_DT_BOARD_FLAGS_k26 ?= "{BOARD zynqmp-sm-k26-revb}"
-YAML_DT_BOARD_FLAGS_zcu670 ?= "{BOARD zcu670-reva}"
-YAML_DT_BOARD_FLAGS_vpk120 ?= "{BOARD versal-vpk120-reva}"
-YAML_DT_BOARD_FLAGS_vpk-sc ?= "{BOARD zynqmp-vpk120-reva}"
+YAML_MAIN_MEMORY_CONFIG:ultra96 ?= "psu_ddr_0"
+YAML_CONSOLE_DEVICE_CONFIG:ultra96 ?= "psu_uart_1"
+
+YAML_MAIN_MEMORY_CONFIG:kc705 ?= "mig_7series_0"
+YAML_CONSOLE_DEVICE_CONFIG:kc705 ?= "axi_uartlite_0"
+
+YAML_DT_BOARD_FLAGS:ultra96 ?= "{BOARD avnet-ultra96-rev1}"
+YAML_DT_BOARD_FLAGS:zcu102 ?= "{BOARD zcu102-rev1.0}"
+YAML_DT_BOARD_FLAGS:zcu106 ?= "{BOARD zcu106-reva}"
+YAML_DT_BOARD_FLAGS:zc702 ?= "{BOARD zc702}"
+YAML_DT_BOARD_FLAGS:zc706 ?= "{BOARD zc706}"
+YAML_DT_BOARD_FLAGS:zedboard ?= "{BOARD zedboard}"
+YAML_DT_BOARD_FLAGS:zc1254 ?= "{BOARD zc1254-reva}"
+YAML_DT_BOARD_FLAGS:kc705 ?= "{BOARD kc705-full}"
+YAML_DT_BOARD_FLAGS:zcu104 ?= "{BOARD zcu104-revc}"
+YAML_DT_BOARD_FLAGS:zcu111 ?= "{BOARD zcu111-reva}"
+YAML_DT_BOARD_FLAGS:zcu1275 ?= "{BOARD zcu1275-revb}"
+YAML_DT_BOARD_FLAGS:zcu1285 ?= "{BOARD zcu1285-reva}"
+YAML_DT_BOARD_FLAGS:zcu216 ?= "{BOARD zcu216-reva}"
+YAML_DT_BOARD_FLAGS:zcu208 ?= "{BOARD zcu208-reva}"
+YAML_DT_BOARD_FLAGS:virt-versal ?= "{BOARD versal-virt}"
+YAML_DT_BOARD_FLAGS:vck-sc ?= "{BOARD zynqmp-e-a2197-00-reva}"
+YAML_DT_BOARD_FLAGS:v350 ?= "{BOARD versal-v350-reva}"
+YAML_DT_BOARD_FLAGS:vck5000 ?= "{BOARD versal-vck5000-reva}"
+YAML_DT_BOARD_FLAGS:vck190 ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
+YAML_DT_BOARD_FLAGS:vmk180 ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}"
+YAML_DT_BOARD_FLAGS:vc-p-a2197-00 ?= "{BOARD
versal-vc-p-a2197-00-reva-x-prc-01-reva}"
+YAML_DT_BOARD_FLAGS:ac701 ?= "{BOARD ac701-full}"
+YAML_DT_BOARD_FLAGS:kc705 ?= "{BOARD kc705-full}"
+YAML_DT_BOARD_FLAGS:kcu105 ?= "{BOARD kcu105}"
+YAML_DT_BOARD_FLAGS:sp701 ?= "{BOARD sp701-rev1.0}"
+YAML_DT_BOARD_FLAGS:vcu118 ?= "{BOARD vcu118-rev2.0}"
+YAML_DT_BOARD_FLAGS:k26 ?= "{BOARD zynqmp-sm-k26-revb}"
+YAML_DT_BOARD_FLAGS:zcu670 ?= "{BOARD zcu670-reva}"
+YAML_DT_BOARD_FLAGS:vpk120 ?= "{BOARD versal-vpk120-reva}"
+YAML_DT_BOARD_FLAGS:vpk-sc ?= "{BOARD zynqmp-vpk120-reva}"
YAML_OVERLAY_CUSTOM_DTS = "pl-final.dts"
CUSTOM_PL_INCLUDE_DTSI ?= ""
EXTRA_DT_FILES ?= ""
DT_FILES_PATH = "${XSCTH_WS}/${XSCTH_PROJ}"
-DT_INCLUDE_append = " ${WORKDIR}"
+DT_INCLUDE:append = " ${WORKDIR}"
DT_PADDING_SIZE = "0x1000"
-DTC_FLAGS_append = "${@['', ' -@'][d.getVar('YAML_ENABLE_DT_OVERLAY') == '1']}"
+DTC_FLAGS:append = "${@['', ' -@'][d.getVar('YAML_ENABLE_DT_OVERLAY') == '1']}"
-COMPATIBLE_MACHINE_zynq = ".*"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_microblaze = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
-SRC_URI_append_ultra96 = "${@bb.utils.contains('MACHINE_FEATURES', 'mipi', '
file://mipi-support-ultra96.dtsi file://pl.dtsi', '', d)}"
+SRC_URI:append:ultra96 = "${@bb.utils.contains('MACHINE_FEATURES', 'mipi', '
file://mipi-support-ultra96.dtsi file://pl.dtsi', '', d)}"
-SRC_URI_append = "${@" ".join(["file://%s" % f for f in
(d.getVar('EXTRA_DT_FILES') or "").split()])}"
+SRC_URI:append = "${@" ".join(["file://%s" % f for f in
(d.getVar('EXTRA_DT_FILES') or "").split()])}"
do_configure[cleandirs] += "${DT_FILES_PATH} ${B}"
do_deploy[cleandirs] += "${DEPLOYDIR}"
-do_configure_append_ultra96() {
+do_configure:append:ultra96() {
if [ -e ${WORKDIR}/mipi-support-ultra96.dtsi ]; then
cp ${WORKDIR}/mipi-support-ultra96.dtsi
${DT_FILES_PATH}/mipi-support-ultra96.dtsi
cp ${WORKDIR}/pl.dtsi ${DT_FILES_PATH}/pl.dtsi
@@ -86,7 +86,7 @@ do_configure_append_ultra96() {
fi
}
-do_configure_append () {
+do_configure:append () {
if [ -n "${CUSTOM_PL_INCLUDE_DTSI}" ]; then
[ ! -f "${CUSTOM_PL_INCLUDE_DTSI}" ] && bbfatal "Please check that the
correct filepath was provided using CUSTOM_PL_INCLUDE_DTSI"
cp ${CUSTOM_PL_INCLUDE_DTSI} ${XSCTH_WS}/${XSCTH_PROJ}/pl-custom.dtsi
@@ -97,7 +97,7 @@ do_configure_append () {
done
}
-do_compile_prepend() {
+do_compile:prepend() {
listpath = d.getVar("DT_FILES_PATH")
try:
os.remove(os.path.join(listpath, "system.dts"))
@@ -106,14 +106,14 @@ do_compile_prepend() {
}
BINARY_EXT = ".dtb"
-do_install_append () {
+do_install:append () {
install -Dm 0644 ${B}/${BASE_DTS}.dtb ${D}/boot/${PN}${BINARY_EXT}
}
-FILES_${PN} += "/boot/${PN}${BINARY_EXT}"
+FILES:${PN} += "/boot/${PN}${BINARY_EXT}"
DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"
-do_install_append_microblaze () {
+do_install:append:microblaze () {
for DTB_FILE in `ls *.dtb`; do
dtc -I dtb -O dts -o ${D}/boot/devicetree/mb.dts ${B}/${DTB_FILE}
done
@@ -131,6 +131,6 @@ do_deploy() {
done
}
-FILES_${PN}_append_microblaze = " /boot/devicetree/*.dts"
+FILES:${PN}:append:microblaze = " /boot/devicetree/*.dts"
EXTERNALSRC_SYMLINKS = ""
diff --git a/recipes-bsp/device-tree/device-tree.inc
b/recipes-bsp/device-tree/device-tree.inc
index 42ae8c43ab0c..9cf13b6270b9 100644
--- a/recipes-bsp/device-tree/device-tree.inc
+++ b/recipes-bsp/device-tree/device-tree.inc
@@ -1,6 +1,6 @@
REPO ??= "git://github.com/Xilinx/device-tree-xlnx.git;protocol=https"
BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
-SRC_URI_append = " ${REPO};${BRANCHARG}"
+SRC_URI:append = " ${REPO};${BRANCHARG}"
BRANCH = "xlnx_rel_v2021.1"
SRCREV = "252758eb1f09bd2f85572f6447060636b79367ad"
diff --git a/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
b/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
index 6bbc49a20303..90c62e71c9e3 100644
--- a/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
+++ b/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
@@ -36,4 +36,4 @@ do_install(){
install -m 0755 ${S}/src/daemon.conf ${D}/etc/dfx-mgrd/
}
-FILES_${PN} += "${base_libdir}/firmware/xilinx"
+FILES:${PN} += "${base_libdir}/firmware/xilinx"
diff --git a/recipes-bsp/emebeddedsw/fsbl-firmware_git.bbappend
b/recipes-bsp/emebeddedsw/fsbl-firmware_git.bbappend
index f1cee767a09a..0dfe2078e2cb 100644
--- a/recipes-bsp/emebeddedsw/fsbl-firmware_git.bbappend
+++ b/recipes-bsp/emebeddedsw/fsbl-firmware_git.bbappend
@@ -7,33 +7,33 @@ DEFAULT_PREFERENCE = "100"
inherit xsctapp xsctyaml
B = "${S}/${XSCTH_PROJ}"
-B_zynq = "${S}/${XSCTH_PROJ}"
-B_zynqmp = "${S}/${XSCTH_PROJ}"
+B:zynq = "${S}/${XSCTH_PROJ}"
+B:zynqmp = "${S}/${XSCTH_PROJ}"
XSCTH_COMPILER_DEBUG_FLAGS = " -DFSBL_DEBUG_INFO"
-XSCTH_APP_zynq = "Zynq FSBL"
-XSCTH_APP_zynqmp = "Zynq MP FSBL"
+XSCTH_APP:zynq = "Zynq FSBL"
+XSCTH_APP:zynqmp = "Zynq MP FSBL"
# Building for zynq does work here
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
# XSCT version provides it's own toolchain, so can build in any environment
-COMPATIBLE_HOST_zynq = "${HOST_SYS}"
-COMPATIBLE_HOST_zynqmp = "${HOST_SYS}"
+COMPATIBLE_HOST:zynq = "${HOST_SYS}"
+COMPATIBLE_HOST:zynqmp = "${HOST_SYS}"
# Clear this for a Linux build, using the XSCT toolchain
EXTRA_OEMAKE_linux = ""
-EXTRA_OEMAKE_linux-gnueabi = ""
+EXTRA_OEMAKE:linux-gnueabi = ""
# Workaround for hardcoded toolchain items
-XSCT_PATH_ADD_append_elf = "\
+XSCT_PATH_ADD:append:elf = "\
${WORKDIR}/bin:"
-XSCT_PATH_ADD_append_eabi = "\
+XSCT_PATH_ADD:append:eabi = "\
${WORKDIR}/bin:"
-do_compile_prepend_elf_aarch64() {
+do_compile:prepend:elf:aarch64() {
mkdir -p ${WORKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/aarch64-none-elf-gcc
echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/aarch64-none-elf-as
@@ -43,8 +43,8 @@ do_compile_prepend_elf_aarch64() {
chmod 0755 ${WORKDIR}/bin/aarch64-none-elf-ar
}
-ARM_INSTRUCTION_SET_eabi_arm = "arm"
-do_compile_prepend_eabi_arm() {
+ARM_INSTRUCTION_SET:eabi:arm = "arm"
+do_compile:prepend:eabi:arm() {
mkdir -p ${WORKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/arm-none-eabi-gcc
echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/arm-none-eabi-as
diff --git a/recipes-bsp/emebeddedsw/plm-firmware_git.bbappend
b/recipes-bsp/emebeddedsw/plm-firmware_git.bbappend
index b958e1bbb345..b766c096e49a 100644
--- a/recipes-bsp/emebeddedsw/plm-firmware_git.bbappend
+++ b/recipes-bsp/emebeddedsw/plm-firmware_git.bbappend
@@ -12,18 +12,18 @@ XSCTH_PROC_IP = "psv_pmc"
XSCTH_APP = "versal PLM"
# XSCT version provides it's own toolchain, so can build in any environment
-COMPATIBLE_HOST_versal = "${HOST_SYS}"
+COMPATIBLE_HOST:versal = "${HOST_SYS}"
# Clear this for a Linux build, using the XSCT toolchain
EXTRA_OEMAKE_linux = ""
# Workaround for hardcoded toolchain items
-XSCT_PATH_ADD_append_elf = "\
+XSCT_PATH_ADD:append:elf = "\
${WORKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile_prepend_elf() {
+do_compile:prepend:elf() {
mkdir -p ${WORKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/mb-as
@@ -37,7 +37,7 @@ do_compile_prepend_elf() {
chmod 0755 ${WORKDIR}/bin/mb-objcopy
}
-do_compile_append() {
+do_compile:append() {
${MB_OBJCOPY} -O binary ${B}/${XSCTH_PROJ}/executable.elf
${B}/${XSCTH_PROJ}/executable.bin
}
diff --git a/recipes-bsp/emebeddedsw/pmu-firmware_git.bbappend
b/recipes-bsp/emebeddedsw/pmu-firmware_git.bbappend
index 6f493e7ab2c6..1bb6fdcae9da 100644
--- a/recipes-bsp/emebeddedsw/pmu-firmware_git.bbappend
+++ b/recipes-bsp/emebeddedsw/pmu-firmware_git.bbappend
@@ -13,23 +13,23 @@ XSCTH_PROC_IP = "psu_pmu"
XSCTH_APP = "ZynqMP PMU Firmware"
ULTRA96_VERSION ?= "1"
-YAML_COMPILER_FLAGS_append = " -DENABLE_SCHEDULER "
-YAML_COMPILER_FLAGS_append_ultra96 = " -DENABLE_MOD_ULTRA96
${@bb.utils.contains('ULTRA96_VERSION', '2', ' -DULTRA96_VERSION=2 ', '
-DULTRA96_VERSION=1 ', d)}"
-YAML_COMPILER_FLAGS_append_k26 = " -DBOARD_SHUTDOWN_PIN=2
-DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP
-DOVERTEMP_DEGC=90.0 "
+YAML_COMPILER_FLAGS:append = " -DENABLE_SCHEDULER "
+YAML_COMPILER_FLAGS:append:ultra96 = " -DENABLE_MOD_ULTRA96
${@bb.utils.contains('ULTRA96_VERSION', '2', ' -DULTRA96_VERSION=2 ', '
-DULTRA96_VERSION=1 ', d)}"
+YAML_COMPILER_FLAGS:append:k26 = " -DBOARD_SHUTDOWN_PIN=2
-DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP
-DOVERTEMP_DEGC=90.0 "
# XSCT version provides it's own toolchain, so can build in any environment
-COMPATIBLE_HOST_zynqmp = "${HOST_SYS}"
+COMPATIBLE_HOST:zynqmp = "${HOST_SYS}"
# Clear this for a Linux build, using the XSCT toolchain
EXTRA_OEMAKE_linux = ""
# Workaround for hardcoded toolchain items
-XSCT_PATH_ADD_append_elf = "\
+XSCT_PATH_ADD:append:elf = "\
${WORKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile_prepend_elf() {
+do_compile:prepend:elf() {
mkdir -p ${WORKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/mb-as
@@ -41,7 +41,7 @@ do_compile_prepend_elf() {
chmod 0755 ${WORKDIR}/bin/mb-objcopy
}
-do_compile_append() {
+do_compile:append() {
${MB_OBJCOPY} -O binary ${B}/${XSCTH_PROJ}/executable.elf
${B}/${XSCTH_PROJ}/executable.bin
}
diff --git a/recipes-bsp/emebeddedsw/psm-firmware_git.bbappend
b/recipes-bsp/emebeddedsw/psm-firmware_git.bbappend
index f5a9158a5751..9891da5468c9 100644
--- a/recipes-bsp/emebeddedsw/psm-firmware_git.bbappend
+++ b/recipes-bsp/emebeddedsw/psm-firmware_git.bbappend
@@ -12,18 +12,18 @@ XSCTH_PROC_IP = "psv_psm"
XSCTH_APP = "versal PSM Firmware"
# XSCT version provides it's own toolchain, so can build in any environment
-COMPATIBLE_HOST_versal = "${HOST_SYS}"
+COMPATIBLE_HOST:versal = "${HOST_SYS}"
# Clear this for a Linux build, using the XSCT toolchain
EXTRA_OEMAKE_linux = ""
# Workaround for hardcoded toolchain items
-XSCT_PATH_ADD_append_elf = "\
+XSCT_PATH_ADD:append:elf = "\
${WORKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile_prepend_elf() {
+do_compile:prepend:elf() {
mkdir -p ${WORKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/mb-as
@@ -37,7 +37,7 @@ do_compile_prepend_elf() {
chmod 0755 ${WORKDIR}/bin/mb-objcopy
}
-do_compile_append() {
+do_compile:append() {
${MB_OBJCOPY} -O binary ${B}/${XSCTH_PROJ}/executable.elf
${B}/${XSCTH_PROJ}/executable.bin
}
diff --git a/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
b/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
index 44c11087fef9..416edf17e7ba 100644
--- a/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
+++ b/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "\
"
S = "${WORKDIR}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
do_compile() {
${CC} ${LDFLAGS} fpgautil.c -o fpgautil
@@ -18,6 +18,6 @@ do_install() {
install -Dm 0755 ${S}/fpgautil ${D}${bindir}/fpgautil
}
-FILES_${PN} = "\
+FILES:${PN} = "\
${bindir}/fpgautil \
"
diff --git a/recipes-bsp/fpga-manager-util/fpga-manager-util_1.0.bb
b/recipes-bsp/fpga-manager-util/fpga-manager-util_1.0.bb
index 6b26ceea386d..592f4ab25ec6 100644
--- a/recipes-bsp/fpga-manager-util/fpga-manager-util_1.0.bb
+++ b/recipes-bsp/fpga-manager-util/fpga-manager-util_1.0.bb
@@ -12,9 +12,9 @@ B = "${WORKDIR}/build"
PV = "xilinx+git${SRCPV}"
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://multipleHDF.tcl \
file://base-hsi.tcl \
"
@@ -28,8 +28,8 @@ DEPENDS += "\
PACKAGE_ARCH ?= "${MACHINE_ARCH}"
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
XSCTH_SCRIPT = "${WORKDIR}/multipleHDF.tcl"
XSCTH_BUILD_CONFIG ?= 'Release'
@@ -56,7 +56,7 @@ YAML_OVERLAY_CUSTOM_DTS = "pl-final.dts"
do_fetch[cleandirs] = "${XSCTH_HDF}"
do_configure[cleandirs] = "${XSCTH_WS}"
-do_configure_append () {
+do_configure:append () {
for hdf in ${HDF_LIST}; do
customfile=${WORKDIR}${EXTRA_HDF}/${hdf}.dtsi
if [ -f "${customfile}" ];then
@@ -149,7 +149,7 @@ do_install() {
done
}
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
python () {
if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1':
@@ -160,9 +160,9 @@ python () {
#package base hdf
packages.append(pn + '-base')
- d.setVar('FILES_' + pn + '-base', baselib +
'/firmware/xilinx/base')
+ d.setVar('FILES:' + pn + '-base', baselib +
'/firmware/xilinx/base')
d.setVar('PACKAGES', ' '.join(packages))
- d.setVar('RDEPENDS_' + pn , pn + '-base')
+ d.setVar('RDEPENDS:' + pn , pn + '-base')
if extra:
hdflist = []
@@ -176,7 +176,7 @@ python () {
if os.path.isfile(dtsifile):
hdffullpath.append(dtsifile)
- d.setVar('FILES_' + pn + '-' + name, baselib +
'/firmware/xilinx/' + name )
+ d.setVar('FILES:' + pn + '-' + name, baselib +
'/firmware/xilinx/' + name )
d.setVar('HDF_LIST', ' '.join(hdflist))
extrapackages = [pn + '-{0}'.format(i) for i in
hdflist]
packages = packages + extrapackages
@@ -186,5 +186,5 @@ python () {
#put back base package when setting RDEPENDS
extrapackages.append(pn + '-base')
- d.setVar('RDEPENDS_'+pn , ' '.join(extrapackages))
+ d.setVar('RDEPENDS:'+pn , ' '.join(extrapackages))
}
diff --git a/recipes-bsp/fsboot/fs-boot_git.bb
b/recipes-bsp/fsboot/fs-boot_git.bb
index 8d5e6623558f..f9a7f1f7c216 100644
--- a/recipes-bsp/fsboot/fs-boot_git.bb
+++ b/recipes-bsp/fsboot/fs-boot_git.bb
@@ -8,7 +8,7 @@ MB_BAREMETAL_TOOLCHAIN_PATH_ADD =
"${XILINX_SDK_TOOLCHAIN}/gnu/microblaze/lin/bi
PATH =. "${MB_BAREMETAL_TOOLCHAIN_PATH_ADD}"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_microblaze = "microblaze"
+COMPATIBLE_MACHINE:microblaze = "microblaze"
XSCTH_APP = "mba_fs_boot"
XSCTH_MISC = " -hdf_type ${HDF_EXT}"
@@ -22,6 +22,6 @@ do_compile() {
oe_runmake -C ${XSCTH_WS}/${XSCTH_PROJ} ${EXTRA_OEMAKE_APP} -j 1
}
-do_deploy_append() {
+do_deploy:append() {
ln -sf ${PN}-${MACHINE}.elf ${DEPLOYDIR}/fsboot-${MACHINE}.elf
}
diff --git a/recipes-bsp/hdf/external-hdf.bb b/recipes-bsp/hdf/external-hdf.bb
index 26d74dac720c..5feaa41efea3 100644
--- a/recipes-bsp/hdf/external-hdf.bb
+++ b/recipes-bsp/hdf/external-hdf.bb
@@ -20,7 +20,7 @@ HDF_EXT ?= "xsa"
SRC_URI = "${HDF_BASE}${HDF_PATH};${BRANCHARG}"
-COMPATIBLE_HOST_xilinx-standalone = "${HOST_SYS}"
+COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}"
PACKAGE_ARCH ?= "${MACHINE_ARCH}"
S = "${WORKDIR}/git"
@@ -60,5 +60,5 @@ addtask do_check before do_deploy
addtask do_deploy after do_install
PACKAGES = ""
-FILES_${PN}= "/opt/xilinx/hw-design/design.xsa"
+FILES:${PN}= "/opt/xilinx/hw-design/design.xsa"
SYSROOT_DIRS += "/opt"
diff --git a/recipes-bsp/imgrcry/imgrcry_git.bb
b/recipes-bsp/imgrcry/imgrcry_git.bb
index f62113c18892..aa44b4c77977 100644
--- a/recipes-bsp/imgrcry/imgrcry_git.bb
+++ b/recipes-bsp/imgrcry/imgrcry_git.bb
@@ -7,11 +7,11 @@ inherit xsctapp xsctyaml deploy
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-XSCTH_APP_zynqmp = "Image Recovery"
+XSCTH_APP:zynqmp = "Image Recovery"
-do_configure_append () {
+do_configure:append () {
cat > ${WORKDIR}/${PN}.bif << EOF
the_ROM_image:
{
@@ -22,11 +22,11 @@ cat > ${WORKDIR}/${PN}.bif << EOF
EOF
}
-do_compile_append () {
+do_compile:append () {
bootgen -image ${WORKDIR}/${PN}.bif -arch ${SOC_FAMILY} -w -o
${B}/${XSCTH_PROJ}/${PN}.bin
}
-do_deploy_append () {
+do_deploy:append () {
install -Dm 0644 ${B}/${XSCTH_PROJ}/${PN}.bin
${DEPLOYDIR}/${XSCTH_BASE_NAME}.bin
ln -sf ${XSCTH_BASE_NAME}.bin ${DEPLOYDIR}/${PN}-${MACHINE}.bin
diff --git a/recipes-bsp/imgsel/imgsel_git.bb b/recipes-bsp/imgsel/imgsel_git.bb
index a439faa8e38e..6c0ac0367287 100644
--- a/recipes-bsp/imgsel/imgsel_git.bb
+++ b/recipes-bsp/imgsel/imgsel_git.bb
@@ -8,11 +8,11 @@ inherit xsctapp xsctyaml deploy
PARALLEL_MAKE = "-j 1"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-XSCTH_APP_zynqmp = "Image Selector"
+XSCTH_APP:zynqmp = "Image Selector"
-do_configure_append () {
+do_configure:append () {
# Required for SOM only
sed -i "s|//#define XIS_UPDATE_A_B_MECHANISM|#define
XIS_UPDATE_A_B_MECHANISM|g" ${B}/${XSCTH_PROJ}/xis_config.h
sed -i "s|#define XIS_GET_BOARD_PARAMS|//#define
XIS_GET_BOARD_PARAMS|g" ${B}/${XSCTH_PROJ}/xis_config.h
@@ -25,11 +25,11 @@ cat > ${WORKDIR}/${PN}.bif << EOF
EOF
}
-do_compile_append () {
+do_compile:append () {
bootgen -image ${WORKDIR}/${PN}.bif -arch ${SOC_FAMILY} -w -o
${B}/${XSCTH_PROJ}/${PN}.bin
}
-do_deploy_append () {
+do_deploy:append () {
install -Dm 0644 ${B}/${XSCTH_PROJ}/${PN}.bin
${DEPLOYDIR}/${XSCTH_BASE_NAME}.bin
ln -sf ${XSCTH_BASE_NAME}.bin ${DEPLOYDIR}/${PN}-${MACHINE}.bin
}
diff --git a/recipes-bsp/libdfx/libdfx_1.0.bb b/recipes-bsp/libdfx/libdfx_1.0.bb
index 1712b2090f99..f6e033a83bfa 100644
--- a/recipes-bsp/libdfx/libdfx_1.0.bb
+++ b/recipes-bsp/libdfx/libdfx_1.0.bb
@@ -11,14 +11,14 @@ SRC_URI = "${REPO};${BRANCHARG}"
SRCREV = "6aec15214bf59ece3bb13b51d2d26dd899ba9389"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
S = "${WORKDIR}/git"
inherit cmake
-RDEPENDS_${PN} = "${PN}-staticdev"
+RDEPENDS:${PN} = "${PN}-staticdev"
PACKAGES =+ "${PN}-examples"
do_install () {
@@ -30,5 +30,5 @@ do_install () {
install -m 0755 ${B}/apps/dfx_app ${D}${bindir}
}
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-examples = "1"
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-examples = "1"
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
b/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
index 2441b0da3c10..96115e154b2b 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
@@ -14,7 +14,7 @@ EXTRA_OEMAKE +=
"${@'EXT_DTB=${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME}' if (d.ge
UBOOTELF_NODTB_IMAGE ?= "u-boot-nodtb.elf"
UBOOTELF_NODTB_BINARY ?= "u-boot"
-do_deploy_prepend() {
+do_deploy:prepend() {
cd ${B}
if [ -f "${UBOOTELF_NODTB_BINARY}" ]; then
diff --git a/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
b/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
index ac5aaf6281e8..e368cd86ee73 100644
--- a/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
+++ b/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
@@ -21,28 +21,28 @@ PV = "xilinx+git${SRCPV}"
PACKAGE_ARCH ?= "${MACHINE_ARCH}"
COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_zynq = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
XSCTH_BUILD_CONFIG ?= ""
DT_FILES_PATH = "${XSCTH_WS}/${XSCTH_PROJ}"
-DT_INCLUDE_append = " ${WORKDIR}"
+DT_INCLUDE:append = " ${WORKDIR}"
DT_PADDING_SIZE = "0x1000"
UBOOT_DTS ?= ""
XSCTH_MISC = " -hdf_type ${HDF_EXT}"
XSCTH_APP = "device-tree"
-YAML_DT_BOARD_FLAGS_zynqmp ?= ""
-YAML_DT_BOARD_FLAGS_versal ?= ""
-YAML_DT_BOARD_FLAGS_zynq ?= ""
+YAML_DT_BOARD_FLAGS:zynqmp ?= ""
+YAML_DT_BOARD_FLAGS:versal ?= ""
+YAML_DT_BOARD_FLAGS:zynq ?= ""
UBOOT_DTS_NAME = "u-boot"
do_configure[dirs] += "${DT_FILES_PATH}"
-SRC_URI_append = "${@" ".join(["file://%s" % f for f in (d.getVar('UBOOT_DTS')
or "").split()])}"
+SRC_URI:append = "${@" ".join(["file://%s" % f for f in (d.getVar('UBOOT_DTS')
or "").split()])}"
-do_configure_prepend () {
+do_configure:prepend () {
if [ ! -z "${UBOOT_DTS}" ]; then
for f in ${UBOOT_DTS}; do
cp ${WORKDIR}/${f} ${DT_FILES_PATH}/
@@ -55,7 +55,7 @@ do_configure_prepend () {
#Both linux dtb and uboot dtb are installing
#system-top.dtb for uboot env recipe while do_prepare_recipe_sysroot
#moving system-top.dts to othername.
-do_compile_prepend() {
+do_compile:prepend() {
import shutil
listpath = d.getVar("DT_FILES_PATH")
if os.path.exists(os.path.join(listpath, "system.dts")):
diff --git a/recipes-openamp/examples/openamp-fw.inc
b/recipes-openamp/examples/openamp-fw.inc
index a651bed46811..e09558c212a1 100644
--- a/recipes-openamp/examples/openamp-fw.inc
+++ b/recipes-openamp/examples/openamp-fw.inc
@@ -7,12 +7,12 @@ LICENSE = "BSD"
PARALLEL_MAKE = "-j 1"
COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynq = "zynq"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:zynq = "zynq"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:versal = "versal"
-XSCTH_APP_COMPILER_FLAGS_append_zynqmp = " -mfloat-abi=hard "
-XSCTH_APP_COMPILER_FLAGS_append_versal = " -mfloat-abi=hard "
+XSCTH_APP_COMPILER_FLAGS:append:zynqmp = " -mfloat-abi=hard "
+XSCTH_APP_COMPILER_FLAGS:append:versal = " -mfloat-abi=hard "
YAML_BSP_CONFIG += "WITH_PROXY"
YAML_BSP_CONFIG += "${@bb.utils.contains('SOC_FAMILY', 'zynq',
'extra_compiler_flags', '', d)}"
@@ -22,11 +22,11 @@ YAML_BSP_CONFIG[extra_compiler_flags] = "append,-DUSE_AMP=1"
FW_OS_NAME ?= "standalone"
XSCTH_MISC = "-osname ${FW_OS_NAME}"
-XSCTH_PROC_IP_versal ?= "psv_cortexr5"
-XSCTH_PROC_IP_zynqmp ?= "psu_cortexr5"
-XSCTH_PROC_zynq ?= "ps7_cortexa9_1"
+XSCTH_PROC_IP:versal ?= "psv_cortexr5"
+XSCTH_PROC_IP:zynqmp ?= "psu_cortexr5"
+XSCTH_PROC:zynq ?= "ps7_cortexa9_1"
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
FW_LIB_DIR = "/lib/firmware"
@@ -37,4 +37,4 @@ do_install() {
install -m 0644 ${src} ${dest}
}
-FILES_${PN} = "${FW_LIB_DIR}/${OPENAMP_FW_NAME}"
+FILES:${PN} = "${FW_LIB_DIR}/${OPENAMP_FW_NAME}"
diff --git a/recipes-utils/mb-realoc/mb-realoc.bb
b/recipes-utils/mb-realoc/mb-realoc.bb
index b34cab244b80..22b9984432fb 100644
--- a/recipes-utils/mb-realoc/mb-realoc.bb
+++ b/recipes-utils/mb-realoc/mb-realoc.bb
@@ -6,8 +6,8 @@ PROVIDES = "virtual/elfrealloc"
inherit deploy
-FILESEXTRAPATHS_append := ":${XLNX_SCRIPTS_DIR}"
-SRC_URI_append = " file://mb-realoc"
+FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
+SRC_URI:append = " file://mb-realoc"
PV = "0.1"
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4912):
https://lists.yoctoproject.org/g/meta-xilinx/message/4912
Mute This Topic: https://lists.yoctoproject.org/mt/84943737/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
