From ce3cb2c58324d2544ae340f53c32bfc2dde2048d Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 10 Aug 2021 15:28:25 -0700 Subject: meta-nuvoton: Cleanup for Yocto override syntax change Cleanup with ``` convert-overrides.py meta-google ``` Left over `_`. ``` $ git grep "_[a-z0-9_/-]*[ :]" -- meta-nuvoton meta-nuvoton/conf/layer.conf:BBFILE_PATTERN_nuvoton-layer = "" meta-nuvoton/conf/layer.conf:LAYERVERSION_nuvoton-layer = "1" meta-nuvoton/conf/layer.conf:LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott" meta-nuvoton/conf/machine/include/nuvoton.inc:PREFERRED_PROVIDER_virtual/kernel ?= "linux-nuvoton" meta-nuvoton/conf/machine/include/nuvoton.inc:PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-nuvoton" meta-nuvoton/conf/machine/include/nuvoton.inc:PREFERRED_PROVIDER_u-boot ?= "u-boot-nuvoton" meta-nuvoton/conf/machine/include/nuvoton.inc:PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-nuvoton" meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb:do_install () { meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb:do_deploy () { meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb:addtask deploy before do_build after do_compile meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb:SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb:do_compile () { meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: oe_runmake ${UBOOT_MACHINE} meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: oe_runmake envtools meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb:do_install () { meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb:do_install:class-cross () { meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb: sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc:do_configure () { meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc: oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc: oe_runmake -C ${S} O=${B} oldconfig meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc:do_compile () { meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc: oe_runmake -C ${S} O=${B}/${config} ${config} meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc: oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc: oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc:do_install () { meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc:do_deploy () { meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc:addtask deploy before do_build after do_compile ``` Change-Id: Ic6969f12049c0d843009c4b754ab87ecff568a07 Signed-off-by: Willy Tu --- meta-nuvoton/conf/layer.conf | 2 +- meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc | 8 ++++---- meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb | 10 +++++----- meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc | 2 +- meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta-nuvoton') diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index 15d4b971b..946ac2374 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott honister" diff --git a/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc b/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc index 18730db69..b8c6d8c48 100644 --- a/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc +++ b/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc @@ -5,7 +5,7 @@ require conf/machine/include/arm/arch-armv7a.inc TUNEVALID[arm7a-novfp] = "Enable arm7a-novfp specific processor optimizations" AVAILTUNES += "arm7a-novfp" -ARMPKGARCH_tune-arm7a-novfp = "armv7a" -TUNE_FEATURES_tune-armv7a = "arm armv7a" -TUNE_FEATURES_tune-arm7a-novfp = "${TUNE_FEATURES_tune-armv7a} arm7a-novfp" -PACKAGE_EXTRA_ARCHS_tune-arm7a-novfp = "${PACKAGE_EXTRA_ARCHS_tune-armv7a}" +ARMPKGARCH:tune-arm7a-novfp = "armv7a" +TUNE_FEATURES:tune-armv7a = "arm armv7a" +TUNE_FEATURES:tune-arm7a-novfp = "${TUNE_FEATURES:tune-armv7a} arm7a-novfp" +PACKAGE_EXTRA_ARCHS:tune-arm7a-novfp = "${PACKAGE_EXTRA_ARCHS:tune-armv7a}" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb index 7fc880ffd..4ccfdd1d8 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb @@ -5,10 +5,10 @@ DEPENDS = "mtd-utils bison-native" PROVIDES += "u-boot-fw-utils" -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' -EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' inherit uboot-config @@ -25,13 +25,13 @@ do_install () { install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config } -do_install_class-cross () { +do_install:class-cross () { install -d ${D}${bindir_cross} install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv } -SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" +SYSROOT_PREPROCESS_FUNCS:class-cross = "uboot_fw_utils_cross" uboot_fw_utils_cross() { sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} } diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc index 60c722da5..40fb5ad4a 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc @@ -228,7 +228,7 @@ do_install () { } -FILES_${PN} = "/boot ${sysconfdir} ${datadir}" +FILES:${PN} = "/boot ${sysconfdir} ${datadir}" do_deploy () { if [ -n "${UBOOT_CONFIG}" ] diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc index fd680328a..d96579015 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc @@ -8,7 +8,7 @@ KCONFIG_MODE="--alldefconfig" KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" SRC_URI = "${KSRC}" -SRC_URI_append_npcm7xx = " file://defconfig" +SRC_URI:append:npcm7xx = " file://defconfig" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" -- cgit v1.2.3