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/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 ++++++++++---------- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'recipes-bsp/u-boot') 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)" -- cgit v1.2.3-54-g00ecf