From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- recipes-bsp/alsa-state/alsa-state.bbappend | 16 +++++----- recipes-bsp/atf/qoriq-atf_1.5.bb | 20 ++++++------- recipes-bsp/atf/qoriq-atf_2.3.bb | 6 ++-- recipes-bsp/boot-format/boot-format_git.bb | 2 +- recipes-bsp/ddr-phy/ddr-phy_git.bb | 2 +- .../dp-firmware-cadence_20.04.bb | 2 +- recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb | 4 +-- recipes-bsp/firmware-imx/firmware-imx_8.12.bb | 6 ++-- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 6 ++-- .../firmware-imx/firmware-sof-imx_1.5.0-3.bb | 2 +- recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb | 2 +- recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb | 2 +- recipes-bsp/firmware-qca/qca-tools_3.0.2.bb | 4 +-- recipes-bsp/formfactor/formfactor_%.bbappend | 2 +- recipes-bsp/imx-atf/imx-atf_2.4.bb | 2 +- recipes-bsp/imx-lib/imx-lib_git.bb | 18 ++++++------ recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 22 +++++++------- .../imx-sc-firmware/imx-sc-firmware_1.9.0.bb | 8 ++--- recipes-bsp/imx-test/imx-test_00.00.00.bb | 2 +- recipes-bsp/imx-test/imx-test_git.bb | 34 +++++++++++----------- recipes-bsp/imx-uuc/imx-uuc_git.bb | 2 +- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb | 2 +- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb | 8 ++--- .../imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb | 10 +++---- recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb | 2 +- recipes-bsp/inphi/inphi_git.bb | 2 +- recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb | 4 +-- recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb | 12 ++++---- .../libimxdmabuffer/libimxdmabuffer_1.0.1.bb | 12 ++++---- recipes-bsp/ls2-phy/ls2-phy_git.bb | 2 +- recipes-bsp/mc-utils/mc-utils_git.bb | 10 +++---- recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb | 4 +-- recipes-bsp/qe-ucode/qe-ucode_git.bb | 2 +- recipes-bsp/rcw/rcw_git.bb | 8 ++--- recipes-bsp/u-boot/libubootenv_%.bbappend | 4 +-- recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb | 2 +- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb | 8 ++--- recipes-bsp/u-boot/u-boot-fslc_2021.07.bb | 4 +-- recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | 2 +- recipes-bsp/u-boot/u-boot-imx_2021.04.bb | 2 +- recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb | 20 ++++++------- recipes-bsp/uefi/uefi_git.bb | 2 +- 42 files changed, 143 insertions(+), 143 deletions(-) (limited to 'recipes-bsp') diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 3a398b221..943313072 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,10 +1,10 @@ # Append path for freescale layer to include alsa-state asound.conf -FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS_prepend_use-mainline-bsp := "${THISDIR}/${PN}/imx:" +FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:" +FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:" +FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:" +FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx7 = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx8 = "${MACHINE_ARCH}" -PACKAGE_ARCH_use-mainline-bsp = "${MACHINE_ARCH}" +PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}" +PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}" +PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}" +PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}" diff --git a/recipes-bsp/atf/qoriq-atf_1.5.bb b/recipes-bsp/atf/qoriq-atf_1.5.bb index 192083348..f26577269 100644 --- a/recipes-bsp/atf/qoriq-atf_1.5.bb +++ b/recipes-bsp/atf/qoriq-atf_1.5.bb @@ -8,7 +8,7 @@ PV = "1.5+git${SRCPV}" inherit deploy DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native" -DEPENDS_append_lx2160a = " ddr-phy" +DEPENDS:append:lx2160a = " ddr-phy" do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" S = "${WORKDIR}/git" @@ -21,12 +21,12 @@ COMPATIBLE_MACHINE = "(qoriq)" PACKAGE_ARCH = "${MACHINE_ARCH}" PLATFORM = "${MACHINE}" -PLATFORM_ls1088ardb-pb = "ls1088ardb" +PLATFORM:ls1088ardb-pb = "ls1088ardb" PLATFORM_ADDITIONAL_TARGET ??= "" -PLATFORM_ADDITIONAL_TARGET_ls1012afrwy = "ls1012afrwy_512mb" +PLATFORM_ADDITIONAL_TARGET:ls1012afrwy = "ls1012afrwy_512mb" RCW_FOLDER ?= "${MACHINE}" -RCW_FOLDER_ls1088ardb-pb = "ls1088ardb" +RCW_FOLDER:ls1088ardb-pb = "ls1088ardb" # requires CROSS_COMPILE set by hand as there is no configure script export CROSS_COMPILE="${TARGET_PREFIX}" @@ -56,16 +56,16 @@ PACKAGECONFIG[optee] = ",,optee-os-qoriq" uboot_boot_sec ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot" uboot_boot ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa" rcw ?= "" -rcw_ls1012a = "_default" +rcw:ls1012a = "_default" rcwsec ?= "_sben" chassistype ?= "ls2088_1088" -chassistype_ls1012a = "ls104x_1012" -chassistype_ls1043a = "ls104x_1012" -chassistype_ls1046a = "ls104x_1012" +chassistype:ls1012a = "ls104x_1012" +chassistype:ls1043a = "ls104x_1012" +chassistype:ls1046a = "ls104x_1012" ddrphyopt ?= "" -ddrphyopt_lx2160a = "fip_ddr_sec" +ddrphyopt:lx2160a = "fip_ddr_sec" do_configure[noexec] = "1" @@ -242,5 +242,5 @@ do_deploy() { fi } addtask deploy after do_install -FILES_${PN} += "/boot" +FILES:${PN} += "/boot" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/atf/qoriq-atf_2.3.bb b/recipes-bsp/atf/qoriq-atf_2.3.bb index aed32851b..f2922c91a 100644 --- a/recipes-bsp/atf/qoriq-atf_2.3.bb +++ b/recipes-bsp/atf/qoriq-atf_2.3.bb @@ -47,7 +47,7 @@ do_compile() { if [ "${NXP_COT}" = "true" -a "${ARM_COT}" = "true" ]; then bbfatal " \ Error!, Both ARM CoT and NXP CoT are enabled. Only one CoT is built in a yocto build, \ - Don't add nxp-cot and arm-cot into DISTRO_FEATURES_append at the same time." + Don't add nxp-cot and arm-cot into DISTRO_FEATURES:append at the same time." fi if [ "${NXP_COT}" = "true" ]; then @@ -160,7 +160,7 @@ do_install() { do_deploy() { if [ "${ARM_COT}" = "true" ]; then - outputdir="atf_arm-cot" + outputdir="atf:arm-cot" elif [ "${NXP_COT}" = "true" ]; then outputdir="atf_nxp-cot" else @@ -171,5 +171,5 @@ do_deploy() { cp -fr ${D}/boot/atf/* ${DEPLOYDIR}/${outputdir}/ } addtask deploy after do_install -FILES_${PN} += "/boot" +FILES:${PN} += "/boot" COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb index 92ec83075..584c5c68f 100644 --- a/recipes-bsp/boot-format/boot-format_git.bb +++ b/recipes-bsp/boot-format/boot-format_git.bb @@ -15,6 +15,6 @@ do_install(){ } PACKAGES =+ "${PN}-config" -FILES_${PN}-config += "${datadir}/*" +FILES:${PN}-config += "${datadir}/*" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb index fa8833fdd..6e68bd026 100644 --- a/recipes-bsp/ddr-phy/ddr-phy_git.bb +++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb @@ -38,7 +38,7 @@ do_deploy () { addtask deploy before do_populate_sysroot after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_20.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_20.04.bb index e8db54566..7b77e6f89 100644 --- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_20.04.bb +++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_20.04.bb @@ -23,7 +23,7 @@ do_deploy () { addtask deploy before do_build after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(qoriq-arm64)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb index 650c1cfde..6ea16d5be 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb @@ -19,5 +19,5 @@ addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx8)" -COMPATIBLE_MACHINE_mx8m = "(^$)" -COMPATIBLE_MACHINE_mx8x = "(^$)" +COMPATIBLE_MACHINE:mx8m = "(^$)" +COMPATIBLE_MACHINE:mx8x = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.12.bb b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb index 8ff4a3216..68539a616 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.12.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb @@ -65,7 +65,7 @@ do_install() { # as second one, and for every file match - it creates a separate package, # which contains only files that matches the pattern. # -python populate_packages_prepend() { +python populate_packages:prepend() { easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', output_pattern='firmware-imx-easrc-%s', @@ -123,7 +123,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu # files it makes no sense. PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" -FILES_${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" -FILES_${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/" +FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" +FILES:${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/" COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index 0f0a2af0f..287b1cffe 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit allarch CLEANBROKEN = "1" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" do_compile() { : @@ -38,9 +38,9 @@ PACKAGES =+ " \ ${PN}-bcm4359-pcie \ " -FILES_${PN}-bcm4359-pcie = " \ +FILES:${PN}-bcm4359-pcie = " \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4359-pcie.* \ ${sysconfdir}/firmware/BCM4349B1_*.hcd \ " -RPROVIDES_${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie" +RPROVIDES:${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie" diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb index 22f4c25fa..2ce983441 100644 --- a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb +++ b/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb @@ -21,4 +21,4 @@ do_install() { cp -r sof* ${D}${nonarch_base_libdir}/firmware/imx/ } -FILES_${PN} = "${nonarch_base_libdir}/firmware/imx" +FILES:${PN} = "${nonarch_base_libdir}/firmware/imx" diff --git a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb index 47b289afe..a625a9d53 100644 --- a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb +++ b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb @@ -19,7 +19,7 @@ do_install () { cp -r ${S}/1CQ_QCA6174A_LEA_2.0/lib/firmware ${D}${base_libdir} } -FILES_${PN} = " \ +FILES:${PN} = " \ ${sysconfdir}/bluetooth/firmware.conf \ ${base_libdir}/firmware/qca6174 \ ${base_libdir}/firmware/wlan \ diff --git a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb index 26c41d503..d6bf5caf6 100644 --- a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb +++ b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb @@ -19,7 +19,7 @@ do_install () { cp -r ${S}/1PJ_QCA9377-3_LEA_3.0/lib/firmware ${D}${base_libdir} } -FILES_${PN} = " \ +FILES:${PN} = " \ ${sysconfdir}/bluetooth/firmware.conf \ ${base_libdir}/firmware/qca \ ${base_libdir}/firmware/qca9377 \ diff --git a/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb b/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb index e996c62de..fd0c2e742 100644 --- a/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb +++ b/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb @@ -9,7 +9,7 @@ LICENSE = "Proprietary" DEPENDS = "libnl zlib" FCC_TOOLS_FOLDER ?= "qca9377_qca6174_arm32" -FCC_TOOLS_FOLDER_aarch64 = "qca9377_qca6174_arm64" +FCC_TOOLS_FOLDER:aarch64 = "qca9377_qca6174_arm64" do_install() { install -d ${D}${sbindir}/fcc_tools @@ -17,4 +17,4 @@ do_install() { } COMPATIBLE_HOST = '(aarch64|arm).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/recipes-bsp/formfactor/formfactor_%.bbappend b/recipes-bsp/formfactor/formfactor_%.bbappend index 15f8f4e8c..83cce1310 100644 --- a/recipes-bsp/formfactor/formfactor_%.bbappend +++ b/recipes-bsp/formfactor/formfactor_%.bbappend @@ -1,2 +1,2 @@ # Append path for i.MX custom matchconfig -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb index f4db002be..536a0a737 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb @@ -27,7 +27,7 @@ EXTRA_OEMAKE += " \ BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" -CFLAGS_remove_mx8mq = "-O2" +CFLAGS:remove:mx8mq = "-O2" do_compile() { # Clear LDFLAGS to avoid the option -Wl recognize issue diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index c56190702..a296b185d 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -20,15 +20,15 @@ S = "${WORKDIR}/git" inherit use-imx-headers -PLATFORM_mx6q = "IMX6Q" -PLATFORM_mx6dl = "IMX6Q" -PLATFORM_mx6sl = "IMX6S" -PLATFORM_mx6sll = "IMX6UL" -PLATFORM_mx6sx = "IMX6S" -PLATFORM_mx6ul = "IMX6UL" -PLATFORM_mx6ull = "IMX6UL" -PLATFORM_mx7d = "IMX7" -PLATFORM_mx7ulp = "IMX7" +PLATFORM:mx6q = "IMX6Q" +PLATFORM:mx6dl = "IMX6Q" +PLATFORM:mx6sl = "IMX6S" +PLATFORM:mx6sll = "IMX6UL" +PLATFORM:mx6sx = "IMX6S" +PLATFORM:mx6ul = "IMX6UL" +PLATFORM:mx6ull = "IMX6UL" +PLATFORM:mx7d = "IMX7" +PLATFORM:mx7ulp = "IMX7" PARALLEL_MAKE="-j 1" EXTRA_OEMAKE = "" diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 422670bed..1425c5a31 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -10,8 +10,8 @@ SECTION = "BSP" inherit use-imx-security-controller-firmware IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" -IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m" -IMX_EXTRA_FIRMWARE_mx8x = "imx-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m" +IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco" DEPENDS += " \ u-boot \ ${IMX_EXTRA_FIRMWARE} \ @@ -20,7 +20,7 @@ DEPENDS += " \ " # xxd is a dependency of fspi_packer.sh DEPENDS += "xxd-native" -DEPENDS_append_mx8m = " u-boot-mkimage-native dtc-native" +DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" @@ -41,7 +41,7 @@ do_compile[depends] += " \ SC_FIRMWARE_NAME ?= "scfw_tcm.bin" ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin" -ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" +ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" UBOOT_NAME = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin" @@ -58,16 +58,16 @@ IMXBOOT_TARGETS ?= \ 'flash_multi_cores flash_dcd', d), d)}" BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" -BOOT_STAGING_mx8m = "${S}/iMX8M" -BOOT_STAGING_mx8dx = "${S}/iMX8QX" +BOOT_STAGING:mx8m = "${S}/iMX8M" +BOOT_STAGING:mx8dx = "${S}/iMX8QX" SOC_FAMILY = "INVALID" -SOC_FAMILY_mx8 = "mx8" -SOC_FAMILY_mx8m = "mx8m" -SOC_FAMILY_mx8x = "mx8x" +SOC_FAMILY:mx8 = "mx8" +SOC_FAMILY:mx8m = "mx8m" +SOC_FAMILY:mx8x = "mx8x" REV_OPTION ?= "" -REV_OPTION_mx8qxp = \ +REV_OPTION:mx8qxp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ 'REV=C0', d)}" @@ -199,6 +199,6 @@ do_deploy() { addtask deploy before do_build after do_compile PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "/boot" +FILES:${PN} = "/boot" COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb index b8c3d3c3c..6eb65b811 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb @@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "df0fe17c93e4c2835542d6b1b2557524f034e378b643100cd838225e82 BOARD_TYPE ?= "mek" SC_FIRMWARE_NAME ?= "INVALID" -SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME_mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME_mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" symlink_name = "scfw_tcm.bin" diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb index c29e6a620..070fbd304 100644 --- a/recipes-bsp/imx-test/imx-test_00.00.00.bb +++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 118590d5a..a5f33d839 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -9,9 +9,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" DEPENDS = "alsa-lib libdrm" -DEPENDS_append_mx6 = " imx-lib" -DEPENDS_append_mx7 = " imx-lib" -DEPENDS_append_imxvpu = " virtual/imxvpu" +DEPENDS:append:mx6 = " imx-lib" +DEPENDS:append:mx7 = " imx-lib" +DEPENDS:append:imxvpu = " virtual/imxvpu" PE = "1" PV = "7.0+${SRCPV}" @@ -29,22 +29,22 @@ inherit module-base use-imx-headers INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -PLATFORM_mx6q = "IMX6Q" -PLATFORM_mx6dl = "IMX6Q" -PLATFORM_mx6sl = "IMX6SL" -PLATFORM_mx6sll = "IMX6SL" -PLATFORM_mx6sx = "IMX6SX" -PLATFORM_mx6ul = "IMX6UL" -PLATFORM_mx7d = "IMX7D" -PLATFORM_mx7ulp = "IMX7D" -PLATFORM_mx8 = "IMX8" +PLATFORM:mx6q = "IMX6Q" +PLATFORM:mx6dl = "IMX6Q" +PLATFORM:mx6sl = "IMX6SL" +PLATFORM:mx6sll = "IMX6SL" +PLATFORM:mx6sx = "IMX6SX" +PLATFORM:mx6ul = "IMX6UL" +PLATFORM:mx7d = "IMX7D" +PLATFORM:mx7ulp = "IMX7D" +PLATFORM:mx8 = "IMX8" PARALLEL_MAKE = "-j 1" EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_append_imxvpu = " vpu" -PACKAGECONFIG_append_mx8m = " swpdm" +PACKAGECONFIG:append:imxvpu = " vpu" +PACKAGECONFIG:append:mx8m = " swpdm" PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" @@ -76,7 +76,7 @@ do_install() { install -m 0644 ${WORKDIR}/memtool_profile ${D}/home/root/.profile } -FILES_${PN} += "/unit_tests /home/root/.profile" -RDEPENDS_${PN} = "bash" +FILES:${PN} += "/unit_tests /home/root/.profile" +RDEPENDS:${PN} = "bash" -FILES_${PN}-dbg += "/unit_tests/.debug" +FILES:${PN}-dbg += "/unit_tests/.debug" diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index bfa6607b9..02331a805 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb @@ -16,6 +16,6 @@ SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc" S = "${WORKDIR}/git" -FILES_${PN} += "/linuxrc /fat" +FILES:${PN} += "/linuxrc /fat" COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb index 58a140b48..33208bdff 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb @@ -30,6 +30,6 @@ do_install () { rm ${D}${D_SUBDIR}/${SCR} } -FILES_${PN} = "/" +FILES:${PN} = "/" COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb index 88b9ee0ef..d362fce3b 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" DEPENDS = "imx-vpu-hantro" -DEPENDS_append_mx8mp = " imx-vpu-hantro-vc" +DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" SRC_URI = " \ ${FSL_MIRROR}/${BP}.tar.gz \ @@ -13,9 +13,9 @@ SRC_URI = " \ SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2" SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8" -PLATFORM_mx8mm = "IMX8MM" -PLATFORM_mx8mq = "IMX8MQ" -PLATFORM_mx8mp = "IMX8MP" +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "IMX8MP" EXTRA_OEMAKE = " \ CROSS_COMPILE="${HOST_PREFIX}" \ diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb index 20ac87c74..2ecb1e4b3 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb @@ -14,9 +14,9 @@ inherit fsl-eula-unpack use-imx-headers PARALLEL_MAKE="-j 1" -PLATFORM_mx8mm = "IMX8MM" -PLATFORM_mx8mq = "IMX8MQ" -PLATFORM_mx8mp = "IMX8MP" +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "IMX8MP" EXTRA_OEMAKE = " \ CROSS_COMPILE="${HOST_PREFIX}" \ @@ -28,8 +28,8 @@ do_install () { oe_runmake install DEST_DIR="${D}" } -FILES_${PN} += "/unit_tests" +FILES:${PN} += "/unit_tests" -RDEPENDS_${PN} += "imx-vpu-hantro-daemon" +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 8c6492c54..95252dae4 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb @@ -7,7 +7,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" PROVIDES = "virtual/imxvpu" -RPROVIDES_${PN} = "virtual/imxvpu" +RPROVIDES:${PN} = "virtual/imxvpu" PE = "1" diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb index 3f3c5f28e..314f09d46 100644 --- a/recipes-bsp/inphi/inphi_git.bb +++ b/recipes-bsp/inphi/inphi_git.bb @@ -21,7 +21,7 @@ do_deploy () { addtask deploy before do_build after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(qoriq-arm64)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb index e7d4b6525..dc6e2d7ea 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb @@ -21,7 +21,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "enable" -FILES_${PN} = "${libdir} /opt" -INSANE_SKIP_${PN} = "file-rdeps already-stripped" +FILES:${PN} = "${libdir} /opt" +INSANE_SKIP:${PN} = "file-rdeps already-stripped" COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb index ad44065ae..a6286cf3b 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb @@ -22,7 +22,7 @@ OECMAKE_SOURCEPATH = "${S}/appshell" # Use make instead of ninja OECMAKE_GENERATOR = "Unix Makefiles" -SYSTEMD_SERVICE_${PN} = "imx8-isp.service" +SYSTEMD_SERVICE:${PN} = "imx8-isp.service" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=release \ @@ -42,7 +42,7 @@ EXTRA_OECMAKE += " \ -Wno-dev \ " -do_configure_prepend() { +do_configure:prepend() { export SDKTARGETSYSROOT=${STAGING_DIR_HOST} } @@ -74,15 +74,15 @@ do_install() { # The build contains a mix of versioned and unversioned libraries, so # the default packaging configuration needs some modifications FILES_SOLIBSDEV = "" -FILES_${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-dev += " \ +FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-dev += " \ ${libdir}/libjsoncpp.so \ ${libdir}/libos08a20.so \ ${libdir}/libov2775.so \ " -INSANE_SKIP_${PN} = "rpaths" +INSANE_SKIP:${PN} = "rpaths" -RDEPENDS_${PN} = "libdrm libpython3" +RDEPENDS:${PN} = "libdrm libpython3" COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb index 726b1e16d..4b6aee0b5 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb @@ -29,12 +29,12 @@ LIBG2D_PACKAGECONFIG = "g2d" LIBG2D_PACKAGECONFIG_imxdpu = "" PACKAGECONFIG ?= " " -PACKAGECONFIG_append_imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" -PACKAGECONFIG_append_imxipu = " ipu" -PACKAGECONFIG_append_imxpxp = " pxp" -PACKAGECONFIG_append_mx8m = " ion dwl" -PACKAGECONFIG_append_mx8qm = " ion" -PACKAGECONFIG_append_mx8qxp = " ion" +PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" +PACKAGECONFIG:append:imxipu = " ipu" +PACKAGECONFIG:append:imxpxp = " pxp" +PACKAGECONFIG:append:mx8m = " ion dwl" +PACKAGECONFIG:append:mx8qm = " ion" +PACKAGECONFIG:append:mx8qxp = " ion" HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb index a1c412be3..dd5f8fc00 100644 --- a/recipes-bsp/ls2-phy/ls2-phy_git.bb +++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb @@ -21,7 +21,7 @@ do_deploy () { addtask deploy before do_build after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(qoriq)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index b3c79b991..fa7d36009 100644 --- a/recipes-bsp/mc-utils/mc-utils_git.bb +++ b/recipes-bsp/mc-utils/mc-utils_git.bb @@ -15,13 +15,13 @@ SRCREV = "8e0b863693fc2ccbc62a62c79b4e3db6da88c16e" S = "${WORKDIR}/git" MC_CFG ?= "" -MC_CFG_ls1088a = "ls1088a" +MC_CFG:ls1088a = "ls1088a" MC_CFG_ls2088a = "ls2088a" -MC_CFG_lx2160a = "lx2160a" -MC_CFG_lx2162aqds = "lx2162aqds" +MC_CFG:lx2160a = "lx2160a" +MC_CFG:lx2162aqds = "lx2162aqds" MC_FLAVOUR ?= "RDB" -MC_FLAVOUR_lx2162a = "" +MC_FLAVOUR:lx2162a = "" do_compile () { oe_runmake -C config @@ -47,5 +47,5 @@ do_deploy () { addtask deploy after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb index 24bb8d9f6..5c97486ea 100644 --- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -27,8 +27,8 @@ do_deploy () { addtask deploy after do_install -FILES_${PN} += "/lib/firmware /boot/" -INSANE_SKIP_${PN} += "arch already-stripped" +FILES:${PN} += "/lib/firmware /boot/" +INSANE_SKIP:${PN} += "arch already-stripped" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb index cecd59032..19cb79e00 100644 --- a/recipes-bsp/qe-ucode/qe-ucode_git.bb +++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb @@ -22,7 +22,7 @@ do_deploy () { addtask deploy before do_build after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot/*" +FILES:${PN}-image += "/boot/*" COMPATIBLE_MACHINE = "(qoriq)" PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index 693506157..88b7b9958 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -17,9 +17,9 @@ export PYTHON = "${USRBINPATH}/python3" M="${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}" BOARD_TARGETS="${M}" -BOARD_TARGETS_ls2088ardb="${M} ${M}_rev1.1" -BOARD_TARGETS_ls1088ardb-pb="ls1088ardb" -BOARD_TARGETS_lx2160ardb = "${M} ${M}_rev2" +BOARD_TARGETS:ls2088ardb="${M} ${M}_rev1.1" +BOARD_TARGETS:ls1088ardb-pb="ls1088ardb" +BOARD_TARGETS:lx2160ardb = "${M} ${M}_rev2" do_compile () { oe_runmake BOARDS="${BOARD_TARGETS}" DESTDIR=${D}/boot/rcw/ @@ -36,7 +36,7 @@ do_deploy () { addtask deploy after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/boot" +FILES:${PN}-image += "/boot" COMPATIBLE_MACHINE = "(qoriq)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend index 2633c3447..619b510e1 100644 --- a/recipes-bsp/u-boot/libubootenv_%.bbappend +++ b/recipes-bsp/u-boot/libubootenv_%.bbappend @@ -29,8 +29,8 @@ def fixup_uboot_config_dependency(d): # | Signed-off-by: Ming Liu # | Signed-off-by: Richard Purdie # `---- - ubootmachine = d.getVar("UBOOT_MACHINE_pn-%s" % imx_default_bootloader) - ubootconfig = (d.getVar("UBOOT_CONFIG_pn-%s" % imx_default_bootloader) or "").split() + ubootmachine = d.getVar("UBOOT_MACHINE:pn-%s" % imx_default_bootloader) + ubootconfig = (d.getVar("UBOOT_CONFIG:pn-%s" % imx_default_bootloader) or "").split() d.setVar("UBOOT_CONFIG", ubootconfig) d.setVar("UBOOT_MACHINE", ubootmachine) diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb index 7f02746b0..2e79166b2 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb @@ -2,7 +2,7 @@ # Copyright (C) 2014-2016 Freescale Semiconductor # Copyright 2017-2019 NXP -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:" require u-boot-fslc_${PV}.bb require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb index 2492f4503..a3a732ef3 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb @@ -7,9 +7,9 @@ DEPENDS = "bison-native dtc openssl" PROVIDES = "u-boot-mxsboot" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' do_compile () { oe_runmake -C ${S} O=${B} sandbox_defconfig @@ -27,6 +27,6 @@ do_install () { ln -sf uboot-mxsboot ${D}${bindir}/mxsboot } -COMPATIBLE_MACHINE_class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" +COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb index 4f97c722d..2e7bde383 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb @@ -12,7 +12,7 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native" # Location known to imx-boot component, where U-Boot artifacts # should be additionally deployed. -# See below note above do_deploy_append_mx8m for the purpose of +# See below note above do_deploy:append:mx8m for the purpose of # this delopyment location BOOT_TOOLS = "imx-boot-tools" @@ -48,7 +48,7 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ # starts to use it - below append would not be necessary. # Once all mx8m derivatives are migrated to use the 'flash.bin' boot # container - this append can be dropped completely. -do_deploy_append_mx8m() { +do_deploy:append:mx8m() { # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ]; then for config in ${UBOOT_MACHINE}; do diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb index 2b296c192..af5028896 100644 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb @@ -2,7 +2,7 @@ # Copyright (C) 2014-2016 Freescale Semiconductor # Copyright 2017-2019 NXP -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-imx:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:" require u-boot-imx_${PV}.bb require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index 6a279a125..bb5809e2a 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb @@ -7,7 +7,7 @@ require u-boot-imx-common_${PV}.inc PROVIDES += "u-boot" -do_deploy_append_mx8m() { +do_deploy:append:mx8m() { # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ] then diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb index 57f278031..69b03de17 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb @@ -19,14 +19,14 @@ SRCREV= "f46a944f715f284aff1d42c009680ffe0be4058f" S = "${WORKDIR}/git" B = "${WORKDIR}/build" -PV_append = "+fslgit" +PV:append = "+fslgit" LOCALVERSION = "+fsl" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native" -DEPENDS_append_qoriq-arm64 = " dtc-native" -DEPENDS_append_qoriq-arm = " dtc-native" -DEPENDS_append_qoriq-ppc = " boot-format-native" +DEPENDS:append:qoriq-arm64 = " dtc-native" +DEPENDS:append:qoriq-arm = " dtc-native" +DEPENDS:append:qoriq-ppc = " boot-format-native" python () { if d.getVar("TCMODE") == "external-fsl": @@ -41,8 +41,8 @@ python () { sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux' sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS') workdir = d.getVar('WORKDIR') - d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc') - d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib) + d.setVar('DEPENDS:append', ' lib32-gcc-cross-powerpc lib32-libgcc') + d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib) d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot') d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-') elif "fsl-lsch2-32b:" in arch: @@ -51,8 +51,8 @@ python () { sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux' sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS') workdir = d.getVar('WORKDIR') - d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc') - d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib) + d.setVar('DEPENDS:append', ' lib64-gcc-cross-aarch64 lib64-libgcc') + d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib) d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot') d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-') } @@ -66,7 +66,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' -do_compile_append_qoriq() { +do_compile:append:qoriq() { unset i j k for config in ${UBOOT_MACHINE}; do i=`expr $i + 1`; @@ -94,5 +94,5 @@ do_compile_append_qoriq() { PACKAGES += "${PN}-images" -FILES_${PN}-images += "/boot" +FILES:${PN}-images += "/boot" COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index 6351577e2..df77b4202 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -28,7 +28,7 @@ do_deploy () { addtask deploy before do_build after do_install PACKAGES += "${PN}-image" -FILES_${PN}-image += "/uefi/*" +FILES:${PN}-image += "/uefi/*" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -- cgit v1.2.3-54-g00ecf