diff options
Diffstat (limited to 'meta-raspberrypi/recipes-kernel')
4 files changed, 49 insertions, 49 deletions
diff --git a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb index d28e2c126c..ef8df32497 100644 --- a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb @@ -60,40 +60,40 @@ PACKAGES = "\ ${PN}-bcm4345c5-hcd \ " -LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-cypress-license = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-cypress-license = "Firmware-cypress-rpidistro" -FILES_${PN}-cypress-license = "\ +FILES:${PN}-cypress-license = "\ ${nonarch_base_libdir}/firmware/LICENCE.cypress-rpidistro \ " -FILES_${PN}-bcm43430a1-hcd = "\ +FILES:${PN}-bcm43430a1-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ " -FILES_${PN}-bcm43430b0-hcd = "\ +FILES:${PN}-bcm43430b0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \ " -FILES_${PN}-bcm4345c0-hcd = "\ +FILES:${PN}-bcm4345c0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \ " -FILES_${PN}-bcm4345c5-hcd = "\ +FILES:${PN}-bcm4345c5-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C5.hcd \ " -RDEPENDS_${PN}-bcm43430a1-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm43430b0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c5-hcd += "${PN}-cypress-license" -RCONFLICTS_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RREPLACES_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RCONFLICTS_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RREPLACES_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RCONFLICTS_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RREPLACES_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RCONFLICTS_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" -RREPLACES_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license" +RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RREPLACES:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" # Firmware files are generally not run on the CPU, so they can be # allarch despite being architecture specific diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index a091585a55..37e2e57093 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -75,38 +75,38 @@ PACKAGES = "\ ${PN}-bcm43456 \ " -LICENSE_${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" -FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" -FILES_${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" -RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43456 += "${PN}-broadcom-license" -RCONFLICTS_${PN}-bcm43430 = "\ +LICENSE:${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" +FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" +FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" +RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43456 += "${PN}-broadcom-license" +RCONFLICTS:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RREPLACES_${PN}-bcm43430 = "\ +RREPLACES:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RCONFLICTS_${PN}-bcm43455 = "\ +RCONFLICTS:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RREPLACES_${PN}-bcm43455 = "\ +RREPLACES:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RCONFLICTS_${PN}-bcm43456 = "\ +RCONFLICTS:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " -RREPLACES_${PN}-bcm43456 = "\ +RREPLACES:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index 683253cef7..ea47b5643b 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -18,14 +18,14 @@ SRC_URI += " \ " KCONFIG_MODE = "--alldefconfig" -KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi-cm3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" -KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" -KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi0-wifi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig" +KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig" LINUX_VERSION_EXTENSION ?= "" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb index fc33559c39..da4e748384 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.10.31" +LINUX_VERSION ?= "5.10.52" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "89399e6e7e33d6260a954603ca03857df594ffd3" +SRCREV_machine = "6495fa3396fb387d3871ced42a30281fe7be5352" SRCREV_meta = "a19886b00ea7d874fdd60d8e3435894bb16e6434" KMETA = "kernel-meta" |