From 2f44ba5a42966ac2cee77485209ec239123d7aa5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 12 Nov 2021 14:54:38 -0800 Subject: Convert to new override syntax Fix various overrides that have been missed in previous conversion. Signed-off-by: Mark Hatle --- .../recipes-bsp/device-tree/device-tree.bbappend | 4 ++-- .../recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 10 +++++----- .../recipes-kernel/linux/linux-xlnx_2021.2.bbappend | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'meta-xilinx-contrib') diff --git a/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend index 330548a8..57c08620 100644 --- a/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # device tree sources for MiniZed -COMPATIBLE_MACHINE_minized-zynq7 = ".*" -SRC_URI:append_minized-zynq7 = " file://minized-zynq7.dts" +COMPATIBLE_MACHINE:minized-zynq7 = ".*" +SRC_URI:append:minized-zynq7 = " file://minized-zynq7.dts" diff --git a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index b205d00d..e3072cbc 100644 --- a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,5 +1,5 @@ -SRC_URI:append_minized-zynq7 = " \ +SRC_URI:append:minized-zynq7 = " \ git://github.com/murata-wireless/cyw-fmac-nvram;protocol=git;branch=orga;destsuffix=cyw-fmac-nvram;name=cyw-fmac-nvram \ git://github.com/murata-wireless/cyw-bt-patch;protocol=git;branch=morty-orga;destsuffix=cyw-bt-patch;name=cyw-bt-patch \ git://github.com/murata-wireless/cyw-fmac-utils-imx32;protocol=git;branch=orga;destsuffix=cyw-fmac-utils-imx32;name=cyw-fmac-utils-imx32 \ @@ -10,7 +10,7 @@ SRCREV_cyw-bt-patch = "9216e0d9f778009b5667d032886dfd49174c4b3a" SRCREV_cyw-fmac-utils-imx32 = "060688dfe76df98751207c8146268ce7fd80b6ab" SRCREV_FORMAT = "default+cyw-fmac-nvram+cyw-bt-patch+cyw-fmac-utils-imx32" -do_install:append_minized-zynq7() { +do_install:append:minized-zynq7() { install -d ${D}${bindir} @@ -19,16 +19,16 @@ do_install:append_minized-zynq7() { install -m 0644 ${WORKDIR}/cyw-fmac-utils-imx32/wl ${D}${bindir} } -PACKAGES:prepend_minized-zynq7 = "\ +PACKAGES:prepend:minized-zynq7 = "\ ${PN}-bcm43430a1-hcd \ ${PN}-mfgtest \ " -FILES:${PN}-mfgtest_minized-zynq7 = " \ +FILES:${PN}-mfgtest:minized-zynq7 = " \ ${bindir}/wl \ " -FILES:${PN}-bcm43430:append_minized-zynq7 = " \ +FILES:${PN}-bcm43430:append:minized-zynq7 = " \ ${nonarch_base_libdir}/firmware/brcm/ brcmfmac43430-sdio.txt \ " diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend index 6cba54df..2ce919ac 100644 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend +++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend @@ -1,9 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:" -SRC_URI:append_zybo-linux-bd-zynq7 = " \ +SRC_URI:append:zybo-linux-bd-zynq7 = " \ file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \ file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \ file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \ " -SRC_URI:append_minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg" +SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg" -- cgit v1.2.3-54-g00ecf