From a8704e72c25478ce355fa23980f3c520a065452a Mon Sep 17 00:00:00 2001 From: Grzegorz Kowalski Date: Mon, 26 Aug 2024 23:28:22 +0200 Subject: [PATCH] update upstream to scarthgap --- conf/layer.conf | 2 +- conf/machine/rpi-zero-w.conf | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 538aad1..a8c94b3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -15,6 +15,6 @@ LAYERVERSION_helium-rpi = "2" LAYERDEPENDS_helium-rpi = "core raspberrypi helium" -LAYERSERIES_COMPAT_helium-rpi = "mickledore" +LAYERSERIES_COMPAT_helium-rpi = "scarthgap" LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch" diff --git a/conf/machine/rpi-zero-w.conf b/conf/machine/rpi-zero-w.conf index 69d8e00..9157c25 100644 --- a/conf/machine/rpi-zero-w.conf +++ b/conf/machine/rpi-zero-w.conf @@ -9,13 +9,14 @@ require conf/machine/include/rpi-common.inc require conf/machine/raspberrypi0-wifi.conf KBUILD_DEFCONFIG:rpi-zero-w = "bcmrpi_defconfig" -RPI_KERNEL_DEVICETREE = "bcm2708-rpi-zero-w.dtb" +RPI_KERNEL_DEVICETREE = "broadcom/bcm2708-rpi-zero-w.dtb" # Kernel modules needed by machine and its interfaces # This list will probably change as I expect some of those will be needed # by multiple RPis MACHINE_EXTRA_RRECOMMENDS += " \ kernel-module-ipv6 \ + kernel-module-brcmfmac-wcc \ kernel-module-brcmfmac \ kernel-module-brcmutil \ kernel-module-hci-uart \ @@ -37,6 +38,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ kernel-module-videobuf2-common \ kernel-module-videodev \ kernel-module-raspberrypi-hwmon \ + kernel-module-raspberrypi-gpiomem \ kernel-module-ecdh-generic \ kernel-module-ecc \ kernel-module-spi-bcm2835 \