Drop Coral drivers for non-PCIe platforms (#1851)

The Google Gasket driver has been removed from the main kernels staging
tree between 5.10 and 5.15 development window. Readd Google's
out-of-tree driver to continiue support Google Coral devices.

.github/release-drafter.yml

@@ -1,3 +1,5 @@
+name-template: Home Assistant OS $NEXT_MINOR_VERSION
+version-template: "$MAJOR.$MINOR"
 categories:
   - title: 'Home Assistant Operating System'
     label: 'os'
@@ -5,6 +7,8 @@ categories:
     label: 'build'
   - title: 'Raspberry Pi'
     label: 'board/raspberrypi'
+  - title: 'Home Assistant Yellow'
+    label: 'board/yellow'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
   - title: 'Generic x86-64'
@@ -15,8 +19,9 @@ categories:
     label: 'board/tinker'
   - title: 'Khadas VIM Series'
     label: 'board/khadas'
+  - title: 'Generic aarch64'
+    label: 'board/generic-aarch64'
 filter-by-commitish: true
-commitish: dev
 template: |
   ## Changes
 

.github/workflows/release-drafter.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - dev
-      - rel-4
+      - rel-*
 
 jobs:
   update_release_draft:

Documentation/kernel.md

@@ -5,17 +5,18 @@ Default Kernel tree: 5.15
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.15.32 |
+| Open Virtual Appliance | 5.15.34 |
 | Raspberry Pi | 5.15.32 |
 | Raspberry Pi 0-W | 5.15.32 |
 | Raspberry Pi 2 | 5.15.32 |
 | Raspberry Pi 3 | 5.15.32 |
 | Raspberry Pi 4 | 5.15.32 |
-| Tinker Board | 5.15.32 |
+| Home Assistant Yellow | 5.15.32 |
-| Odroid-C2 | 5.15.32 |
+| Tinker Board | 5.15.34 |
-| Odroid-C4 | 5.15.32 |
+| Odroid-C2 | 5.15.34 |
-| Odroid-N2 | 5.15.32 |
+| Odroid-C4 | 5.15.34 |
-| Odroid-XU4 | 5.15.32 |
+| Odroid-N2 | 5.15.34 |
-| Generic aarch64 | 5.15.32 |
+| Odroid-XU4 | 5.15.34 |
-| Generic x86-64 | 5.15.32 |
+| Generic aarch64 | 5.15.34 |
-| Khadas VIM3 | 5.15.32 |
+| Generic x86-64 | 5.15.34 |
+| Khadas VIM3 | 5.15.34 |

buildroot-external/Config.in

@@ -1,15 +1,16 @@
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/gasket/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/pi-bluetooth/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"

buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch

@@ -1,7 +1,7 @@
-From 017d6caf5d4e0b0963109633e191f49d7814165e Mon Sep 17 00:00:00 2001
+From 2d3d8c091bc692999a1c519c1dc1570cc8be2358 Mon Sep 17 00:00:00 2001
-Message-Id: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
-Date: Wed, 3 Nov 2021 00:00:45 +0100
+Date: Mon, 11 Apr 2022 14:47:59 +0200
 Subject: [PATCH 1/9] ARM: dts: bcm2711: Add device tree for Home Assistant
  Yellow
 
@@ -11,15 +11,15 @@ board.
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
  arch/arm/boot/dts/Makefile                    |   3 +-
- .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts    | 659 ++++++++++++++++++
+ .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts    | 598 ++++++++++++++++++
  arch/arm64/boot/dts/broadcom/Makefile         |   1 +
  .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts    |   1 +
- 4 files changed, 663 insertions(+), 1 deletion(-)
+ 4 files changed, 602 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6bcb35ad76ac..40d9f4433cef 100644
+index f9acf5c4a59b..fb5b4555d42e 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -17,7 +17,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -34,19 +34,18 @@ index 6bcb35ad76ac..40d9f4433cef 100644
  	alpine-db.dtb
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 new file mode 100644
-index 000000000000..9e7a66e70197
+index 000000000000..61d8c81d3de4
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -0,0 +1,659 @@
+@@ -0,0 +1,598 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/dts-v1/;
 +#include "bcm2711.dtsi"
-+#include "bcm2835-rpi.dtsi"
++#include "bcm2711-rpi.dtsi"
-+
++//#include "bcm283x-rpi-usb-peripheral.dtsi"
-+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
 +
 +/ {
-+	compatible = "raspberrypi,4-compute-module-ha-yellow", "brcm,bcm2711";
++	compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711";
 +	model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow";
 +
 +	chosen {
@@ -54,19 +53,6 @@ index 000000000000..9e7a66e70197
 +		stdout-path = "serial1:115200n8";
 +	};
 +
-+	/* Will be filled by the bootloader */
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0 0 0>;
-+	};
-+
-+	aliases {
-+		emmc2bus = &emmc2bus;
-+		ethernet0 = &genet;
-+		pcie0 = &pcie0;
-+		blconfig = &blconfig;
-+	};
-+
 +	leds {
 +		led-act {
 +			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
@@ -94,8 +80,8 @@ index 000000000000..9e7a66e70197
 +		regulator-always-on;
 +		regulator-settling-time-us = <5000>;
 +		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
-+		states = <1800000 0x1
++		states = <1800000 0x1>,
-+			  3300000 0x0>;
++			 <3300000 0x0>;
 +		status = "okay";
 +	};
 +
@@ -118,42 +104,26 @@ index 000000000000..9e7a66e70197
 +	status = "okay";
 +};
 +
-+&firmware {
++&expgpio {
-+	firmware_clocks: clocks {
++	gpio-line-names = "BT_ON",
-+		compatible = "raspberrypi,firmware-clocks";
++			  "WL_ON",
-+		#clock-cells = <1>;
++			  "PWR_LED_OFF",
++			  "ANT1",
++			  "VDD_SD_IO_SEL",
++			  "CAM_GPIO",
++			  "SD_PWR_ON",
++			  "ANT2";
++
++	ant1: ant1 {
++		gpio-hog;
++		gpios = <3 GPIO_ACTIVE_HIGH>;
++		output-high;
 +	};
 +
-+	expgpio: gpio {
++	ant2: ant2 {
-+		compatible = "raspberrypi,firmware-gpio";
++		gpio-hog;
-+		gpio-controller;
++		gpios = <7 GPIO_ACTIVE_HIGH>;
-+		#gpio-cells = <2>;
++		output-low;
-+		gpio-line-names = "BT_ON",
-+				  "WL_ON",
-+				  "PWR_LED_OFF",
-+				  "ANT1",
-+				  "VDD_SD_IO_SEL",
-+				  "CAM_GPIO",
-+				  "SD_PWR_ON",
-+				  "ANT2";
-+		status = "okay";
-+
-+		ant1: ant1 {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+		};
-+
-+		ant2: ant2 {
-+			gpio-hog;
-+			gpios = <7 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+		};
-+	};
-+
-+	reset: reset {
-+		compatible = "raspberrypi,firmware-reset";
-+		#reset-cells = <1>;
 +	};
 +};
 +
@@ -231,23 +201,13 @@ index 000000000000..9e7a66e70197
 +};
 +
 +&hdmi0 {
-+	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
-+	clock-names = "hdmi", "bvb", "audio", "cec";
-+	wifi-2.4ghz-coexistence;
 +	status = "okay";
 +};
 +
 +&hdmi1 {
-+	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
-+	clock-names = "hdmi", "bvb", "audio", "cec";
-+	wifi-2.4ghz-coexistence;
 +	status = "okay";
 +};
 +
-+&hvs {
-+	clocks = <&firmware_clocks 4>;
-+};
-+
 +&pixelvalve0 {
 +	status = "okay";
 +};
@@ -270,22 +230,6 @@ index 000000000000..9e7a66e70197
 +	status = "okay";
 +};
 +
-+&rmem {
-+	/*
-+	 * RPi4's co-processor will copy the board's bootloader configuration
-+	 * into memory for the OS to consume. It'll also update this node with
-+	 * its placement information.
-+	 */
-+	blconfig: nvram@0 {
-+		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		reg = <0x0 0x0 0x0>;
-+		no-map;
-+		status = "disabled";
-+	};
-+};
-+
 +/* SDHCI is used to control the SDIO for wireless */
 +&sdhci {
 +	#address-cells = <1>;
@@ -327,17 +271,12 @@ index 000000000000..9e7a66e70197
 +
 +&pcie0 {
 +	pci@0,0 {
-+		device_type = "pci";
++		device-type = "pci";
 +		#address-cells = <3>;
 +		#size-cells = <2>;
 +		ranges;
 +
 +		reg = <0 0 0 0 0>;
-+
-+		usb@0,0 {
-+			reg = <0 0 0 0 0>;
-+			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
-+		};
 +	};
 +};
 +
@@ -389,7 +328,7 @@ index 000000000000..9e7a66e70197
 +	};
 +};
 +
-+#include "bcm2711-rpi.dtsi"
++#include "bcm2711-rpi-ds.dtsi"
 +#include "bcm283x-rpi-csi0-2lane.dtsi"
 +#include "bcm283x-rpi-csi1-4lane.dtsi"
 +#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
@@ -698,17 +637,17 @@ index 000000000000..9e7a66e70197
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index e7c2c4fd59a8..6fa5993dd993 100644
+index 8eadc747ae1f..786dfe43d804 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
+@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb
  
+ subdir-y	+= bcm4908
  subdir-y	+= northstar2
- subdir-y	+= stingray
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
 new file mode 100644
 index 000000000000..fdc5ec5bc956

buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch

@@ -1,7 +1,7 @@
-From f2a63a3b9c1b18a5917973fc57be353118905a66 Mon Sep 17 00:00:00 2001
+From a4a63bb6f6789c00762b92f0469d10bac525d1f9 Mon Sep 17 00:00:00 2001
-Message-Id: <f2a63a3b9c1b18a5917973fc57be353118905a66.1648505253.git.stefan@agner.ch>
+Message-Id: <a4a63bb6f6789c00762b92f0469d10bac525d1f9.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:33:09 +0100
 Subject: [PATCH 2/9] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio
@@ -11,22 +11,25 @@ Enable UART4 by default and mux pins including hardware flow control.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 13 +++++++++++--
+ arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 16 ++++++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 9e7a66e70197..8aee09ac48d7 100644
+index 61d8c81d3de4..8db71876a78c 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -21,6 +21,7 @@ memory@0 {
+@@ -8,6 +8,10 @@ / {
- 	};
+ 	compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711";
+ 	model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow";
  
- 	aliases {
++	aliases {
 +		serial4 = &uart4;
- 		emmc2bus = &emmc2bus;
++	};
- 		ethernet0 = &genet;
++
- 		pcie0 = &pcie0;
+ 	chosen {
-@@ -322,6 +323,14 @@ &uart1 {
+ 		/* 8250 auxiliary UART instead of pl011 */
+ 		stdout-path = "serial1:115200n8";
+@@ -261,6 +265,14 @@ &uart1 {
  	status = "okay";
  };
  
@@ -41,7 +44,7 @@ index 9e7a66e70197..8aee09ac48d7 100644
  &vchiq {
  	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
  };
-@@ -549,9 +558,9 @@ uart3_pins: uart3_pins {
+@@ -488,9 +500,9 @@ uart3_pins: uart3_pins {
  	};
  
  	uart4_pins: uart4_pins {

buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch

@@ -1,7 +1,7 @@
-From 7eb79cbd146225ecf2b205d5b5eef16f87a2aebc Mon Sep 17 00:00:00 2001
+From c0ddd45166d5aa922045da915202540db3ef2dc2 Mon Sep 17 00:00:00 2001
-Message-Id: <7eb79cbd146225ecf2b205d5b5eef16f87a2aebc.1648505253.git.stefan@agner.ch>
+Message-Id: <c0ddd45166d5aa922045da915202540db3ef2dc2.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:44:23 +0100
 Subject: [PATCH 3/9] ARM: dts: bcm2711: yellow: Mux debug UART5
@@ -12,18 +12,18 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 8aee09ac48d7..7755b1ae48b6 100644
+index 8db71876a78c..d1dea0a214a6 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -22,6 +22,7 @@ memory@0 {
+@@ -10,6 +10,7 @@ / {
  
  	aliases {
  		serial4 = &uart4;
 +		serial5 = &uart5;
- 		emmc2bus = &emmc2bus;
+ 	};
- 		ethernet0 = &genet;
+ 
- 		pcie0 = &pcie0;
+ 	chosen {
-@@ -331,6 +332,13 @@ &uart4 {
+@@ -273,6 +274,13 @@ &uart4 {
  	status = "okay";
  };
  
@@ -37,7 +37,7 @@ index 8aee09ac48d7..7755b1ae48b6 100644
  &vchiq {
  	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
  };
-@@ -366,6 +374,7 @@ soc {
+@@ -308,6 +316,7 @@ soc {
  / {
  	chosen {
  		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";

buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch

@@ -1,7 +1,7 @@
-From 1efbeac97f7308aedddfbfdb3fee291b2015b585 Mon Sep 17 00:00:00 2001
+From 606dcdc896ffc18001ad4983d45a2e23cacd040a Mon Sep 17 00:00:00 2001
-Message-Id: <1efbeac97f7308aedddfbfdb3fee291b2015b585.1648505253.git.stefan@agner.ch>
+Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:48:48 +0100
 Subject: [PATCH 4/9] ARM: dts: bcm2711: yellow: Enable I2C6 by default
@@ -14,10 +14,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 7755b1ae48b6..0f2e7e7dad3e 100644
+index d1dea0a214a6..0bdbfdd44aed 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -589,6 +589,12 @@ &i2c1 {
+@@ -531,6 +531,12 @@ &i2c1 {
  	clock-frequency = <100000>;
  };
  

buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch

@@ -1,7 +1,7 @@
-From 7db679e610a520eb57c659a3d0366224146f16e4 Mon Sep 17 00:00:00 2001
+From 955e093a5ed6b27e36506df63cfb268cc82f2935 Mon Sep 17 00:00:00 2001
-Message-Id: <7db679e610a520eb57c659a3d0366224146f16e4.1648505253.git.stefan@agner.ch>
+Message-Id: <955e093a5ed6b27e36506df63cfb268cc82f2935.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 17:19:01 +0100
 Subject: [PATCH 5/9] ARM: dts: bcm2711: yellow: add I2S audio codec
@@ -14,10 +14,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 26 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 0f2e7e7dad3e..67c7d86ecca2 100644
+index 0bdbfdd44aed..f203f7037915 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -593,11 +593,22 @@ &i2c6 {
+@@ -535,11 +535,22 @@ &i2c6 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c6_pins>;
  	status = "okay";
@@ -40,7 +40,7 @@ index 0f2e7e7dad3e..67c7d86ecca2 100644
  };
  
  // =============================================
-@@ -640,6 +651,21 @@ &pwm1 {
+@@ -582,6 +593,21 @@ &pwm1 {
  	status = "disabled";
  };
  

buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch

@@ -1,30 +1,31 @@
-From cc494d2e43c40c2673abc8a4fd6599ec1796eafb Mon Sep 17 00:00:00 2001
+From 7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9 Mon Sep 17 00:00:00 2001
-Message-Id: <cc494d2e43c40c2673abc8a4fd6599ec1796eafb.1648505253.git.stefan@agner.ch>
+Message-Id: <7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 9 Mar 2021 15:02:53 +0100
 Subject: [PATCH 6/9] ARM: dts: bcm2711: yellow: enable GPIO keys
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts    | 30 +++++++++++++++++++
+ .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts    | 31 +++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ 1 file changed, 31 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 67c7d86ecca2..5dc5f0c81e62 100644
+index f203f7037915..c74193b3987e 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -2,6 +2,7 @@
+@@ -4,6 +4,8 @@
- /dts-v1/;
+ #include "bcm2711-rpi.dtsi"
- #include "bcm2711.dtsi"
+ //#include "bcm283x-rpi-usb-peripheral.dtsi"
- #include "bcm2835-rpi.dtsi"
+ 
 +#include <dt-bindings/input/input.h>
- 
++
- #include <dt-bindings/reset/raspberrypi,firmware-reset.h>
+ / {
- 
+ 	compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711";
-@@ -29,6 +30,29 @@ aliases {
+ 	model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow";
- 		blconfig = &blconfig;
+@@ -18,6 +20,29 @@ chosen {
+ 		stdout-path = "serial1:115200n8";
  	};
  
 +	keys: gpio-keys {
@@ -53,7 +54,7 @@ index 67c7d86ecca2..5dc5f0c81e62 100644
  	leds {
  		led-act {
  			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-@@ -438,6 +462,12 @@ spidev1: spidev@1{
+@@ -380,6 +405,12 @@ spidev1: spidev@1{
  };
  
  &gpio {

buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch

@@ -1,7 +1,7 @@
-From 3e3fca9f4dd8e91d929893664213b6dcc571dc16 Mon Sep 17 00:00:00 2001
+From c6861d55c71dfd6fb428e9e8b4246e78d526df82 Mon Sep 17 00:00:00 2001
-Message-Id: <3e3fca9f4dd8e91d929893664213b6dcc571dc16.1648505253.git.stefan@agner.ch>
+Message-Id: <c6861d55c71dfd6fb428e9e8b4246e78d526df82.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 28 Oct 2021 19:38:04 +0200
 Subject: [PATCH 7/9] ARM: dts: bcm2711: yellow: add user LED
@@ -14,18 +14,18 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 5dc5f0c81e62..1a1ebdd54b39 100644
+index c74193b3987e..f5d1d8b9ea32 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -393,7 +393,6 @@ soc {
+@@ -336,7 +336,6 @@ soc {
- #include "bcm2711-rpi.dtsi"
+ #include "bcm2711-rpi-ds.dtsi"
  #include "bcm283x-rpi-csi0-2lane.dtsi"
  #include "bcm283x-rpi-csi1-4lane.dtsi"
 -#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
  
  / {
  	chosen {
-@@ -675,6 +674,12 @@ pwr_led: led-pwr {
+@@ -618,6 +617,12 @@ pwr_led: led-pwr {
  		linux,default-trigger = "default-on";
  		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
  	};

buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch

@@ -1,7 +1,7 @@
-From 2aaa4d5dd580848cb73881182903868c6aa7e35c Mon Sep 17 00:00:00 2001
+From 57289aaeb0a0a3b09991d005d6e3317ed2da6b7a Mon Sep 17 00:00:00 2001
-Message-Id: <2aaa4d5dd580848cb73881182903868c6aa7e35c.1648505253.git.stefan@agner.ch>
+Message-Id: <57289aaeb0a0a3b09991d005d6e3317ed2da6b7a.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 12 Nov 2021 17:33:32 +0100
 Subject: [PATCH 8/9] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
@@ -12,10 +12,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index 1a1ebdd54b39..d33be3e96b8a 100644
+index f5d1d8b9ea32..5c682d09616a 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -632,6 +632,11 @@ card_codec: pcm5121@4c {
+@@ -575,6 +575,11 @@ card_codec: pcm5121@4c {
  		CPVDD-supply = <&vdd_3v3_reg>;
  		status = "okay";
  	};

buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch

@@ -1,7 +1,7 @@
-From c65c727a631864a9ea486f41437f3392cbb1885e Mon Sep 17 00:00:00 2001
+From 7211af3546200c906b719c3e664d2554d48a43f5 Mon Sep 17 00:00:00 2001
-Message-Id: <c65c727a631864a9ea486f41437f3392cbb1885e.1648505253.git.stefan@agner.ch>
+Message-Id: <7211af3546200c906b719c3e664d2554d48a43f5.1649681596.git.stefan@agner.ch>
-In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 7 Jan 2022 17:10:00 +0100
 Subject: [PATCH 9/9] ARM: dts: bcm2711: yellow: enable USB host mode by
@@ -16,10 +16,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index d33be3e96b8a..d81f2f1d4b43 100644
+index 5c682d09616a..b988d50234c1 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -656,6 +656,15 @@ &sdhost {
+@@ -599,6 +599,15 @@ &sdhost {
  	status = "disabled";
  };
  

buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch

@@ -0,0 +1,54 @@
+From 78704bc154d695ee16fdf8396f4d60b740190014 Mon Sep 17 00:00:00 2001
+Message-Id: <78704bc154d695ee16fdf8396f4d60b740190014.1649951002.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 14 Apr 2022 12:15:26 +0200
+Subject: [PATCH 1/2] drivers: bcm283x: don't explicitly disable init
+
+It seems that the reason why init doesn't succeed is the lack of clock
+support in U-Boot. Setting the default clock of 48MHz for the PL011
+UARTs makes reinitialization work consistently.
+
+Note that for the first UART the "skip-init" is anyways set in the
+device tree. This will only affect probing of UARTs not enabled by
+firmware.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/serial/serial_bcm283x_pl011.c | 6 ------
+ include/configs/rpi.h                 | 3 +++
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
+index 2d2e970316..182274036c 100644
+--- a/drivers/serial/serial_bcm283x_pl011.c
++++ b/drivers/serial/serial_bcm283x_pl011.c
+@@ -51,12 +51,6 @@ static int bcm283x_pl011_serial_probe(struct udevice *dev)
+ 	if (ret)
+ 		return ret;
+ 
+-	/*
+-	 * TODO: Reinitialization doesn't always work for now, just skip
+-	 *       init always - we know we're already initialized
+-	 */
+-	plat->skip_init = true;
+-
+ 	return pl01x_serial_probe(dev);
+ }
+ 
+diff --git a/include/configs/rpi.h b/include/configs/rpi.h
+index e24c94c7d2..98ba4dc052 100644
+--- a/include/configs/rpi.h
++++ b/include/configs/rpi.h
+@@ -40,6 +40,9 @@
+ #define CONFIG_SYS_BOOTM_LEN		SZ_64M
+ #endif
+ 
++/* Define PL011 default clock */
++#define CONFIG_PL011_CLOCK		48000000
++
+ /* Devices */
+ /* GPIO */
+ #define CONFIG_BCM2835_GPIO
+-- 
+2.35.1
+

buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch

@@ -0,0 +1,68 @@
+From c2447aa922068cebd9bbaac45acae3d853abf687 Mon Sep 17 00:00:00 2001
+Message-Id: <c2447aa922068cebd9bbaac45acae3d853abf687.1649951002.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1649951002.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1649951002.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 14 Apr 2022 12:18:41 +0200
+Subject: [PATCH 2/2] drivers: bcm283x: allow to spawn any PL011 UART
+
+The current code checks pinmux for the first PL011 only. Raspberry Pi 4
+has multiple PL011 UARTs. This code prevents probing of other UARTs in
+case the first PL011 UART is not active.
+
+Furthermore, U-Boot supports pinmuxing, hence the pins should be muxed
+at this point anyway. Drop the check entirly.
+
+This allows to use other UARTs as stdout paths (e.g. stdout-path =
+"serial5:115200n8").
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/serial/serial_bcm283x_pl011.c | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
+index 182274036c..98628e1ca4 100644
+--- a/drivers/serial/serial_bcm283x_pl011.c
++++ b/drivers/serial/serial_bcm283x_pl011.c
+@@ -11,37 +11,10 @@
+ #include <serial.h>
+ #include "serial_pl01x_internal.h"
+ 
+-/*
+- * Check if this serial device is muxed
+- *
+- * The serial device will only work properly if it has been muxed to the serial
+- * pins by firmware. Check whether that happened here.
+- *
+- * @return true if serial device is muxed, false if not
+- */
+-static bool bcm283x_is_serial_muxed(void)
+-{
+-	int serial_gpio = 15;
+-	struct udevice *dev;
+-
+-	if (uclass_first_device(UCLASS_PINCTRL, &dev) || !dev)
+-		return false;
+-
+-	if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT0)
+-		return false;
+-
+-	return true;
+-}
+-
+ static int bcm283x_pl011_serial_probe(struct udevice *dev)
+ {
+-	struct pl01x_serial_plat *plat = dev_get_plat(dev);
+ 	int ret;
+ 
+-	/* Don't spawn the device if it's not muxed */
+-	if (!bcm283x_is_serial_muxed())
+-		return -ENODEV;
+-
+ 	/*
+ 	 * Read the ofdata here rather than in an of_to_plat() method
+ 	 * since we need the soc simple-bus to be probed so that the 'ranges'
+-- 
+2.35.1
+

buildroot-external/busybox.config

@@ -1,14 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.32.0
+# Busybox version: 1.35.0
-# Thu Dec  3 13:37:18 2020
+# Mon Apr 11 09:59:46 2022
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
 #
 # Settings
 #
-# CONFIG_DESKTOP is not set
+CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_FEDORA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_SYSLOG_INFO is not set
 # CONFIG_FEATURE_SYSLOG is not set
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options ("make install" behavior)
@@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
 
 #
 # Applets
@@ -162,6 +157,8 @@ CONFIG_BZIP2_SMALL=0
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_GZIP is not set
@@ -197,6 +194,22 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 #
 # Coreutils
 #
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for date and touch
+#
+# CONFIG_FEATURE_TIMEZONE is not set
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
 CONFIG_BASENAME=y
 CONFIG_CAT=y
 CONFIG_FEATURE_CATN=y
@@ -207,11 +220,13 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 CONFIG_CKSUM=y
+CONFIG_CRC32=y
 CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -223,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -316,7 +332,6 @@ CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TIMEOUT=y
 CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
@@ -331,6 +346,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -341,21 +357,6 @@ CONFIG_FEATURE_WC_LARGE=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
-#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
 #
 # Console Utilities
 #
@@ -423,6 +424,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -436,6 +438,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_VI_VERBOSE_STATUS=y
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -444,7 +447,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_AMIN=y
+CONFIG_FEATURE_FIND_CMIN=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -452,6 +459,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -623,9 +631,8 @@ CONFIG_FREERAMDISK=y
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
 # CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 # CONFIG_HD is not set
-# CONFIG_XXD is not set
+CONFIG_XXD=y
 CONFIG_HWCLOCK=y
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
 CONFIG_IONICE=y
@@ -707,6 +714,7 @@ CONFIG_UEVENT=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -734,6 +742,7 @@ CONFIG_UEVENT=y
 # Miscellaneous Utilities
 #
 CONFIG_ADJTIMEX=y
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 CONFIG_BC=y
@@ -829,6 +838,7 @@ CONFIG_TTYSIZE=y
 # CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 CONFIG_WATCHDOG=y
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -837,6 +847,9 @@ CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+# CONFIG_FEATURE_HWIB is not set
 # CONFIG_FEATURE_TLS_SHA1 is not set
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
@@ -855,6 +868,7 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_HOSTNAME is not set
 # CONFIG_DNSDOMAINNAME is not set
 # CONFIG_HTTPD is not set
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
 # CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -866,6 +880,10 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 # CONFIG_FEATURE_HTTPD_GZIP is not set
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
 # CONFIG_IFCONFIG is not set
 # CONFIG_FEATURE_IFCONFIG_STATUS is not set
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -943,6 +961,7 @@ CONFIG_FEATURE_TC_INGRESS=y
 # CONFIG_FEATURE_TELNET_WIDTH is not set
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -963,6 +982,7 @@ CONFIG_FEATURE_TC_INGRESS=y
 # CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
 # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 # CONFIG_FEATURE_WGET_TIMEOUT is not set
 # CONFIG_FEATURE_WGET_HTTPS is not set
@@ -984,6 +1004,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
@@ -1001,17 +1022,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 # CONFIG_SENDMAIL is not set
-CONFIG_FEATURE_MIME_CHARSET=""
 
 #
 # Process Utilities
 #
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_SHOW_THREADS=y
 # CONFIG_FREE is not set
 CONFIG_FUSER=y
 CONFIG_IOSTAT=y
@@ -1050,7 +1073,6 @@ CONFIG_SMEMCAP=y
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
-CONFIG_FEATURE_SHOW_THREADS=y
 
 #
 # Runit Utilities
@@ -1115,8 +1137,8 @@ CONFIG_ASH_CMDCMD=y
 # CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set

buildroot-external/configs/generic_aarch64_defconfig

@@ -35,7 +35,7 @@ BR2_INIT_SYSTEMD=y
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_USE_DEFCONFIG=n
 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/arm-uefi/generic-aarch64/kernel.config"
@@ -45,6 +45,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y

buildroot-external/configs/generic_x86_64_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 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/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y

buildroot-external/configs/khadas_vim3_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3 $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
 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"
@@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y

buildroot-external/configs/odroid_c2_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 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"

buildroot-external/configs/odroid_c4_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 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"

buildroot-external/configs/odroid_n2_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 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/hardkernel/odroid-n2/kernel.config"

buildroot-external/configs/odroid_xu4_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 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_LINUX_KERNEL_LZ4=y

buildroot-external/configs/ova_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 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/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -31,6 +31,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y

buildroot-external/configs/rpi3_64_defconfig

@@ -55,6 +55,8 @@ BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -122,7 +124,7 @@ BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3-64"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y
+BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y

buildroot-external/configs/rpi3_defconfig

@@ -55,6 +55,8 @@ BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -122,7 +124,7 @@ BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y
+BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y

buildroot-external/configs/rpi4_64_defconfig

@@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
@@ -54,6 +55,8 @@ BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -123,7 +126,7 @@ BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y
+BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y

buildroot-external/configs/rpi4_defconfig

@@ -54,6 +54,8 @@ BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -121,7 +123,7 @@ BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y
+BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y

buildroot-external/configs/tinker_defconfig

@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 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"

buildroot-external/configs/yellow_defconfig

@@ -23,7 +23,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/yellow $(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/1.20220308.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.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
@@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
@@ -52,6 +53,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -109,7 +112,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -122,7 +125,7 @@ BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y
+BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y

buildroot-external/package/bluetooth-bcm43xx/0001-btuart-reduced-baud-rate-rpi3b.patch

@@ -1,16 +0,0 @@
-Bluetooth: hci0: Frame reassembly failed (-84)
-https://github.com/raspberrypi/firmware/issues/1150
-
-Signed-off-by: Luca Giovenzana <luca@giovenzana.org>
-
---- btuart.orig	2020-03-25 03:05:24.491176583 +0100
-+++ btuart	2020-03-25 03:05:43.603107833 +0100
-@@ -19,7 +19,7 @@ if [ "$uart0" = "$serial1" ] ; then
- 	if [ "$uart0_pins" = "16" ] ; then
- 		$HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
- 	else
--		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
-+		$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
- 	fi
- else
- 	$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR

buildroot-external/package/bluetooth-bcm43xx/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_BLUETOOTH_BCM43XX
-	bool "bluetooth bcm43xx"
-	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
-	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
-	help
-	  Install bluetooth for bcm43xx.

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -1,40 +0,0 @@
-################################################################################
-#
-# Bluetooth BCM43xx
-#
-################################################################################
-
-BLUETOOTH_BCM43XX_VERSION = 1.0.0
-BLUETOOTH_BCM43XX_LICENSE = Apache License 2.0
-BLUETOOTH_BCM43XX_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
-BLUETOOTH_BCM43XX_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-bcm43xx
-BLUETOOTH_BCM43XX_SITE_METHOD = local
-
-define BLUETOOTH_BCM43XX_BUILD_CMDS
-	curl -L -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/e7fd166981ab4bb9a36c2d1500205a078a35714d/broadcom/BCM43430A1.hcd
-	curl -L -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/e7fd166981ab4bb9a36c2d1500205a078a35714d/broadcom/BCM4345C0.hcd
-	curl -L -o $(@D)/BCM4345C5.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/e7fd166981ab4bb9a36c2d1500205a078a35714d/broadcom/BCM4345C5.hcd
-	curl -L -o $(@D)/btuart https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/e1bb75aa83a632c86270e95f92826eb57ee09a77/usr/bin/btuart
-	curl -L -o $(@D)/bthelper https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/e1bb75aa83a632c86270e95f92826eb57ee09a77/usr/bin/bthelper
-	curl -L -o $(@D)/90-pi-bluetooth.rules https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/e1bb75aa83a632c86270e95f92826eb57ee09a77/lib/udev/rules.d/90-pi-bluetooth.rules
-
-	patch $(@D)/btuart $(@D)/0001-btuart-reduced-baud-rate-rpi3b.patch
-endef
-
-define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
-	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
-	$(INSTALL) -m 0644 $(@D)/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/
-
-	$(INSTALL) -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 0755 $(@D)/btuart $(TARGET_DIR)/usr/bin/
-	$(INSTALL) -m 0755 $(@D)/bthelper $(TARGET_DIR)/usr/bin/
-
-	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
-	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
-
-	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/90-pi-bluetooth.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
-endef
-
-$(eval $(generic-package))

buildroot-external/package/bluetooth-bcm43xx/bthelper@.service

@@ -1,8 +0,0 @@
-[Unit]
-Description=Raspberry Pi bluetooth helper
-Requires=bluetooth.service
-After=bluetooth.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/bthelper %I

buildroot-external/package/gasket/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GASKET
+	tristate "Coral Gasket Driver"
+	depends on BR2_LINUX_KERNEL
+	---help---
+	  Driver for Gasket (Google ASIC Software, Kernel Extensions, and Tools)
+          is a top level driver for lightweight communication with Google ASICs.
+          Apex refers to the EdgeTPU v1.

buildroot-external/package/gasket/gasket.mk

@@ -0,0 +1,20 @@
+GASKET_VERSION = 97aeba584efd18983850c36dcf7384b0185284b3
+GASKET_SITE = $(call github,google,gasket-driver,$(GASKET_VERSION))
+GASKET_LICENSE = GPL-2.0
+GASKET_LICENSE_FILES = LICENSE
+GASKET_MODULE_SUBDIRS = src
+
+#GASKET_MODULE_MAKE_OPTS = \
+#	CONFIG_RTL8822BU=m \
+#	KVER=$(LINUX_VERSION_PROBED) \
+#	KBASE=$(LINUX_DIR) \
+#	CROSS_COMPILE=$(TARGET_CROSS)
+
+#ifeq (arm, $(filter arm, $(KERNEL_ARCH)))
+#GASKET_MODULE_MAKE_OPTS += CONFIG_PLATFORM_ARM_RPI=y
+#else
+#GASKET_MODULE_MAKE_OPTS += CONFIG_PLATFORM_I386_PC=y
+#endif
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

buildroot-external/package/pi-bluetooth/0001-Fix-Bluetooth-hci0-Frame-reassembly-failed-84.patch

@@ -0,0 +1,30 @@
+From b74ac4e14e4fcbb76b4cea86573cf602f2b28f8b Mon Sep 17 00:00:00 2001
+Message-Id: <b74ac4e14e4fcbb76b4cea86573cf602f2b28f8b.1649951264.git.stefan@agner.ch>
+From: Luca Giovenzana <luca@giovenzana.org>
+Date: Thu, 14 Apr 2022 14:55:56 +0200
+Subject: [PATCH] Fix Bluetooth: hci0: Frame reassembly failed (-84)
+
+Lower UART baudrate to fix Frame reassembly failed (-84) issues.
+https://github.com/raspberrypi/firmware/issues/1150
+
+Signed-off-by: Luca Giovenzana <luca@giovenzana.org>
+---
+ usr/bin/btuart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/bin/btuart b/usr/bin/btuart
+index 493fd86..cb99a4f 100755
+--- a/usr/bin/btuart
++++ b/usr/bin/btuart
+@@ -25,7 +25,7 @@ if [ "$uart0" = "$serial1" ] ; then
+ 	if [ "$uart0_pins" = "16" ] ; then
+ 		$HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
+ 	else
+-		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
++		$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+ 	fi
+ else
+ 	$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+-- 
+2.35.1
+

buildroot-external/package/pi-bluetooth/0002-Test-if-WiFi-Bluetooth-module-is-fitted-on-Compute-M.patch

@@ -0,0 +1,36 @@
+From 2bfc211b1dc619cce4ea500227576ce1d59c404e Mon Sep 17 00:00:00 2001
+Message-Id: <2bfc211b1dc619cce4ea500227576ce1d59c404e.1649951264.git.stefan@agner.ch>
+In-Reply-To: <b74ac4e14e4fcbb76b4cea86573cf602f2b28f8b.1649951264.git.stefan@agner.ch>
+References: <b74ac4e14e4fcbb76b4cea86573cf602f2b28f8b.1649951264.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 14 Apr 2022 15:29:39 +0200
+Subject: [PATCH] Test if WiFi/Bluetooth module is fitted on Compute Module 4
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ usr/bin/btuart | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/usr/bin/btuart b/usr/bin/btuart
+index cb99a4f..046227c 100755
+--- a/usr/bin/btuart
++++ b/usr/bin/btuart
+@@ -11,6 +11,15 @@ else
+   BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
+ fi
+ 
++if grep -q "raspberrypi,4-compute-module" /proc/device-tree/compatible; then
++  BOARDREV_EXT=$(xxd -p -g4 /proc/device-tree/chosen/rpi-boardrev-ext)
++  # Ceck Bit 30: Whether the Compute Module has a WiFi module fitted
++  if [ $((16#${BOARDREV_EXT} & 16#40000000)) -gt 0 ]; then
++    # No WiFi/Bluetooth
++    exit 0
++  fi
++fi
++
+ # Bail out if the kernel is managing the Bluetooth modem initialisation
+ if ( dmesg | grep -q -E "hci[0-9]+: BCM: chip" ); then
+   # On-board bluetooth is already enabled
+-- 
+2.35.1
+

buildroot-external/package/pi-bluetooth/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PI_BLUETOOTH
+	bool "Bluetooth scripts for Raspberry Pi"
+	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
+	depends on BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT
+	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+	help
+	  Install Bluetooth scripts for Raspberry Pi

buildroot-external/package/pi-bluetooth/bthelper@.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Raspberry Pi bluetooth helper
+Requires=hciuart.service bluetooth.service
+After=hciuart.service
+Before=bluetooth.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bthelper %I
+RemainAfterExit=yes

buildroot-external/package/pi-bluetooth/hciuart.service

@@ -1,9 +1,7 @@
 [Unit]
-Description=Bluetooth for BCM43xx
+Description=Configure Bluetooth Modems connected by UART
-Before=bluetooth.service
-Requires=dev-serial1.device
-After=dev-serial1.device
 ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
+After=dev-serial1.device
 
 [Service]
 Type=forking

buildroot-external/package/pi-bluetooth/pi-bluetooth.mk

@@ -0,0 +1,25 @@
+################################################################################
+#
+# Pi-Bluetooth
+#
+################################################################################
+
+PI_BLUETOOTH_VERSION = 23af66cff597c80523bf9581d7f75d387227f183
+PI_BLUETOOTH_SITE = $(call github,RPi-Distro,pi-bluetooth,$(PI_BLUETOOTH_VERSION))
+PI_BLUETOOTH_LICENSE = BSD-3-Clause
+PI_BLUETOOTH_LICENSE_FILES = debian/copyright
+
+define PI_BLUETOOTH_INSTALL_TARGET_CMDS
+	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
+	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/hciuart.service $(TARGET_DIR)/usr/lib/systemd/system/
+	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/
+
+	$(INSTALL) -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 $(@D)/usr/bin/btuart $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 $(@D)/usr/bin/bthelper $(TARGET_DIR)/usr/bin/
+
+	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
+	$(INSTALL) -m 0644 $(@D)/lib/udev/rules.d/90-pi-bluetooth.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
+endef
+
+$(eval $(generic-package))