diff options
Diffstat (limited to 'meta-raspberrypi')
10 files changed, 26 insertions, 16 deletions
diff --git a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf index f1b81519f..2ffdfaf00 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3) DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc SDIMG_KERNELIMAGE ?= "kernel7.img" diff --git a/meta-raspberrypi/conf/machine/raspberrypi2.conf b/meta-raspberrypi/conf/machine/raspberrypi2.conf index 505c6f2ff..403d15e8e 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi2.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi2.conf @@ -4,7 +4,7 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 539413219..95475f334 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -11,7 +11,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ bluez-firmware-rpidistro-bcm4345c0-hcd \ " -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ diff --git a/meta-raspberrypi/conf/machine/raspberrypi3.conf b/meta-raspberrypi/conf/machine/raspberrypi3.conf index dafb66e5a..1212498e6 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 32 bits mode DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ diff --git a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf index 12c8954d9..6032dc85b 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf @@ -10,7 +10,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ bluez-firmware-rpidistro-bcm4345c0-hcd \ " -require conf/machine/include/tune-cortexa72.inc +require conf/machine/include/arm/armv8a/tune-cortexa72.inc include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" UBOOT_MACHINE = "rpi_arm64_config" -VC4DTBO ?= "vc4-fkms-v3d" +VC4DTBO ?= "vc4-kms-v3d" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel diff --git a/meta-raspberrypi/conf/machine/raspberrypi4.conf b/meta-raspberrypi/conf/machine/raspberrypi4.conf index d6b1d1bd0..535a57538 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi4.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_FEATURES += "pci" @@ -17,5 +17,5 @@ SDIMG_KERNELIMAGE ?= "kernel7l.img" UBOOT_MACHINE = "rpi_4_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" -VC4DTBO ?= "vc4-fkms-v3d" +VC4DTBO ?= "vc4-kms-v3d" ARMSTUB ?= "armstub7.bin" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 49494dcb9..8a2a6e117 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20210727" -SRCREV ?= "e83f41345103a7fec73ccc5a2970d1812de77cdf" +RPIFW_DATE ?= "20210819" +SRCREV ?= "25e2b597ebfb2495eab4816a276758dcc6ea21f1" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "e7bd4532ac913663b5a8bf2644277208f3fc48e8136ddc84dad7ce1b62e4c37d" +SRC_URI[sha256sum] = "abecc797c057ae57663eb54f2f0f5af79fb317bf873d2b3345f333848a5da3ee" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb index c91e3c5d0..75b581deb 100644 --- a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb +++ b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb @@ -14,12 +14,14 @@ SRCREV = "fd4775bf90e037551532fc214a958074830bb80d" S = "${WORKDIR}/git" +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'update-rc.d', d)} # hciuart.service replaces what was brcm43438.service -inherit systemd SYSTEMD_SERVICE:${PN} = "\ hciuart.service \ bthelper@.service \ " +INITSCRIPT_NAME = "btuart" +INITSCRIPT_PARAMS = "start 18 2 3 4 5 ." do_install() { install -d ${D}${sysconfdir}/udev/rules.d @@ -33,6 +35,14 @@ do_install() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/debian/pi-bluetooth.bthelper@.service ${D}${systemd_system_unitdir}/bthelper@.service install -m 0644 ${S}/debian/pi-bluetooth.hciuart.service ${D}${systemd_system_unitdir}/hciuart.service + else + install -d ${D}${sysconfdir}/init.d/ + cat > ${WORKDIR}/btuart.init << EOF +#!/bin/sh +/usr/bin/btuart +EOF + install -m 0755 ${WORKDIR}/btuart.init ${D}${sysconfdir}/init.d/btuart + sed -i -e 's:TAG+="systemd".*$:RUN+="/usr/bin/bthelper %k":' ${D}${sysconfdir}/udev/rules.d/90-pi-bluetooth.rules fi } diff --git a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index da3cd8ac7..dfcd07247 100644 --- a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -13,4 +13,4 @@ do_install:append:rpi () { fi } -FILES:${PN}:rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" +FILES:${PN}:append:rpi = " ${sysconfdir}/X11/xorg.conf.d/*" 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 da4e74838..e8aa8789a 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,9 +1,9 @@ -LINUX_VERSION ?= "5.10.52" +LINUX_VERSION ?= "5.10.59" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "6495fa3396fb387d3871ced42a30281fe7be5352" -SRCREV_meta = "a19886b00ea7d874fdd60d8e3435894bb16e6434" +SRCREV_machine = "7f4de43d1e8f06f63697c7b571b509348fb29642" +SRCREV_meta = "e44a7f9801f8fc6b670bf121038d912257a83d7e" KMETA = "kernel-meta" |