Merge branch 'master' into sandbox/support-usbboot

agherzan · Nov 2, 2023 · 00c7b0f · 00c7b0f
2 parents 5384cde + 6ef8b57
commit 00c7b0f
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 951 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,6 +1,9 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
 python:
-  version: "3.7"
   install:
     - requirements: docs/requirements.txt
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 
-LAYERSERIES_COMPAT_raspberrypi = "mickledore"
+LAYERSERIES_COMPAT_raspberrypi = "nanbield"
 LAYERDEPENDS_raspberrypi = "core"
 
 # Additional license directories.

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
@@ -148,7 +148,11 @@ IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \
                  ${@make_dtb_boot_files(d)} \
                  ${RPI_EXTRA_IMAGE_BOOT_FILES} \
                  "
+
+EXTRA_IMAGEDEPENDS += "rpi-bootfiles"
+
 do_image_wic[depends] += " \
+    virtual/kernel:do_deploy \
     rpi-bootfiles:do_deploy \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
     "

diff --git a/recipes-bsp/common/raspberrypi-firmware.inc b/recipes-bsp/common/raspberrypi-firmware.inc
@@ -1,9 +1,9 @@
-RPIFW_DATE ?= "20220830"
+RPIFW_DATE ?= "20230509~buster"
 
 RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz"
 RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}"
 
 SRC_URI = "${RPIFW_SRC_URI}"
-SRC_URI[sha256sum] = "2b27e4b3c4d2664a0a1d0dd8602bd80ea41dd006eb0ad9c67d7b659c9c8bb4e5"
+SRC_URI[sha256sum] = "1d9eb83111826b708f461101766fd2000d45f1c171ad573936d000f623ca8098"
 
 PV = "${RPIFW_DATE}"
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
@@ -13,11 +13,11 @@ COMPATIBLE_MACHINE = "^rpi$"
 
 SRCBRANCH = "master"
 SRCFORK = "raspberrypi"
-SRCREV = "54fd97ae4066a10b6b02089bc769ceed328737e0"
+SRCREV = "cc1ca18fb0689b01cc2ca2aa4b400dcee624a213"
 
 # Use the date of the above commit as the package version. Update this when
 # SRCREV is changed.
-PV = "20220323"
+PV = "20230419"
 
 SRC_URI = "\
     git://github.com/${SRCFORK}/userland.git;protocol=https;branch=${SRCBRANCH} \

diff --git a/...irmware-rpidistro/bluez-firmware-rpidistro/31ad68831357d2019624004f1f0846475671088f.patch b/...irmware-rpidistro/bluez-firmware-rpidistro/31ad68831357d2019624004f1f0846475671088f.patch
diff --git a/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb b/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb
@@ -25,10 +25,9 @@ NO_GENERIC_LICENSE[Firmware-cypress-rpidistro] = "LICENCE.cypress-rpidistro"
 
 SRC_URI = " \
     git://github.com/RPi-Distro/bluez-firmware;branch=master;protocol=https \
-    file://31ad68831357d2019624004f1f0846475671088f.patch \
 "
-SRCREV = "e7fd166981ab4bb9a36c2d1500205a078a35714d"
-PV = "1.2-4+rpt8"
+SRCREV = "9556b08ace2a1735127894642cc8ea6529c04c90"
+PV = "1.2-4+rpt10"
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
@@ -7,19 +7,19 @@ SECTION = "kernel"
 
 LICENSE = "GPL-2.0-only & binary-redist-Cypress-rpidistro & Synaptics-rpidistro"
 LIC_FILES_CHKSUM = "\
-    file://debian/config/brcm80211/copyright;md5=b0630b02d90e3da72206c909b6aecc8c \
+    file://debian/copyright;md5=03475efdcf4c53c8f2d8fb4bc1fc6965 \
 "
 # Where these are no common licenses, set NO_GENERIC_LICENSE so that the
 # license files will be copied from the fetched source.
-NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/config/brcm80211/copyright"
-NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/config/brcm80211/copyright"
+NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/copyright"
+NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/copyright"
 LICENSE_FLAGS = "synaptics-killswitch"
 
 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https \
     file://0001-Default-43455-firmware-to-standard-variant.patch \
 "
-SRCREV = "541e5a05d152e7e6f0d9be45622e4a3741e51c02"
-PV = "20210315-3+rpt7"
+SRCREV = "2c3a8701193ba23d0ef85cdf0d0c9e47baf03dfc"
+PV = "20230210-5_bpo11+1"
 S = "${WORKDIR}/git"
 
 inherit allarch
@@ -30,7 +30,7 @@ do_compile[noexec] = "1"
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress
 
-    cp debian/config/brcm80211/copyright ${D}${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro
+    cp debian/copyright ${D}${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro
 
     for fw in \
             brcmfmac43430-sdio \
@@ -44,22 +44,13 @@ do_install() {
     cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/
 
     rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt
-
-    # add compat links. Fixes errors like
-    # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-compute-module.txt failed with error -2
-    ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt
-    # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin failed with error -2
-    ln -s brcmfmac43455-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin
-    # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin failed with error -2
-    ln -s brcmfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin
-    # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin failed with error -2
-    ln -s brcmfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin
 }
 
 PACKAGES = "\
     ${PN}-bcm43430 \
     ${PN}-bcm43436 \
     ${PN}-bcm43436s \
+    ${PN}-bcm43439 \
     ${PN}-bcm43455 \
     ${PN}-bcm43456 \
     ${PN}-license \
@@ -68,6 +59,7 @@ PACKAGES = "\
 LICENSE:${PN}-bcm43430 = "binary-redist-Cypress-rpidistro"
 LICENSE:${PN}-bcm43436 = "Synaptics-rpidistro"
 LICENSE:${PN}-bcm43436s = "Synaptics-rpidistro"
+LICENSE:${PN}-bcm43439 = "Synaptics-rpidistro"
 LICENSE:${PN}-bcm43455 = "binary-redist-Cypress-rpidistro"
 LICENSE:${PN}-bcm43456 = "Synaptics-rpidistro"
 LICENSE:${PN}-license = "GPL-2.0-only"
@@ -79,6 +71,7 @@ FILES:${PN}-bcm43430 = " \
 "
 FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*"
 FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*"
+FILES:${PN}-bcm43439 = "${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined"
 FILES:${PN}-bcm43455 = " \
     ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio* \
@@ -89,18 +82,21 @@ FILES:${PN}-license = "${nonarch_base_libdir}/firmware/copyright.firmware-nonfre
 RDEPENDS:${PN}-bcm43430 += "${PN}-license"
 RDEPENDS:${PN}-bcm43436 += "${PN}-license"
 RDEPENDS:${PN}-bcm43436s += "${PN}-license"
+RDEPENDS:${PN}-bcm43439 += "${PN}-license"
 RDEPENDS:${PN}-bcm43455 += "${PN}-license"
 RDEPENDS:${PN}-bcm43456 += "${PN}-license"
 
 RCONFLICTS:${PN}-bcm43430 = "linux-firmware-raspbian-bcm43430"
 RCONFLICTS:${PN}-bcm43436 = "linux-firmware-bcm43436"
 RCONFLICTS:${PN}-bcm43436s = "linux-firmware-bcm43436s"
+RCONFLICTS:${PN}-bcm43439 = "linux-firmware-bcm43439"
 RCONFLICTS:${PN}-bcm43455 = "linux-firmware-bcm43455"
 RCONFLICTS:${PN}-bcm43456 = "linux-firmware-bcm43456"
 
 RREPLACES:${PN}-bcm43430 = "linux-firmware-bcm43430"
 RREPLACES:${PN}-bcm43436 = "linux-firmware-bcm43436"
 RREPLACES:${PN}-bcm43436s = "linux-firmware-bcm43436s"
+RREPLACES:${PN}-bcm43439 = "linux-firmware-bcm43439"
 RREPLACES:${PN}-bcm43455 = "linux-firmware-bcm43455"
 RREPLACES:${PN}-bcm43456 = "linux-firmware-bcm43456"
 

diff --git a/recipes-kernel/linux/files/default-cpu-governor.cfg b/recipes-kernel/linux/files/default-cpu-governor.cfg
@@ -0,0 +1,9 @@
+# The defconfigs from the RPi Kernel set "powersave" as the default CPU governor.
+# That is a bad idea as it reduces performance, so we unset that default option here.
+# The option to build the powersave governor (but not as the default) is also enabled.
+# A fix for this was sent to upstream: https://github.com/raspberrypi/linux/pull/5666
+# However, we need to carry this option override until those defconfigs are fixed on
+# *all* the kernel branches that we support. So that can be a long time depending
+# on wheter the above PR gets accepted and/or backported to the stable branches.
+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
diff --git a/recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb b/recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -15,6 +15,7 @@ SRC_URI += " \
     ${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "file://initramfs-image-bundle.cfg", "", d)} \
     ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "file://vc4graphics.cfg", "", d)} \
     ${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "file://wm8960.cfg", "", d)} \
+    file://default-cpu-governor.cfg \
     "
 
 SRC_URI:append:raspberrypi4 = " \

diff --git a/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/recipes-kernel/linux/linux-raspberrypi_5.10.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.1.bb b/recipes-kernel/linux/linux-raspberrypi_6.1.bb
@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.1.38"
+LINUX_VERSION ?= "6.1.54"
 LINUX_RPI_BRANCH ?= "rpi-6.1.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1"
 
-SRCREV_machine = "31dbf25138831241f31f7eee835b83a607eaa179"
-SRCREV_meta = "2eaed50911009f9ddbc74460093e17b22ef7daa0"
+SRCREV_machine = "df4d584e66a660195422ca2b7ce1d68d1181f2a2"
+SRCREV_meta = "e7488dd3776c76fb7d94cc92ae7a2216423f8ece"
 
 KMETA = "kernel-meta"