diff --git a/buildroot-external/board/raspberrypi/0008-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch b/buildroot-external/board/raspberrypi/0008-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch new file mode 100644 index 000000000..7a7baa3d1 --- /dev/null +++ b/buildroot-external/board/raspberrypi/0008-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch @@ -0,0 +1,76 @@ +From df50ba2a4538ce9a43d28c2a9ef56377b7bad59f Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605026982.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605026982.git.stefan@agner.ch> +From: Pascal Vizeli +Date: Tue, 2 Jun 2020 21:20:08 +0000 +Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot + +Without brcm,bcm2835-pl011 in compatible U-Boot uses the regular PL011 +driver which seems to crash when enable_uart=1 is not used. Using +brcm,bcm2835-pl011 works around that and does not affect Linux since its +not using that compatible string. + +Signed-off-by: Pascal Vizeli +Signed-off-by: Stefan Agner +--- + arch/arm/boot/dts/bcm2711.dtsi | 8 ++++---- + arch/arm/boot/dts/bcm283x.dtsi | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi +index 4f87bb4fd3d1..12f0d90e8957 100644 +--- a/arch/arm/boot/dts/bcm2711.dtsi ++++ b/arch/arm/boot/dts/bcm2711.dtsi +@@ -110,7 +110,7 @@ + }; + + uart2: serial@7e201400 { +- compatible = "arm,pl011", "arm,primecell"; ++ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + reg = <0x7e201400 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, +@@ -121,7 +121,7 @@ + }; + + uart3: serial@7e201600 { +- compatible = "arm,pl011", "arm,primecell"; ++ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + reg = <0x7e201600 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, +@@ -132,7 +132,7 @@ + }; + + uart4: serial@7e201800 { +- compatible = "arm,pl011", "arm,primecell"; ++ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + reg = <0x7e201800 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, +@@ -143,7 +143,7 @@ + }; + + uart5: serial@7e201a00 { +- compatible = "arm,pl011", "arm,primecell"; ++ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + reg = <0x7e201a00 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, +diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi +index 4426f9e6ba92..abcf677fe416 100644 +--- a/arch/arm/boot/dts/bcm283x.dtsi ++++ b/arch/arm/boot/dts/bcm283x.dtsi +@@ -306,7 +306,7 @@ + }; + + uart0: serial@7e201000 { +- compatible = "arm,pl011", "arm,primecell"; ++ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + reg = <0x7e201000 0x200>; + interrupts = <2 25>; + clocks = <&clocks BCM2835_CLOCK_UART>, +-- +2.29.1 + diff --git a/buildroot-external/board/raspberrypi/patches/linux/0001-brcmfmac-add-FT-based-AKMs-in-brcmf_set_key_mgmt-for.patch b/buildroot-external/board/raspberrypi/patches/linux/0001-brcmfmac-add-FT-based-AKMs-in-brcmf_set_key_mgmt-for.patch deleted file mode 100644 index d3bc877ee..000000000 --- a/buildroot-external/board/raspberrypi/patches/linux/0001-brcmfmac-add-FT-based-AKMs-in-brcmf_set_key_mgmt-for.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d6fc5f89ac905cb3efc9c61ce79dbfad5d91883b Mon Sep 17 00:00:00 2001 -Message-Id: -From: Chung-Hsien Hsu -Date: Wed, 15 Aug 2018 05:32:39 -0500 -Subject: [PATCH] brcmfmac: add FT-based AKMs in brcmf_set_key_mgmt() for FT - support - -Add WLAN_AKM_SUITE_FT_8021X and WLAN_AKM_SUITE_FT_PSK in -brcmf_set_key_mgmt() for FT support. - -Signed-off-by: Chung-Hsien Hsu -Signed-off-by: Chi-Hsien Lin -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++ - .../net/wireless/broadcom/brcm80211/include/brcmu_wifi.h | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 71b7e5c19434..c312626c0a27 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -1649,6 +1649,12 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) - case WLAN_AKM_SUITE_PSK: - val = WPA2_AUTH_PSK; - break; -+ case WLAN_AKM_SUITE_FT_8021X: -+ val = WPA2_AUTH_UNSPECIFIED | WPA2_AUTH_FT; -+ break; -+ case WLAN_AKM_SUITE_FT_PSK: -+ val = WPA2_AUTH_PSK | WPA2_AUTH_FT; -+ break; - default: - brcmf_err("invalid cipher group (%d)\n", - sme->crypto.cipher_group); -diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h -index 75b2a0438cfa..dddebaa60352 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h -+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h -@@ -239,6 +239,7 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec) - #define WPA2_AUTH_RESERVED4 0x0400 - #define WPA2_AUTH_RESERVED5 0x0800 - #define WPA2_AUTH_1X_SHA256 0x1000 /* 1X with SHA256 key derivation */ -+#define WPA2_AUTH_FT 0x4000 /* Fast BSS Transition */ - #define WPA2_AUTH_PSK_SHA256 0x8000 /* PSK with SHA256 key derivation */ - - #define DOT11_DEFAULT_RTS_LEN 2347 --- -2.28.0 - diff --git a/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-arm-bcm-Convert-BCM2835-firmware-binding.patch b/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-arm-bcm-Convert-BCM2835-firmware-binding.patch new file mode 100644 index 000000000..88696e9ec --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-arm-bcm-Convert-BCM2835-firmware-binding.patch @@ -0,0 +1,87 @@ +From 3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73 Mon Sep 17 00:00:00 2001 +Message-Id: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +From: Florian Fainelli +Date: Mon, 15 Jun 2020 10:40:41 +0200 +Subject: [PATCH 1/8] dt-bindings: arm: bcm: Convert BCM2835 firmware binding + to YAML + +Convert the Raspberry Pi BCM2835 firmware binding document to YAML. +Verified with dt_binding_check and dtbs_check. + +Signed-off-by: Florian Fainelli +Tested-by: Nicolas Saenz Julienne +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/5bc0b9be8544b07300fccab4d4f26e5e5d8e62b2.1592210452.git-series.maxime@cerno.tech +Signed-off-by: Stephen Boyd +(cherry picked from commit d4c708c032df3d95de297232e20041737e99d126) +--- + .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 -------- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 35 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 14 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml + +diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt +deleted file mode 100644 +index 6824b3180ffb..000000000000 +--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt ++++ /dev/null +@@ -1,14 +0,0 @@ +-Raspberry Pi VideoCore firmware driver +- +-Required properties: +- +-- compatible: Should be "raspberrypi,bcm2835-firmware" +-- mboxes: Phandle to the firmware device's Mailbox. +- (See: ../mailbox/mailbox.txt for more information) +- +-Example: +- +-firmware { +- compatible = "raspberrypi,bcm2835-firmware"; +- mboxes = <&mailbox>; +-}; +diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +new file mode 100644 +index 000000000000..cec540c052b6 +--- /dev/null ++++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +@@ -0,0 +1,35 @@ ++# SPDX-License-Identifier: GPL-2.0 ++%YAML 1.2 ++--- ++$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml# ++$schema: http://devicetree.org/meta-schemas/core.yaml# ++ ++title: Raspberry Pi VideoCore firmware driver ++ ++maintainers: ++ - Eric Anholt ++ - Stefan Wahren ++ ++properties: ++ compatible: ++ items: ++ - const: raspberrypi,bcm2835-firmware ++ - const: simple-bus ++ ++ mboxes: ++ $ref: '/schemas/types.yaml#/definitions/phandle' ++ description: | ++ Phandle to the firmware device's Mailbox. ++ (See: ../mailbox/mailbox.txt for more information) ++ ++required: ++ - compatible ++ - mboxes ++ ++examples: ++ - | ++ firmware { ++ compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; ++ mboxes = <&mailbox>; ++ }; ++... +-- +2.29.1 + diff --git a/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch b/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch deleted file mode 100644 index d965e54e8..000000000 --- a/buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a9f92163e6c07e5c6f57f00f4931098e0e1ee826 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Nicolas Saenz Julienne -Date: Mon, 29 Jun 2020 18:18:37 +0200 -Subject: [PATCH 1/4] dt-bindings: reset: Add a binding for the RPi Firmware - reset controller - -The firmware running on the RPi VideoCore can be used to reset and -initialize HW controlled by the firmware. - -Signed-off-by: Nicolas Saenz Julienne -Reviewed-by: Florian Fainelli -[backport for RPi 4.19 kernel] -Signed-off-by: Stefan Agner ---- - .../dt-bindings/reset/raspberrypi,firmware-reset.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 include/dt-bindings/reset/raspberrypi,firmware-reset.h - -diff --git a/include/dt-bindings/reset/raspberrypi,firmware-reset.h b/include/dt-bindings/reset/raspberrypi,firmware-reset.h -new file mode 100644 -index 000000000000..1a4f4c792723 ---- /dev/null -+++ b/include/dt-bindings/reset/raspberrypi,firmware-reset.h -@@ -0,0 +1,13 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * Copyright (c) 2020 Nicolas Saenz Julienne -+ * Author: Nicolas Saenz Julienne -+ */ -+ -+#ifndef _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H -+#define _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H -+ -+#define RASPBERRYPI_FIRMWARE_RESET_ID_USB 0 -+#define RASPBERRYPI_FIRMWARE_RESET_NUM_IDS 1 -+ -+#endif --- -2.27.0 - diff --git a/buildroot-external/board/raspberrypi/patches/linux/0002-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch b/buildroot-external/board/raspberrypi/patches/linux/0002-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch new file mode 100644 index 000000000..5321d3571 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0002-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch @@ -0,0 +1,71 @@ +From 3ad7fb9329eabd1d7f692f612742ca5ac38854a5 Mon Sep 17 00:00:00 2001 +Message-Id: <3ad7fb9329eabd1d7f692f612742ca5ac38854a5.1604762912.git.stefan@agner.ch> +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +From: Maxime Ripard +Date: Mon, 15 Jun 2020 10:40:42 +0200 +Subject: [PATCH 2/8] dt-bindings: clock: Add a binding for the RPi Firmware + clocks + +The firmware running on the RPi VideoCore can be used to discover and +change the various clocks running in the BCM2711. Since devices will +need to use them through the DT, let's add a pretty simple binding. + +Cc: Michael Turquette +Cc: linux-clk@vger.kernel.org +Cc: devicetree@vger.kernel.org +Reviewed-by: Stephen Boyd +Reviewed-by: Rob Herring +Tested-by: Nicolas Saenz Julienne +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/f6105207e7ef5a5ea8d7a1774faf989d341a25f5.1592210452.git-series.maxime@cerno.tech +Signed-off-by: Stephen Boyd +(cherry picked from commit 74a0caa5ef1c25905c4409b350ed9a8e0d9a3b74) +--- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 24 +++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +index cec540c052b6..b48ed875eb8e 100644 +--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml ++++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +@@ -22,6 +22,25 @@ properties: + Phandle to the firmware device's Mailbox. + (See: ../mailbox/mailbox.txt for more information) + ++ clocks: ++ type: object ++ ++ properties: ++ compatible: ++ const: raspberrypi,firmware-clocks ++ ++ "#clock-cells": ++ const: 1 ++ description: > ++ The argument is the ID of the clocks contained by the ++ firmware messages. ++ ++ required: ++ - compatible ++ - "#clock-cells" ++ ++ additionalProperties: false ++ + required: + - compatible + - mboxes +@@ -31,5 +50,10 @@ examples: + firmware { + compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; + mboxes = <&mailbox>; ++ ++ firmware_clocks: clocks { ++ compatible = "raspberrypi,firmware-clocks"; ++ #clock-cells = <1>; ++ }; + }; + ... +-- +2.29.1 + diff --git a/buildroot-external/board/raspberrypi/patches/linux/0003-dt-bindings-arm-bcm-Add-a-select-to-the-RPI-Firmware.patch b/buildroot-external/board/raspberrypi/patches/linux/0003-dt-bindings-arm-bcm-Add-a-select-to-the-RPI-Firmware.patch new file mode 100644 index 000000000..d650ccd25 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0003-dt-bindings-arm-bcm-Add-a-select-to-the-RPI-Firmware.patch @@ -0,0 +1,50 @@ +From 305aeb868929695699e04e26dd590e64ad3c42dd Mon Sep 17 00:00:00 2001 +Message-Id: <305aeb868929695699e04e26dd590e64ad3c42dd.1604762912.git.stefan@agner.ch> +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +From: Maxime Ripard +Date: Fri, 26 Jun 2020 13:54:33 +0200 +Subject: [PATCH 3/8] dt-bindings: arm: bcm: Add a select to the RPI Firmware + binding + +The RaspberryPi firmware binding uses two compatible, include simple-bus. +The select statement generated by default will thus select any node that +has simple-bus, not all of them being the raspberrypi firmware node. + +This results in warnings being wrongfully reported. Let's add a custom +select statement to fix that. + +Fixes: d4c708c032df ("dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML") +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/20200626115433.125735-1-maxime@cerno.tech +Acked-by: Florian Fainelli +Acked-by: Rob Herring +Signed-off-by: Stephen Boyd +(cherry picked from commit 2a08a9232ba2e6103843870e68edae8e381eb02a) +--- + .../bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +index b48ed875eb8e..17e4f20c8d39 100644 +--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml ++++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +@@ -10,6 +10,15 @@ maintainers: + - Eric Anholt + - Stefan Wahren + ++select: ++ properties: ++ compatible: ++ contains: ++ const: raspberrypi,bcm2835-firmware ++ ++ required: ++ - compatible ++ + properties: + compatible: + items: +-- +2.29.1 + diff --git a/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-bcm2838-add-upstream-property-to-enable-PCIe.patch b/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-bcm2838-add-upstream-property-to-enable-PCIe.patch deleted file mode 100644 index e4c8bb61b..000000000 --- a/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-bcm2838-add-upstream-property-to-enable-PCIe.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dcfb930f9c271ad303a888ce94227d2d78974e39 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Stefan Agner -Date: Sun, 19 Jul 2020 11:49:45 +0200 -Subject: [PATCH 4/4] ARM: dts: bcm2838: add upstream property to enable PCIe - spread-spectrum - -Add the upstream device tree property brcm,enable-ssc to enable -spread-spectrum for PCIe. This is used by the upstream U-Boot. - -Signed-off-by: Stefan Agner ---- - arch/arm/boot/dts/bcm2838.dtsi | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 36d250d7053b..d6cc876bc720 100644 ---- a/arch/arm/boot/dts/bcm2838.dtsi -+++ b/arch/arm/boot/dts/bcm2838.dtsi -@@ -353,11 +353,14 @@ - */ - ranges = <0x02000000 0x0 0xf8000000 0x6 0x00000000 - 0x0 0x04000000>; -- /* Map inbound accesses from pci:0x0_00000000..ffffffff -- * to scb:0x0_00000000-ffffffff -- */ -- dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000 -- 0x1 0x00000000>; -+ /* -+ * The wrapper around the PCIe block has a bug -+ * preventing it from accessing beyond the first 3GB of -+ * memory. -+ */ -+ dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000 -+ 0x0 0xc0000000>; -+ brcm,enable-ssc; - status = "okay"; - }; - --- -2.27.0 - diff --git a/buildroot-external/board/raspberrypi/patches/linux/0004-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch b/buildroot-external/board/raspberrypi/patches/linux/0004-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch new file mode 100644 index 000000000..401580baa --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0004-dt-bindings-reset-Add-a-binding-for-the-RPi-Firmware.patch @@ -0,0 +1,83 @@ +From 33743cfcff296b1011e46168ecab185a00e0f00d Mon Sep 17 00:00:00 2001 +Message-Id: <33743cfcff296b1011e46168ecab185a00e0f00d.1604762912.git.stefan@agner.ch> +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +From: Nicolas Saenz Julienne +Date: Mon, 29 Jun 2020 18:18:37 +0200 +Subject: [PATCH 4/8] dt-bindings: reset: Add a binding for the RPi Firmware + reset controller + +The firmware running on the RPi VideoCore can be used to reset and +initialize HW controlled by the firmware. + +Reviewed-by: Florian Fainelli +Signed-off-by: Nicolas Saenz Julienne +Link: https://lore.kernel.org/r/20200629161845.6021-2-nsaenzjulienne@suse.de +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 242841992ae6f22bd761add2f380b2ef3271ba9a) +--- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 21 +++++++++++++++++++ + .../reset/raspberrypi,firmware-reset.h | 13 ++++++++++++ + 2 files changed, 34 insertions(+) + create mode 100644 include/dt-bindings/reset/raspberrypi,firmware-reset.h + +diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +index 17e4f20c8d39..c78499a41c72 100644 +--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml ++++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +@@ -48,6 +48,22 @@ properties: + - compatible + - "#clock-cells" + ++ reset: ++ type: object ++ ++ properties: ++ compatible: ++ const: raspberrypi,firmware-reset ++ ++ "#reset-cells": ++ const: 1 ++ description: > ++ The argument is the ID of the firmware reset line to affect. ++ ++ required: ++ - compatible ++ - "#reset-cells" ++ + additionalProperties: false + + required: +@@ -64,5 +80,10 @@ examples: + compatible = "raspberrypi,firmware-clocks"; + #clock-cells = <1>; + }; ++ ++ reset: reset { ++ compatible = "raspberrypi,firmware-reset"; ++ #reset-cells = <1>; ++ }; + }; + ... +diff --git a/include/dt-bindings/reset/raspberrypi,firmware-reset.h b/include/dt-bindings/reset/raspberrypi,firmware-reset.h +new file mode 100644 +index 000000000000..1a4f4c792723 +--- /dev/null ++++ b/include/dt-bindings/reset/raspberrypi,firmware-reset.h +@@ -0,0 +1,13 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (c) 2020 Nicolas Saenz Julienne ++ * Author: Nicolas Saenz Julienne ++ */ ++ ++#ifndef _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H ++#define _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H ++ ++#define RASPBERRYPI_FIRMWARE_RESET_ID_USB 0 ++#define RASPBERRYPI_FIRMWARE_RESET_NUM_IDS 1 ++ ++#endif +-- +2.29.1 + diff --git a/buildroot-external/board/raspberrypi/patches/linux/0002-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch b/buildroot-external/board/raspberrypi/patches/linux/0005-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch similarity index 55% rename from buildroot-external/board/raspberrypi/patches/linux/0002-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch rename to buildroot-external/board/raspberrypi/patches/linux/0005-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch index 741f5ffb0..11a9f34be 100644 --- a/buildroot-external/board/raspberrypi/patches/linux/0002-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch +++ b/buildroot-external/board/raspberrypi/patches/linux/0005-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch @@ -1,28 +1,29 @@ -From b15414057bc9a023fc865242f499807d82933e58 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From fecb02cc3664de0d1c43ce566ff95c1b68fca51e Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> From: Nicolas Saenz Julienne Date: Mon, 29 Jun 2020 18:18:39 +0200 -Subject: [PATCH 2/4] ARM: dts: bcm2711: Add firmware usb reset node +Subject: [PATCH 5/8] ARM: dts: bcm2711: Add firmware usb reset node Now that the reset driver exposing Raspberry Pi 4's firmware based USB reset routine is available, let's add the device tree node exposing it. -Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Florian Fainelli -[backport for RPi 4.19 kernel] -Signed-off-by: Stefan Agner +Signed-off-by: Nicolas Saenz Julienne +Link: https://lore.kernel.org/r/20200629161845.6021-4-nsaenzjulienne@suse.de +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit b03300db06bed1997a1eecc4c26f3a2895c57726) --- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 42259dbf3919..ec0b3bb64de8 100644 +index 21b20e334b1a..d77d61d41bbc 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -@@ -80,6 +80,11 @@ - ""; +@@ -72,6 +72,11 @@ + "SD_OC_N"; status = "okay"; }; + @@ -32,7 +33,7 @@ index 42259dbf3919..ec0b3bb64de8 100644 + }; }; - &uart0 { + &gpio { -- -2.27.0 +2.29.1 diff --git a/buildroot-external/board/raspberrypi/patches/linux/0003-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch b/buildroot-external/board/raspberrypi/patches/linux/0006-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch similarity index 59% rename from buildroot-external/board/raspberrypi/patches/linux/0003-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch rename to buildroot-external/board/raspberrypi/patches/linux/0006-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch index 43e8149c0..57f85dae1 100644 --- a/buildroot-external/board/raspberrypi/patches/linux/0003-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch +++ b/buildroot-external/board/raspberrypi/patches/linux/0006-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch @@ -1,41 +1,43 @@ -From 08558575c0f3d1437994590ad418d6c2cf18d96b Mon Sep 17 00:00:00 2001 -Message-Id: <08558575c0f3d1437994590ad418d6c2cf18d96b.1595152741.git.stefan@agner.ch> -In-Reply-To: -References: +From e0231cd65d8c13be1cebae1e6b5fbef61be6be0d Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> From: Nicolas Saenz Julienne Date: Mon, 29 Jun 2020 18:18:40 +0200 -Subject: [PATCH 3/4] ARM: dts: bcm2711: Add reset controller to xHCI node +Subject: [PATCH 6/8] ARM: dts: bcm2711: Add reset controller to xHCI node The chip is hardwired to the board's PCIe bus and needs to be properly setup trough a firmware routine after a PCI fundamental reset. Pass the reset controller phandle that takes care of triggering the initialization to the relevant PCI device. +Reviewed-by: Florian Fainelli Signed-off-by: Nicolas Saenz Julienne -[backport for RPi 4.19 kernel] -Signed-off-by: Stefan Agner +Link: https://lore.kernel.org/r/20200629161845.6021-5-nsaenzjulienne@suse.de +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 258f92d2f840b6ea62c0b33f04eb4d9270935bba) --- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index ec0b3bb64de8..2c6aa1933600 100644 +index d77d61d41bbc..513cae21e64c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -@@ -4,6 +4,8 @@ - #include "bcm2711-rpi.dtsi" - #include "bcm283x-rpi-csi1-2lane.dtsi" +@@ -3,6 +3,8 @@ + #include "bcm2711.dtsi" + #include "bcm2835-rpi.dtsi" +#include + / { compatible = "raspberrypi,4-model-b", "brcm,bcm2711"; model = "Raspberry Pi 4 Model B"; -@@ -87,6 +89,21 @@ +@@ -195,6 +197,21 @@ }; }; -+&pcie_0 { ++&pcie0 { + pci@1,0 { + #address-cells = <3>; + #size-cells = <2>; @@ -50,9 +52,9 @@ index ec0b3bb64de8..2c6aa1933600 100644 + }; +}; + + /* uart0 communicates with the BT module */ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins &bt_pins>; -- -2.27.0 +2.29.1 diff --git a/buildroot-external/board/raspberrypi/patches/linux/0007-mm-zsmalloc-include-sparsemem.h-for-MAX_PHYSMEM_BITS.patch b/buildroot-external/board/raspberrypi/patches/linux/0007-mm-zsmalloc-include-sparsemem.h-for-MAX_PHYSMEM_BITS.patch new file mode 100644 index 000000000..cf0025ea2 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0007-mm-zsmalloc-include-sparsemem.h-for-MAX_PHYSMEM_BITS.patch @@ -0,0 +1,76 @@ +From 635706b878ef1263c4d495947a51c70c88707bbf Mon Sep 17 00:00:00 2001 +Message-Id: <635706b878ef1263c4d495947a51c70c88707bbf.1604762912.git.stefan@agner.ch> +In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch> +From: Stefan Agner +Date: Sat, 7 Nov 2020 16:00:09 +0100 +Subject: [PATCH 7/8] mm/zsmalloc: include sparsemem.h for MAX_PHYSMEM_BITS + +Most architectures define MAX_PHYSMEM_BITS in asm/sparsemem.h and don't +include it in asm/pgtable.h. Include asm/sparsemem.h directly to get +the MAX_PHYSMEM_BITS define on all architectures. + +This fixes a crash when accessing zram on 32-bit ARM platform with LPAE and +more than 4GB of memory: + Unable to handle kernel NULL pointer dereference at virtual address 00000000 + pgd = a27bd01c + [00000000] *pgd=236a0003, *pmd=1ffa64003 + Internal error: Oops: 207 [#1] SMP ARM + Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet + CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 + Hardware name: BCM2711 + PC is at zs_map_object+0x94/0x338 + LR is at zram_bvec_rw.constprop.0+0x330/0xa64 + pc : [] lr : [] psr: 60000013 + sp : e376bbe0 ip : 00000000 fp : c1e2921c + r10: 00000002 r9 : c1dda730 r8 : 00000000 + r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 + r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 + Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user + Control: 30c5383d Table: 235c2a80 DAC: fffffffd + Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) + Stack: (0xe376bbe0 to 0xe376c000) + ... + [] (zs_map_object) from [] (zram_bvec_rw.constprop.0+0x330/0xa64) + [] (zram_bvec_rw.constprop.0) from [] (zram_submit_bio+0x1a4/0x40c) + [] (zram_submit_bio) from [] (submit_bio_noacct+0xd0/0x3c8) + [] (submit_bio_noacct) from [] (submit_bio+0x4c/0x190) + [] (submit_bio) from [] (submit_bh_wbc+0x188/0x1b8) + [] (submit_bh_wbc) from [] (__block_write_full_page+0x340/0x5e4) + [] (__block_write_full_page) from [] (block_write_full_page+0x128/0x170) + [] (block_write_full_page) from [] (__writepage+0x14/0x68) + [] (__writepage) from [] (write_cache_pages+0x1bc/0x494) + [] (write_cache_pages) from [] (generic_writepages+0x58/0x8c) + [] (generic_writepages) from [] (do_writepages+0x48/0xec) + [] (do_writepages) from [] (__filemap_fdatawrite_range+0xf0/0x128) + [] (__filemap_fdatawrite_range) from [] (file_write_and_wait_range+0x48/0x98) + [] (file_write_and_wait_range) from [] (blkdev_fsync+0x1c/0x44) + [] (blkdev_fsync) from [] (do_fsync+0x3c/0x70) + [] (do_fsync) from [] (__sys_trace_return+0x0/0x2c) + Exception stack(0xe376bfa8 to 0xe376bff0) + bfa0: 0003d2e0 b6f7b6f0 00000003 00046e40 00001000 00000000 + bfc0: 0003d2e0 b6f7b6f0 00000000 00000076 00000000 00000000 befcbb20 befcbb28 + bfe0: b6f4e060 befcbad8 b6f23e0c b6dc4a80 + Code: e5927000 e0050391 e0871005 e5918018 (e5983000) + +Fixes: 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library") +Signed-off-by: Stefan Agner +--- + mm/zsmalloc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c +index 22d17ecfe7df..b815c39dda19 100644 +--- a/mm/zsmalloc.c ++++ b/mm/zsmalloc.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.29.1 + diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 4aba858a2..c38382c2f 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index cbe43b79c..dff11dff2 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index a6121c44a..14a028f0e 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 109baa5e1..e37944453 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 729dfcf77..bee897fbe 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -93,7 +93,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index cec9eff55..c1b020431 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -93,7 +93,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 59c9ee9b3..7c8722b51 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/2ae9829c3da54597a4701285f91985c4d08ee793.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y