From 2392e1f99d4e1cdf82e5780642dd856f2c48be72 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Aug 2021 15:31:09 -0700 Subject: [PATCH] recipes: Convert to newer override syntax Signed-off-by: Khem Raj --- README.md | 2 +- docs/Plasma-Mobile-on-Unleashed.md | 2 +- recipes-bsp/u-boot/u-boot_%.bbappend | 12 ++++++------ recipes-core/sysvinit/sysvinit-inittab_%.bbappend | 2 +- recipes-kernel/linux/linux-mainline-common.inc | 4 ++-- recipes-kernel/linux/linux-mainline_5.4.bb | 2 +- recipes-kernel/linux/linux-starfive-dev.bb | 2 +- recipes-kernel/linux/linux-starfive_5.12.bb | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 33c5df0..efa1fb3 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ TFTP_SERVER_IP = "127.0.0.1" To use the Microsemi expansion board with your HiFive Unleased add the following line to your local.conf. This tells the Unleashed to use a device tree with the PCIe device described: ```text -RISCV_SBI_FDT_freedom-u540 = "hifive-unleashed-a00-microsemi.dtb" +RISCV_SBI_FDT:freedom-u540 = "hifive-unleashed-a00-microsemi.dtb" ``` ### Sparse Image Creation diff --git a/docs/Plasma-Mobile-on-Unleashed.md b/docs/Plasma-Mobile-on-Unleashed.md index b208c15..4af10f9 100644 --- a/docs/Plasma-Mobile-on-Unleashed.md +++ b/docs/Plasma-Mobile-on-Unleashed.md @@ -46,7 +46,7 @@ EXTRA_USERS_PARAMS = "useradd kde; \ usermod -P kde kde;" ## Use the Microsemi Expansion board DT in OpenSBI (passed to the kernel) -RISCV_SBI_FDT_freedom-u540 = "HiFiveUnleashed-MicroSemi-Expansion.dtb" +RISCV_SBI_FDT:freedom-u540 = "HiFiveUnleashed-MicroSemi-Expansion.dtb" ## Install GPU driver for the GPU being used, in this example it's a Radeon R5 230 PACKAGECONFIG:append:pn-mesa = " r600" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index b524e7b..e62bc81 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,16 +1,16 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append_freedom-u540 = " \ +SRC_URI:append:freedom-u540 = " \ file://tftp-mmc-boot.txt \ " -SRC_URI:append_freedom-u540_sota = " file://uEnv.txt" +SRC_URI:append:freedom-u540_sota = " file://uEnv.txt" -DEPENDS:append_freedom-u540 = " u-boot-tools-native" +DEPENDS:append:freedom-u540 = " u-boot-tools-native" # Overwrite this for your server TFTP_SERVER_IP ?= "127.0.0.1" -do_configure:prepend_freedom-u540() { +do_configure:prepend:freedom-u540() { sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt if [ -f "${WORKDIR}/${UBOOT_ENV}.txt" ]; then @@ -19,7 +19,7 @@ do_configure:prepend_freedom-u540() { fi } -do_deploy:append_freedom-u540() { +do_deploy:append:freedom-u540() { if [ -f "${WORKDIR}/boot.scr.uimg" ]; then install -d ${DEPLOY_DIR_IMAGE} install -m 755 ${WORKDIR}/boot.scr.uimg ${DEPLOY_DIR_IMAGE} @@ -31,4 +31,4 @@ do_deploy:append_freedom-u540() { fi } -FILES:${PN}:append_freedom-u540 = " /boot/boot.scr.uimg" +FILES:${PN}:append:freedom-u540 = " /boot/boot.scr.uimg" diff --git a/recipes-core/sysvinit/sysvinit-inittab_%.bbappend b/recipes-core/sysvinit/sysvinit-inittab_%.bbappend index dbba8ba..c67c1ae 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_%.bbappend +++ b/recipes-core/sysvinit/sysvinit-inittab_%.bbappend @@ -1,4 +1,4 @@ -do_install:append_freedom-u540() { +do_install:append:freedom-u540() { sed -i -e 's#/bin/start_getty#/sbin/getty#g' ${D}${sysconfdir}/inittab sed -i '/tty1/d' ${D}${sysconfdir}/inittab } diff --git a/recipes-kernel/linux/linux-mainline-common.inc b/recipes-kernel/linux/linux-mainline-common.inc index fc417a5..de1326f 100644 --- a/recipes-kernel/linux/linux-mainline-common.inc +++ b/recipes-kernel/linux/linux-mainline-common.inc @@ -14,11 +14,11 @@ KCONFIG_MODE="--alldefconfig" KBUILD_DEFCONFIG:qemuriscv32 = "rv32_defconfig" KBUILD_DEFCONFIG:qemuriscv64 = "defconfig" -KBUILD_DEFCONFIG_freedom-u540 = "defconfig" +KBUILD_DEFCONFIG:freedom-u540 = "defconfig" COMPATIBLE_MACHINE = "(qemuriscv32|qemuriscv64|freedom-u540)" -KERNEL_DEVICETREE_freedom-u540 = "sifive/${RISCV_SBI_FDT}" +KERNEL_DEVICETREE:freedom-u540 = "sifive/${RISCV_SBI_FDT}" KERNEL_FEATURES:remove = "features/debug/printk.scc" KERNEL_FEATURES:remove = "features/kernel-sample/kernel-sample.scc" diff --git a/recipes-kernel/linux/linux-mainline_5.4.bb b/recipes-kernel/linux/linux-mainline_5.4.bb index 746c23f..d8cf9d5 100644 --- a/recipes-kernel/linux/linux-mainline_5.4.bb +++ b/recipes-kernel/linux/linux-mainline_5.4.bb @@ -9,7 +9,7 @@ SRC_URI = " \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git;branch=${BRANCH} \ " -SRC_URI:append_freedom-u540 = " \ +SRC_URI:append:freedom-u540 = " \ file://extra.cfg \ file://0001-PCI-microsemi-Add-host-driver-for-Microsemi-PCIe-con.patch \ file://0002-Microsemi-PCIe-expansion-board-DT-entry.patch \ diff --git a/recipes-kernel/linux/linux-starfive-dev.bb b/recipes-kernel/linux/linux-starfive-dev.bb index ca2813a..ec74a16 100644 --- a/recipes-kernel/linux/linux-starfive-dev.bb +++ b/recipes-kernel/linux/linux-starfive-dev.bb @@ -17,6 +17,6 @@ SRC_URI = "git://github.com/${FORK}/linux.git;protocol=git;branch=${BRANCH} \ LINUX_VERSION ?= "5.14.0" LINUX_VERSION_EXTENSION:append = "-starlight" -KBUILD_DEFCONFIG_beaglev-starlight-jh7100 = "beaglev_defconfig" +KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "beaglev_defconfig" COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100)" diff --git a/recipes-kernel/linux/linux-starfive_5.12.bb b/recipes-kernel/linux/linux-starfive_5.12.bb index b61ccc2..47264c6 100644 --- a/recipes-kernel/linux/linux-starfive_5.12.bb +++ b/recipes-kernel/linux/linux-starfive_5.12.bb @@ -19,6 +19,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" PV = "${LINUX_VERSION}+git${SRCPV}" KCONFIG_MODE = "--alldefconfig" -KBUILD_DEFCONFIG_beaglev-starlight-jh7100 = "starlight_defconfig" +KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "starlight_defconfig" COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100)"