Set deployment type to production

Fix boot issue on Khadas VIM3 (#1894 )
Make sure pin controller is enabled.
2022-05-11 10:39:10 +02:00 · 2022-05-11 10:36:48 +02:00 · 2022-05-11 01:51:30 +02:00 · 2022-05-11 01:51:19 +02:00 · 2022-05-10 23:29:55 +02:00 · 2022-05-05 18:49:36 +02:00
62 changed files with 1481 additions and 1119 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,7 @@ jobs:
    outputs:
      version: ${{ steps.version_check.outputs.version }}
      version_dev: ${{ steps.version_check.outputs.version_dev }}
+      matrix: ${{ steps.generate_matrix.outputs.result }}
    steps:
      - uses: actions/checkout@v2
      - name: Validate version
@@ -34,26 +35,19 @@ jobs:
            echo "::set-output name=version::${major}.${build}"
          fi
          echo "::set-output name=version_dev::${tag_dev}"
+      - name: Create build matrix
+        uses: actions/github-script@v4
+        id: generate_matrix
+        with:
+          script: |
+            const boards = require('./.github/workflows/matrix.json')
+            return { "board": boards }

  build:
-    name: Release build for ${{ matrix.board.name }}
+    name: Release build for ${{ matrix.board.id }}
    needs: validate_release
    strategy:
-      matrix:
-        board:
-          - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
-          - {"name": "khadas_vim3", "output": "khadas-vim3", "runner": "aarch64-runner"}
-          - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
-          - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
-          - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
-          - {"name": "odroid_xu4", "output": "odroid-xu4" , "runner": "aarch64-runner"}
-          - {"name": "rpi2", "output": "rpi2", "runner": "arm-runner"}
-          - {"name": "rpi3", "output": "rpi3", "runner": "arm-runner"}
-          - {"name": "rpi3_64", "output": "rpi3-64", "runner": "aarch64-runner"}
-          - {"name": "rpi4", "output": "rpi4", "runner": "arm-runner"}
-          - {"name": "rpi4_64", "output": "rpi4-64", "runner": "aarch64-runner"}
-          - {"name": "tinker", "output": "tinker", "runner": "arm-runner"}
+      matrix: ${{ fromJson(needs.validate_release.outputs.matrix) }}
    runs-on: ${{ matrix.board.runner }}

    steps:
@@ -81,17 +75,17 @@ jobs:
            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
            -v "${{ matrix.board.runner }}-build-cache:/cache" \
            -v "/build/output" \
-            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.name }}
+            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.defconfig }}

      - name: Upload disk image
-        if: ${{ matrix.board.name != 'ova' }}
+        if: ${{ matrix.board.id != 'ova' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
          asset_content_type: application/x-xz

      - name: Upload rauc update
@@ -100,63 +94,63 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
          asset_content_type: application/octet-stream

      - name: Upload ova image
-        if: ${{ matrix.board.name == 'ova' }}
+        if: ${{ matrix.board.id == 'ova' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
          asset_content_type: application/x-tar

      - name: Upload qcow2 image
-        if: ${{ matrix.board.name == 'ova' || matrix.board.name == 'generic-aarch64' }}
+        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
          asset_content_type: application/x-xz

      - name: Upload vdi image
-        if: ${{ matrix.board.name == 'ova' }}
+        if: ${{ matrix.board.id == 'ova' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
          asset_content_type: application/zip

      - name: Upload vhdx image
-        if: ${{ matrix.board.name == 'ova' }}
+        if: ${{ matrix.board.id == 'ova' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
          asset_content_type: application/zip

      - name: Upload vmdk image
-        if: ${{ matrix.board.name == 'ova' || matrix.board.name == 'generic-aarch64' }}
+        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
-          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
          asset_content_type: application/zip

  bump_version:
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -23,6 +23,8 @@ hassos-xy.raucb
 - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.

+Text files that are on USB stick must have Unix (LF) end of line characters. If you create USB stick on Windows machine, be sure to use Notepad++, Visual Studio Code or any other editor, that supports different line endings. In Notepad++ LF EOL can be enabled with setting `Edit -> EOL Conversion -> Unix (LF)`.
+
 You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later over the
 API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be inserted to the device during this setup process and can be disconnected afterwards.*

--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -5,18 +5,18 @@ Default Kernel tree: 5.15

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.15.34 |
+| Open Virtual Appliance | 5.15.38 |
 | 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 |
 | Home Assistant Yellow | 5.15.32 |
-| Tinker Board | 5.15.34 |
-| Odroid-C2 | 5.15.34 |
-| Odroid-C4 | 5.15.34 |
-| Odroid-N2 | 5.15.34 |
-| Odroid-XU4 | 5.15.34 |
-| Generic aarch64 | 5.15.34 |
-| Generic x86-64 | 5.15.34 |
-| Khadas VIM3 | 5.15.34 |
+| Tinker Board | 5.15.38 |
+| Odroid-C2 | 5.15.38 |
+| Odroid-C4 | 5.15.38 |
+| Odroid-N2 | 5.15.38 |
+| Odroid-XU4 | 5.15.38 |
+| Generic aarch64 | 5.15.38 |
+| Generic x86-64 | 5.15.38 |
+| Khadas VIM3 | 5.15.38 |
--- a/4
+++ b/4
@@ -26,6 +26,10 @@ all: $(TARGETS)
 $(RELEASE_DIR):
 	mkdir -p $(RELEASE_DIR)

+savedefconfig:
+	@echo "config $*"
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "savedefconfig"
+
 $(TARGETS_CONFIG): %-config:
 	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
--- a/2
+++ b/2
--- a/buildroot-external/board/asus/tinker/kernel.config
+++ b/buildroot-external/board/asus/tinker/kernel.config
@@ -1517,7 +1517,7 @@ CONFIG_BT_HCIBTUSB=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=y
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIUART_NOKIA is not set
@@ -1527,6 +1527,7 @@ CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
 # CONFIG_BT_HCIUART_INTEL is not set
 # CONFIG_BT_HCIUART_BCM is not set
+CONFIG_BT_HCIUART_RTL=y
 # CONFIG_BT_HCIUART_QCA is not set
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
@@ -2474,7 +2475,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_ST_ASC is not set
 CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
--- a/buildroot-external/board/asus/tinker/patches/linux/0001-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0001-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch
@@ -1,64 +0,0 @@
-From 2ae3821fd824560ef2db3c87cfbec985177911f6 Mon Sep 17 00:00:00 2001
-Message-Id: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599249626.git.stefan@agner.ch>
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 22:03:26 +0100
-Subject: [PATCH 1/2] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
-
-The most essential being the RTS pin, which is clearly needed to
-upload the initial configuration into the Realtek Bluetooth
-chip, and make the Bluetooth chip work.
-
-Now, the Bluetooth chip also needs 3 other GPIOS to be enabled.
-I'll see how I do that through the DTS file in a near future.
-
-The 3 GPIOS being :
-Bluetooth Reset : <&gpio4 29 GPIO_ACTIVE_HIGH>
-Bluetooth Wake  : <&gpio4 26 GPIO_ACTIVE_HIGH>
-Bluetooth Wake_Host_IRQ : <&gpio4 31 GPIO_ACTIVE_HIGH>
-
-These are currently setup manually, through scripts. But it seems that
-GPIO handling through /sys entries might not be possible in the long
-term, the replacement being libgpio.
-Anyway, if you're interesting in enabling the Bluetooth GPIO by hand,
-here are the commands :
-
-cd /sys/class/gpio &&
-echo 146 > export &&
-echo 149 > export &&
-echo 151 > export &&
-echo high > gpio146/direction &&
-echo high > gpio149/direction &&
-echo high > gpio151/direction
-
-Resetting the chip is done like this :
-
-echo "Resetting the Bluetooth chip"
-cd /sys/class/gpio/gpio149 &&
-echo 0 > value &&
-sleep 1 &&
-echo 1 > value &&
-sleep 1
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
-[move change to rk3288-tinker.dtsi]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index acfaa12ec239..284e7982925d 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -492,6 +492,8 @@ &tsadc {
- };
- 
- &uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
- 	status = "okay";
- };
- 
-- 
-2.28.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch
@@ -1,5 +1,5 @@
-From 3f3c4cd047234fb94de4d6b701d05ff0450890cf Mon Sep 17 00:00:00 2001
-Message-Id: <3f3c4cd047234fb94de4d6b701d05ff0450890cf.1613588152.git.stefan@agner.ch>
+From ff0c5c49024da05b47d4fcc4d115761c43eef7a6 Mon Sep 17 00:00:00 2001
+Message-Id: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 17 Feb 2021 19:55:41 +0100
 Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
@@ -11,10 +11,10 @@ This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
 1 file changed, 8 deletions(-)

 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 8fa80facc8cd..8636d95c45e1 100644
+index 4dcdcf17c977..ff6faa82192b 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -422,8 +422,6 @@ uart0: serial@ff180000 {
+@@ -378,8 +378,6 @@ uart0: serial@ff180000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
 		clock-names = "baudclk", "apb_pclk";
@@ -23,7 +23,7 @@ index 8fa80facc8cd..8636d95c45e1 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart0_xfer>;
 		status = "disabled";
-@@ -437,8 +435,6 @@ uart1: serial@ff190000 {
+@@ -393,8 +391,6 @@ uart1: serial@ff190000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
 		clock-names = "baudclk", "apb_pclk";
@@ -32,7 +32,7 @@ index 8fa80facc8cd..8636d95c45e1 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart1_xfer>;
 		status = "disabled";
-@@ -465,8 +461,6 @@ uart3: serial@ff1b0000 {
+@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
 		clock-names = "baudclk", "apb_pclk";
@@ -41,7 +41,7 @@ index 8fa80facc8cd..8636d95c45e1 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart3_xfer>;
 		status = "disabled";
-@@ -480,8 +474,6 @@ uart4: serial@ff1c0000 {
+@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
 		clock-names = "baudclk", "apb_pclk";
@@ -51,5 +51,5 @@ index 8fa80facc8cd..8636d95c45e1 100644
 		pinctrl-0 = <&uart4_xfer>;
 		status = "disabled";
 -- 
-2.30.1
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
@@ -1,10 +1,10 @@
-From fc25c993bf2feb6e66d55bf03eb725ec688e47eb Mon Sep 17 00:00:00 2001
-Message-Id: <fc25c993bf2feb6e66d55bf03eb725ec688e47eb.1599250914.git.stefan@agner.ch>
-In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+From e73b4b762a0842cc75b2784e4c4267f6f4fc50c4 Mon Sep 17 00:00:00 2001
+Message-Id: <e73b4b762a0842cc75b2784e4c4267f6f4fc50c4.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:15:14 +0100
-Subject: [PATCH 2/3] ARM: DTS: rk3288-tinker: Defining the SPI interface
+Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface

 Taken from, and tested by @TonyMac32 .

@@ -21,7 +21,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
 1 file changed, 19 insertions(+)

 diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index 284e7982925d..d6cc66ab5bb1 100644
+index 9c1e38c54eae..cf278bcc91ad 100644
 --- a/arch/arm/boot/dts/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -485,6 +485,25 @@ &sdio0 {
@@ -51,5 +51,5 @@ index 284e7982925d..d6cc66ab5bb1 100644
 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
 -- 
-2.28.0
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
@@ -1,10 +1,10 @@
-From 3a9d71847ae869ffdb2b0818aa86a36d57d96331 Mon Sep 17 00:00:00 2001
-Message-Id: <3a9d71847ae869ffdb2b0818aa86a36d57d96331.1599250914.git.stefan@agner.ch>
-In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+From 00de5155d12a178b83961f459ddccd7fa08ec25c Mon Sep 17 00:00:00 2001
+Message-Id: <00de5155d12a178b83961f459ddccd7fa08ec25c.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 4 Sep 2020 21:57:55 +0200
-Subject: [PATCH 3/3] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
+Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker

 Enable I2C devices which are accessible via 40-pin header.

@@ -14,7 +14,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
 1 file changed, 8 insertions(+)

 diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index d6cc66ab5bb1..7af5818ac77c 100644
+index cf278bcc91ad..f23c6efd39d4 100644
 --- a/arch/arm/boot/dts/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -344,10 +344,18 @@ regulator-state-mem {
@@ -37,5 +37,5 @@ index d6cc66ab5bb1..7af5818ac77c 100644
 	status = "okay";
 };
 -- 
-2.28.0
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch
@@ -1,7 +1,10 @@
-From 062488e4b8fd552c01e1104b3bc91a6f7ffe6c41 Mon Sep 17 00:00:00 2001
+From e45da42e71e4f92995d5ec11679ca00b0971dbfe Mon Sep 17 00:00:00 2001
+Message-Id: <e45da42e71e4f92995d5ec11679ca00b0971dbfe.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Thu, 19 Oct 2017 21:24:47 +0200
-Subject: [PATCH 10/28] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
+Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl

 The spi2_cs1 pin reference is missing in the spi2 first pin control
 definition.
@@ -14,10 +17,10 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 5b789528..9ed532cc 100644
+index ff6faa82192b..5061c5418d75 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -334,7 +334,7 @@
+@@ -311,7 +311,7 @@ spi2: spi@ff130000 {
 		dma-names = "tx", "rx";
 		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 		pinctrl-names = "default";
@@ -27,5 +30,5 @@ index 5b789528..9ed532cc 100644
 		#address-cells = <1>;
 		#size-cells = <0>;
 -- 
-2.11.0
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch
@@ -1,4 +1,7 @@
-From ebc29962ac27264772a4227f5abd6900cb72fa79 Mon Sep 17 00:00:00 2001
+From e33d3ba4c34d0893d9d07b62ad4eea41d2e8bbc0 Mon Sep 17 00:00:00 2001
+Message-Id: <e33d3ba4c34d0893d9d07b62ad4eea41d2e8bbc0.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 20:16:05 +0100
 Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
@@ -11,10 +14,10 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index aa107ee41..3da1c830f 100644
+index f23c6efd39d4..cdff130d1292 100644
 --- a/arch/arm/boot/dts/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -164,7 +164,7 @@
+@@ -186,7 +186,7 @@ vdd_cpu: DCDC_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <750000>;
@@ -24,5 +27,5 @@ index aa107ee41..3da1c830f 100644
 				regulator-ramp-delay = <6000>;
 				regulator-state-mem {
 -- 
-2.16.4
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch
@@ -1,4 +1,7 @@
-From 302cd9b8a9f1f8a7735fabea3b9a7645dc40f9cc Mon Sep 17 00:00:00 2001
+From e073d75cd0dbfbcbbf1b46e565b326db37b75e6a Mon Sep 17 00:00:00 2001
+Message-Id: <e073d75cd0dbfbcbbf1b46e565b326db37b75e6a.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Sun, 7 Jan 2018 01:52:44 +0100
 Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
@@ -17,14 +20,14 @@ similar effects with eMMC hardware.

 Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
 ---
- drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++++++++++
+ drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
-index a3f1c2b30..7eac1f221 100644
+index d36991acd6df..a526927e29df 100644
 --- a/drivers/mmc/host/dw_mmc-rockchip.c
 +++ b/drivers/mmc/host/dw_mmc-rockchip.c
-@@ -16,6 +16,11 @@
+@@ -12,6 +12,11 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
@@ -36,7 +39,7 @@ index a3f1c2b30..7eac1f221 100644
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
-@@ -334,6 +339,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
+@@ -330,6 +335,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
 
@@ -103,7 +106,7 @@ index a3f1c2b30..7eac1f221 100644
 static int dw_mci_rockchip_probe(struct platform_device *pdev)
 {
 	const struct dw_mci_drv_data *drv_data;
-@@ -361,6 +426,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
+@@ -357,6 +422,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
 	}
 
 	pm_runtime_put_autosuspend(&pdev->dev);
@@ -112,5 +115,5 @@ index a3f1c2b30..7eac1f221 100644
 	return 0;
 }
 -- 
-2.14.1
+2.36.1

--- a/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch
@@ -0,0 +1,63 @@
+From 392472dc977300a9f2a62159c105a6dfed878643 Mon Sep 17 00:00:00 2001
+Message-Id: <392472dc977300a9f2a62159c105a6dfed878643.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 10 May 2022 22:57:26 +0200
+Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
+
+Enable Bluetooth support via UART0. Use the existing bindings
+for Realtek rtl8723bs Bluetooth device.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index cdff130d1292..e904c130dedc 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -388,6 +388,20 @@ bl_en: bl-en {
+ 		};
+ 	};
+ 
+	bluetooth {
+		bt_enable_pin: bt-enable-pin {
+			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_device_wake_pin: bt-device-wake-pin {
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_host_wake_pin: bt-host-wake-pin {
+			rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+ 	buttons {
+ 		pwrbtn: pwrbtn {
+ 			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+@@ -520,6 +534,18 @@ &tsadc {
+ 
+ &uart0 {
+ 	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
+	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "realtek,rtl8723bs-bt";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_device_wake_pin &bt_host_wake_pin &bt_enable_pin>;
+		enable-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>;
+		device-wake-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
+		host-wake-gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>;
+	};
+ };
+ 
+ &uart1 {
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch
@@ -1,98 +0,0 @@
-From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 21:58:56 +0100
-Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
-
-Adding the appropriate nodes in order to exploit the WiFi capabilities
-of the board.
-Since these capabilities are provided through SDIO, and the SDIO
-nodes were not defined, these were added too.
-
-These seems to depend on each other so they are added in one big
-patch.
-
-Split if necessary.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 62 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 1e43527aa..d4df13bed 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -6,8 +6,70 @@
- /dts-v1/;
- 
- #include "rk3288-tinker.dtsi"
-+#include <dt-bindings/clock/rockchip,rk808.h>
- 
- / {
- 	model = "Rockchip RK3288 Asus Tinker Board";
- 	compatible = "asus,rk3288-tinker", "rockchip,rk3288";
-+
-+	/* This is essential to get SDIO devices working.
-+	   The Wifi depends on SDIO ! */
-+	sdio_pwrseq: sdio-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rk808 RK808_CLKOUT1>;
-+		clock-names = "ext_clock";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
-+
-+		/*
-+		 * On the module itself this is one of these (depending
-+		 * on the actual card populated):
-+		 * - SDIO_RESET_L_WL_REG_ON
-+		 * - PDN (power down when low)
-+		 */
-+		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	wireless-wlan {
-+		compatible = "wlan-platdata";
-+		rockchip,grf = <&grf>;
-+		sdio_vref = <1800>;
-+		status = "okay";
-+		wifi_chip_type = "8723bs";
-+		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
-+	};
-+};
-+
-+&io_domains {
-+	wifi-supply = <&vcc_18>;
-+};
-+
-+&pinctrl {
-+	sdio-pwrseq {
-+		wifi_enable_h: wifienable-h {
-+			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		chip_enable_h: chip-enable-h {
-+			rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&sdio0 {
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	cap-sdio-irq;
-+	clock-frequency = <50000000>;
-+	clock-freq-min-max = <200000 50000000>;
-+	disable-wp;
-+	keep-power-in-suspend;
-+	mmc-pwrseq = <&sdio_pwrseq>;
-+	non-removable;
-+	num-slots = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
-+	sd-uhs-sdr104;
-+	status = "okay";
-+	supports-sdio;
- };
-- 
-2.16.4
-
--- a/buildroot-external/board/khadas/kernel-vim.config
+++ b/buildroot-external/board/khadas/kernel-vim.config
@@ -315,8 +315,22 @@ CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_PL022=y
 CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_SPIDEV=m
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_MAX77620=y
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MESON_A1=y
+CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -342,7 +356,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
-CONFIG_KHADAS_MCU_FAN_THERMAL=m
+CONFIG_KHADAS_MCU_FAN_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_DW_WATCHDOG=y
@@ -355,7 +369,7 @@ CONFIG_MFD_MAX77620=y
 CONFIG_MFD_RK808=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_ROHM_BD718XX=y
-CONFIG_MFD_KHADAS_MCU=m
+CONFIG_MFD_KHADAS_MCU=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_AXP20X=y
--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@@ -26,6 +26,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m

 CONFIG_SYSFB=y
--- a/buildroot-external/board/raspberrypi/cmdline.txt
+++ b/buildroot-external/board/raspberrypi/cmdline.txt
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty1
+dwc_otg.lpm_enable=0 console=tty1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:55aa:u
--- a/buildroot-external/board/raspberrypi/kernel.config
+++ b/buildroot-external/board/raspberrypi/kernel.config
@@ -4,3 +4,7 @@

 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
+
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=y
--- a/buildroot-external/board/raspberrypi/yellow/config.txt
+++ b/buildroot-external/board/raspberrypi/yellow/config.txt
@@ -10,45 +10,9 @@ arm_64bit=1
 # uncomment to enable primary UART console
 enable_uart=1

-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-# Uncomment to disable continous SD-card poll (for USB SSD)
-#dtparam=sd_poll_once=on
+# No HDMI on Yellow, but we can't set to 16 since we need the full firmware
+# for codecs
+gpu_mem=32

 # Uncomment some or all of these to enable the optional hardware interfaces
 #dtparam=i2c_arm=on
@@ -66,11 +30,6 @@ enable_uart=1

 # Additional overlays and parameters are documented /boot/overlays/README

-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
 [all]
-#dtoverlay=vc4-fkms-v3d
-#max_framebuffers=2
 device_tree=bcm2711-rpi-cm4-ha-yellow.dtb

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch
@@ -1,8 +1,8 @@
 From 2d3d8c091bc692999a1c519c1dc1570cc8be2358 Mon Sep 17 00:00:00 2001
-Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Apr 2022 14:47:59 +0200
-Subject: [PATCH 1/9] ARM: dts: bcm2711: Add device tree for Home Assistant
+Subject: [PATCH 01/10] ARM: dts: bcm2711: Add device tree for Home Assistant
 Yellow

 Add device tree for Home Assistant Yellow, a Compute Module 4 based I/O
@@ -656,5 +656,5 @@ index 000000000000..fdc5ec5bc956
@@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts"
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
@@ -1,10 +1,10 @@
 From a4a63bb6f6789c00762b92f0469d10bac525d1f9 Mon Sep 17 00:00:00 2001
-Message-Id: <a4a63bb6f6789c00762b92f0469d10bac525d1f9.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+Message-Id: <a4a63bb6f6789c00762b92f0469d10bac525d1f9.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 02/10] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio
 module

 Enable UART4 by default and mux pins including hardware flow control.
@@ -57,5 +57,5 @@ index 61d8c81d3de4..8db71876a78c 100644
 
 	uart5_pins: uart5_pins {
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
@@ -1,10 +1,10 @@
 From c0ddd45166d5aa922045da915202540db3ef2dc2 Mon Sep 17 00:00:00 2001
-Message-Id: <c0ddd45166d5aa922045da915202540db3ef2dc2.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+Message-Id: <c0ddd45166d5aa922045da915202540db3ef2dc2.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 03/10] ARM: dts: bcm2711: yellow: Mux debug UART5

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -46,5 +46,5 @@ index 8db71876a78c..d1dea0a214a6 100644
 
 	aliases {
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
@@ -1,10 +1,10 @@
 From 606dcdc896ffc18001ad4983d45a2e23cacd040a Mon Sep 17 00:00:00 2001
-Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 04/10] ARM: dts: bcm2711: yellow: Enable I2C6 by default

 The main I2C bus used on Yellow is I2C6. Enable it by default.

@@ -31,5 +31,5 @@ index d1dea0a214a6..0bdbfdd44aed 100644
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2s_pins>;
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
@@ -1,10 +1,10 @@
-From 955e093a5ed6b27e36506df63cfb268cc82f2935 Mon Sep 17 00:00:00 2001
-Message-Id: <955e093a5ed6b27e36506df63cfb268cc82f2935.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+From 298d5254c1c2151b34eaf87f7e2f44205d34d909 Mon Sep 17 00:00:00 2001
+Message-Id: <298d5254c1c2151b34eaf87f7e2f44205d34d909.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 05/10] ARM: dts: bcm2711: yellow: add I2S audio codec

 Add TI PCM5122 I2S audio codec.

@@ -14,7 +14,7 @@ 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 0bdbfdd44aed..f203f7037915 100644
+index 0bdbfdd44aed..f6f42bf45c92 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
@@ -535,11 +535,22 @@ &i2c6 {
@@ -47,7 +47,7 @@ index 0bdbfdd44aed..f203f7037915 100644
 +&sound {
 +	compatible = "simple-audio-card";
 +	simple-audio-card,format = "i2s";
-+	simple-audio-card,name = "pcm5521-sound";
+	simple-audio-card,name = "pcm5121-sound";
 +	status = "okay";
 +
 +	simple-audio-card,cpu {
@@ -63,5 +63,5 @@ index 0bdbfdd44aed..f203f7037915 100644
 	pinctrl-names = "default";
 	pinctrl-0 = <&audio_pins>;
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
@@ -1,10 +1,10 @@
-From 7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9 Mon Sep 17 00:00:00 2001
-Message-Id: <7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+From 41127a02d66d07d0a17e904557899b15a067a692 Mon Sep 17 00:00:00 2001
+Message-Id: <41127a02d66d07d0a17e904557899b15a067a692.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 06/10] ARM: dts: bcm2711: yellow: enable GPIO keys

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
 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 f203f7037915..c74193b3987e 100644
+index f6f42bf45c92..e2fa42a11cc9 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
@@ -4,6 +4,8 @@
@@ -37,15 +37,15 @@ index f203f7037915..c74193b3987e 100644
 +		status = "okay";
 +
 +		power {
-+			label = "Power Button";
+			label = "Blue Button";
 +			linux,code = <KEY_POWER>;
 +			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 +			debounce-interval = <100>; // ms
 +		};
 +
 +		user {
-+			label = "User Button";
-+			linux,code = <KEY_MACRO>;
+			label = "Red Button";
+			linux,code = <BTN_1>;
 +			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 +			debounce-interval = <100>; // ms
 +		};
@@ -68,5 +68,5 @@ index f203f7037915..c74193b3987e 100644
 		brcm,pins = <9 10 11>;
 		brcm,function = <BCM2835_FSEL_ALT0>;
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
@@ -1,10 +1,10 @@
-From c6861d55c71dfd6fb428e9e8b4246e78d526df82 Mon Sep 17 00:00:00 2001
-Message-Id: <c6861d55c71dfd6fb428e9e8b4246e78d526df82.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+From efe5e827dc0653066ebc9f71de2ccf391a4bb27e Mon Sep 17 00:00:00 2001
+Message-Id: <efe5e827dc0653066ebc9f71de2ccf391a4bb27e.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 07/10] ARM: dts: bcm2711: yellow: add user LED

 Add yellow user LED.

@@ -14,7 +14,7 @@ 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 c74193b3987e..f5d1d8b9ea32 100644
+index e2fa42a11cc9..6039c7894796 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
@@ -336,7 +336,6 @@ soc {
@@ -39,5 +39,5 @@ index c74193b3987e..f5d1d8b9ea32 100644
 
 &pwm1 {
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
@@ -1,10 +1,10 @@
-From 57289aaeb0a0a3b09991d005d6e3317ed2da6b7a Mon Sep 17 00:00:00 2001
-Message-Id: <57289aaeb0a0a3b09991d005d6e3317ed2da6b7a.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+From 31ab383d0803e39e94472eea192e712fcc6e3cd6 Mon Sep 17 00:00:00 2001
+Message-Id: <31ab383d0803e39e94472eea192e712fcc6e3cd6.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 08/10] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -12,7 +12,7 @@ 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 f5d1d8b9ea32..5c682d09616a 100644
+index 6039c7894796..f78428ea64f3 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
@@ -575,6 +575,11 @@ card_codec: pcm5121@4c {
@@ -28,5 +28,5 @@ index f5d1d8b9ea32..5c682d09616a 100644
 
 &i2s {
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
@@ -1,10 +1,10 @@
-From 7211af3546200c906b719c3e664d2554d48a43f5 Mon Sep 17 00:00:00 2001
-Message-Id: <7211af3546200c906b719c3e664d2554d48a43f5.1649681596.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch>
+From f1553f413c8f53694d2f27db5b5c43d19cf1ff4f Mon Sep 17 00:00:00 2001
+Message-Id: <f1553f413c8f53694d2f27db5b5c43d19cf1ff4f.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.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
+Subject: [PATCH 09/10] ARM: dts: bcm2711: yellow: enable USB host mode by
 default

 The DWC2 controller is disable by default. Enable it since Home
@@ -16,7 +16,7 @@ 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 5c682d09616a..b988d50234c1 100644
+index f78428ea64f3..711a09441ad0 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
@@ -599,6 +599,15 @@ &sdhost {
@@ -36,5 +36,5 @@ index 5c682d09616a..b988d50234c1 100644
 	led-modes = <0x00 0x08>; /* link/activity link */
 };
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
@@ -0,0 +1,33 @@
+From 6f5e8133651df38d187c05bc27fd8fa25f0216da Mon Sep 17 00:00:00 2001
+Message-Id: <6f5e8133651df38d187c05bc27fd8fa25f0216da.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Wed, 27 Apr 2022 20:36:19 +0200
+Subject: [PATCH 10/10] ARM: dts: bcm2711: yellow: use generic activity trigger
+ for green LED
+
+Use the generic trigger "activity" for the green LED so that any
+system activity is shown.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 2 +-
+ 1 file changed, 1 insertion(+), 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 711a09441ad0..f2f4f1a49592 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -622,7 +622,7 @@ audio_pins: audio_pins {
+ &leds {
+ 	act_led: led-act {
+ 		label = "led0";
+-		linux,default-trigger = "mmc0";
+		linux,default-trigger = "activity";
+ 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ 	};
+ 
+-- 
+2.36.0
+
--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch
@@ -1,8 +1,8 @@
 From 78704bc154d695ee16fdf8396f4d60b740190014 Mon Sep 17 00:00:00 2001
-Message-Id: <78704bc154d695ee16fdf8396f4d60b740190014.1649951002.git.stefan@agner.ch>
+Message-Id: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.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
+Subject: [PATCH 1/5] 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
@@ -50,5 +50,5 @@ index e24c94c7d2..98ba4dc052 100644
 /* GPIO */
 #define CONFIG_BCM2835_GPIO
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch
@@ -1,10 +1,10 @@
 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>
+Message-Id: <c2447aa922068cebd9bbaac45acae3d853abf687.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.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
+Subject: [PATCH 2/5] 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
@@ -64,5 +64,5 @@ index 182274036c..98628e1ca4 100644
 	 * 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
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0003-nvme-improve-readability-of-nvme_setup_prps.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0003-nvme-improve-readability-of-nvme_setup_prps.patch
@@ -0,0 +1,51 @@
+From 78924e9cf8c4af0baafcb2e7224bf04ad65276de Mon Sep 17 00:00:00 2001
+Message-Id: <78924e9cf8c4af0baafcb2e7224bf04ad65276de.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 23 Sep 2021 23:52:44 +0200
+Subject: [PATCH 3/5] nvme: improve readability of nvme_setup_prps()
+
+Improve readability by introducing consts, reuse consts where
+appropriate and adding variables with discriptive name.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/nvme/nvme.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
+index 3bda491e12..1601651449 100644
+--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
+@@ -76,12 +76,12 @@ static int nvme_wait_ready(struct nvme_dev *dev, bool enabled)
+ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 			   int total_len, u64 dma_addr)
+ {
+-	u32 page_size = dev->page_size;
+	const u32 page_size = dev->page_size;
+	const u32 prps_per_page = (page_size >> 3) - 1;
+ 	int offset = dma_addr & (page_size - 1);
+ 	u64 *prp_pool;
+ 	int length = total_len;
+ 	int i, nprps;
+-	u32 prps_per_page = (page_size >> 3) - 1;
+ 	u32 num_pages;
+ 
+ 	length -= (page_size - offset);
+@@ -119,9 +119,9 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 	prp_pool = dev->prp_pool;
+ 	i = 0;
+ 	while (nprps) {
+-		if (i == ((page_size >> 3) - 1)) {
+-			*(prp_pool + i) = cpu_to_le64((ulong)prp_pool +
+-					page_size);
+		if (i == prps_per_page) {
+			u64 next_prp_list = (u64)prp_pool + page_size;
+			*(prp_pool + i) = cpu_to_le64(next_prp_list);
+ 			i = 0;
+ 			prp_pool += page_size;
+ 		}
+-- 
+2.36.0
+
--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0004-nvme-Use-pointer-for-CPU-addressed-buffers.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0004-nvme-Use-pointer-for-CPU-addressed-buffers.patch
@@ -0,0 +1,263 @@
+From e040d976ecbdd8071bbcb73d78e17ababa88c51f Mon Sep 17 00:00:00 2001
+Message-Id: <e040d976ecbdd8071bbcb73d78e17ababa88c51f.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 23 Sep 2021 23:58:35 +0200
+Subject: [PATCH 4/5] nvme: Use pointer for CPU addressed buffers
+
+Pass buffers which use CPU addressing as void pointers. This aligns with
+DMA APIs which use void pointers as argument. It will avoid unnecessary
+type casts when adding support bus address translations.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/nvme/nvme.c      | 50 ++++++++++++++++++++--------------------
+ drivers/nvme/nvme_show.c |  4 ++--
+ include/nvme.h           | 12 +++++-----
+ 3 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
+index 1601651449..6ab94ada7e 100644
+--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
+@@ -74,11 +74,11 @@ static int nvme_wait_ready(struct nvme_dev *dev, bool enabled)
+ }
+ 
+ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+-			   int total_len, u64 dma_addr)
+			   int total_len, void *buffer)
+ {
+ 	const u32 page_size = dev->page_size;
+ 	const u32 prps_per_page = (page_size >> 3) - 1;
+-	int offset = dma_addr & (page_size - 1);
+	int offset = (uintptr_t)buffer & (page_size - 1);
+ 	u64 *prp_pool;
+ 	int length = total_len;
+ 	int i, nprps;
+@@ -92,10 +92,10 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 	}
+ 
+ 	if (length)
+-		dma_addr += (page_size - offset);
+		buffer += (page_size - offset);
+ 
+ 	if (length <= page_size) {
+-		*prp2 = dma_addr;
+		*prp2 = (u64)buffer;
+ 		return 0;
+ 	}
+ 
+@@ -125,11 +125,11 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 			i = 0;
+ 			prp_pool += page_size;
+ 		}
+-		*(prp_pool + i++) = cpu_to_le64(dma_addr);
+-		dma_addr += page_size;
+		*(prp_pool + i++) = cpu_to_le64((u64)buffer);
+		buffer += page_size;
+ 		nprps--;
+ 	}
+-	*prp2 = (ulong)dev->prp_pool;
+	*prp2 = (u64)dev->prp_pool;
+ 
+ 	flush_dcache_range((ulong)dev->prp_pool, (ulong)dev->prp_pool +
+ 			   dev->prp_entry_num * sizeof(u64));
+@@ -450,42 +450,42 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid,
+ }
+ 
+ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
+-		  unsigned cns, dma_addr_t dma_addr)
+		  unsigned int cns, void *buffer)
+ {
+ 	struct nvme_command c;
+ 	u32 page_size = dev->page_size;
+-	int offset = dma_addr & (page_size - 1);
+	int offset = (uintptr_t)buffer & (page_size - 1);
+ 	int length = sizeof(struct nvme_id_ctrl);
+ 	int ret;
+ 
+ 	memset(&c, 0, sizeof(c));
+ 	c.identify.opcode = nvme_admin_identify;
+ 	c.identify.nsid = cpu_to_le32(nsid);
+-	c.identify.prp1 = cpu_to_le64(dma_addr);
+	c.identify.prp1 = cpu_to_le64((u64)buffer);
+ 
+ 	length -= (page_size - offset);
+ 	if (length <= 0) {
+ 		c.identify.prp2 = 0;
+ 	} else {
+-		dma_addr += (page_size - offset);
+-		c.identify.prp2 = cpu_to_le64(dma_addr);
+		buffer += (page_size - offset);
+		c.identify.prp2 = cpu_to_le64((u64)buffer);
+ 	}
+ 
+ 	c.identify.cns = cpu_to_le32(cns);
+ 
+-	invalidate_dcache_range(dma_addr,
+-				dma_addr + sizeof(struct nvme_id_ctrl));
+	invalidate_dcache_range((uintptr_t)buffer,
+				(uintptr_t)buffer + sizeof(struct nvme_id_ctrl));
+ 
+ 	ret = nvme_submit_admin_cmd(dev, &c, NULL);
+ 	if (!ret)
+-		invalidate_dcache_range(dma_addr,
+-					dma_addr + sizeof(struct nvme_id_ctrl));
+		invalidate_dcache_range((uintptr_t)buffer,
+					(uintptr_t)buffer + sizeof(struct nvme_id_ctrl));
+ 
+ 	return ret;
+ }
+ 
+ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+-		      dma_addr_t dma_addr, u32 *result)
+		      void *buffer, u32 *result)
+ {
+ 	struct nvme_command c;
+ 	int ret;
+@@ -493,7 +493,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+ 	memset(&c, 0, sizeof(c));
+ 	c.features.opcode = nvme_admin_get_features;
+ 	c.features.nsid = cpu_to_le32(nsid);
+-	c.features.prp1 = cpu_to_le64(dma_addr);
+	c.features.prp1 = cpu_to_le64((u64)buffer);
+ 	c.features.fid = cpu_to_le32(fid);
+ 
+ 	ret = nvme_submit_admin_cmd(dev, &c, result);
+@@ -513,13 +513,13 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+ }
+ 
+ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11,
+-		      dma_addr_t dma_addr, u32 *result)
+		      void *buffer, u32 *result)
+ {
+ 	struct nvme_command c;
+ 
+ 	memset(&c, 0, sizeof(c));
+ 	c.features.opcode = nvme_admin_set_features;
+-	c.features.prp1 = cpu_to_le64(dma_addr);
+	c.features.prp1 = cpu_to_le64((u64)buffer);
+ 	c.features.fid = cpu_to_le32(fid);
+ 	c.features.dword11 = cpu_to_le32(dword11);
+ 
+@@ -570,7 +570,7 @@ static int nvme_set_queue_count(struct nvme_dev *dev, int count)
+ 	u32 q_count = (count - 1) | ((count - 1) << 16);
+ 
+ 	status = nvme_set_features(dev, NVME_FEAT_NUM_QUEUES,
+-			q_count, 0, &result);
+			q_count, NULL, &result);
+ 
+ 	if (status < 0)
+ 		return status;
+@@ -622,7 +622,7 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev)
+ 	if (!ctrl)
+ 		return -ENOMEM;
+ 
+-	ret = nvme_identify(dev, 0, 1, (dma_addr_t)(long)ctrl);
+	ret = nvme_identify(dev, 0, 1, ctrl);
+ 	if (ret) {
+ 		free(ctrl);
+ 		return -EIO;
+@@ -708,7 +708,7 @@ static int nvme_blk_probe(struct udevice *udev)
+ 	ns->dev = ndev;
+ 	/* extract the namespace id from the block device name */
+ 	ns->ns_id = trailing_strtol(udev->name);
+-	if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)(long)id)) {
+	if (nvme_identify(ndev, ns->ns_id, 0, id)) {
+ 		free(id);
+ 		return -EIO;
+ 	}
+@@ -743,7 +743,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr,
+ 	u64 prp2;
+ 	u64 total_len = blkcnt << desc->log2blksz;
+ 	u64 temp_len = total_len;
+-	uintptr_t temp_buffer = (uintptr_t)buffer;
+	void *temp_buffer = buffer;
+ 
+ 	u64 slba = blknr;
+ 	u16 lbas = 1 << (dev->max_transfer_shift - ns->lba_shift);
+@@ -890,7 +890,7 @@ static int nvme_probe(struct udevice *udev)
+ 		char name[20];
+ 
+ 		memset(id, 0, sizeof(*id));
+-		if (nvme_identify(ndev, i, 0, (dma_addr_t)(long)id)) {
+		if (nvme_identify(ndev, i, 0, id)) {
+ 			ret = -EIO;
+ 			goto free_id;
+ 		}
+diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
+index 15e459da1a..c30adfada5 100644
+--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
+@@ -111,14 +111,14 @@ int nvme_print_info(struct udevice *udev)
+ 	ALLOC_CACHE_ALIGN_BUFFER(char, buf_ctrl, sizeof(struct nvme_id_ctrl));
+ 	struct nvme_id_ctrl *ctrl = (struct nvme_id_ctrl *)buf_ctrl;
+ 
+-	if (nvme_identify(dev, 0, 1, (dma_addr_t)(long)ctrl))
+	if (nvme_identify(dev, 0, 1, ctrl))
+ 		return -EIO;
+ 
+ 	print_optional_admin_cmd(le16_to_cpu(ctrl->oacs), ns->devnum);
+ 	print_optional_nvm_cmd(le16_to_cpu(ctrl->oncs), ns->devnum);
+ 	print_format_nvme_attributes(ctrl->fna, ns->devnum);
+ 
+-	if (nvme_identify(dev, ns->ns_id, 0, (dma_addr_t)(long)id))
+	if (nvme_identify(dev, ns->ns_id, 0, id))
+ 		return -EIO;
+ 
+ 	print_formats(id, ns);
+diff --git a/include/nvme.h b/include/nvme.h
+index 2cdf8ce320..8ff823cd81 100644
+--- a/include/nvme.h
+++ b/include/nvme.h
+@@ -18,12 +18,12 @@ struct nvme_dev;
+  * @dev:	NVMe controller device
+  * @nsid:	0 for controller, namespace id for namespace to identify
+  * @cns:	1 for controller, 0 for namespace
+- * @dma_addr:	dma buffer address to store the identify result
+ * @buffer:	dma buffer address to store the identify result
+  * @return:	0 on success, -ETIMEDOUT on command execution timeout,
+  *		-EIO on command execution fails
+  */
+ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
+-		  unsigned cns, dma_addr_t dma_addr);
+		  unsigned int cns, void *buffer);
+ 
+ /**
+  * nvme_get_features - retrieve the attributes of the feature specified
+@@ -33,13 +33,13 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
+  * @dev:	NVMe controller device
+  * @fid:	feature id to provide data
+  * @nsid:	namespace id the command applies to
+- * @dma_addr:	data structure used as part of the specified feature
+ * @buffer:	data structure used as part of the specified feature
+  * @result:	command-specific result in the completion queue entry
+  * @return:	0 on success, -ETIMEDOUT on command execution timeout,
+  *		-EIO on command execution fails
+  */
+ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+-		      dma_addr_t dma_addr, u32 *result);
+		      void *buffer, u32 *result);
+ 
+ /**
+  * nvme_set_features - specify the attributes of the feature indicated
+@@ -49,13 +49,13 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+  * @dev:	NVMe controller device
+  * @fid:	feature id to provide data
+  * @dword11:	command-specific input parameter
+- * @dma_addr:	data structure used as part of the specified feature
+ * @buffer:	data structure used as part of the specified feature
+  * @result:	command-specific result in the completion queue entry
+  * @return:	0 on success, -ETIMEDOUT on command execution timeout,
+  *		-EIO on command execution fails
+  */
+ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11,
+-		      dma_addr_t dma_addr, u32 *result);
+		      void *buffer, u32 *result);
+ 
+ /**
+  * nvme_scan_namespace - scan all namespaces attached to NVMe controllers
+-- 
+2.36.0
+
--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0005-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0005-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch
@@ -0,0 +1,198 @@
+From c4736c35141e519d15430660e17c274e142e886d Mon Sep 17 00:00:00 2001
+Message-Id: <c4736c35141e519d15430660e17c274e142e886d.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Fri, 24 Sep 2021 00:27:39 +0200
+Subject: [PATCH 5/5] nvme: translate virtual addresses into the bus's address
+ space
+
+So far we've been content with passing physical/CPU addresses when
+configuring memory addresses into NVMe controllers, but not all
+platforms have buses with transparent mappings. Specifically the
+Raspberry Pi 4 might introduce an offset to memory accesses incoming
+from its PCIe port.
+
+Introduce nvme_virt_to_bus() and nvme_bus_to_virt() to cater with these
+limitations, and make sure we don't break non DM users.
+For devices where PCIe's view of host memory doesn't match the memory
+as seen by the CPU.
+
+A similar change has been introduced for XHCI controller with
+commit 1a474559d90a ("xhci: translate virtual addresses into the bus's
+address space").
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/nvme/nvme.c | 32 ++++++++++++++++++--------------
+ drivers/nvme/nvme.h | 15 +++++++++++++++
+ 2 files changed, 33 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
+index 6ab94ada7e..dd190bd654 100644
+--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
+@@ -95,7 +95,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 		buffer += (page_size - offset);
+ 
+ 	if (length <= page_size) {
+-		*prp2 = (u64)buffer;
+		*prp2 = nvme_virt_to_bus(dev, buffer);
+ 		return 0;
+ 	}
+ 
+@@ -120,16 +120,16 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
+ 	i = 0;
+ 	while (nprps) {
+ 		if (i == prps_per_page) {
+-			u64 next_prp_list = (u64)prp_pool + page_size;
+-			*(prp_pool + i) = cpu_to_le64(next_prp_list);
+			u64 next = nvme_virt_to_bus(dev, prp_pool + page_size);
+			*(prp_pool + i) = cpu_to_le64(next);
+ 			i = 0;
+ 			prp_pool += page_size;
+ 		}
+-		*(prp_pool + i++) = cpu_to_le64((u64)buffer);
+		*(prp_pool + i++) = cpu_to_le64(nvme_virt_to_bus(dev, buffer));
+ 		buffer += page_size;
+ 		nprps--;
+ 	}
+-	*prp2 = (u64)dev->prp_pool;
+	*prp2 = nvme_virt_to_bus(dev, dev->prp_pool);
+ 
+ 	flush_dcache_range((ulong)dev->prp_pool, (ulong)dev->prp_pool +
+ 			   dev->prp_entry_num * sizeof(u64));
+@@ -356,6 +356,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
+ 	int result;
+ 	u32 aqa;
+ 	u64 cap = dev->cap;
+	u64 dma_addr;
+ 	struct nvme_queue *nvmeq;
+ 	/* most architectures use 4KB as the page size */
+ 	unsigned page_shift = 12;
+@@ -396,8 +397,10 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
+ 	dev->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;
+ 
+ 	writel(aqa, &dev->bar->aqa);
+-	nvme_writeq((ulong)nvmeq->sq_cmds, &dev->bar->asq);
+-	nvme_writeq((ulong)nvmeq->cqes, &dev->bar->acq);
+	dma_addr = nvme_virt_to_bus(dev, nvmeq->sq_cmds);
+	nvme_writeq(dma_addr, &dev->bar->asq);
+	dma_addr = nvme_virt_to_bus(dev, nvmeq->cqes);
+	nvme_writeq(dma_addr, &dev->bar->acq);
+ 
+ 	result = nvme_enable_ctrl(dev);
+ 	if (result)
+@@ -423,7 +426,7 @@ static int nvme_alloc_cq(struct nvme_dev *dev, u16 qid,
+ 
+ 	memset(&c, 0, sizeof(c));
+ 	c.create_cq.opcode = nvme_admin_create_cq;
+-	c.create_cq.prp1 = cpu_to_le64((ulong)nvmeq->cqes);
+	c.create_cq.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, nvmeq->cqes));
+ 	c.create_cq.cqid = cpu_to_le16(qid);
+ 	c.create_cq.qsize = cpu_to_le16(nvmeq->q_depth - 1);
+ 	c.create_cq.cq_flags = cpu_to_le16(flags);
+@@ -440,7 +443,7 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid,
+ 
+ 	memset(&c, 0, sizeof(c));
+ 	c.create_sq.opcode = nvme_admin_create_sq;
+-	c.create_sq.prp1 = cpu_to_le64((ulong)nvmeq->sq_cmds);
+	c.create_sq.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, nvmeq->sq_cmds));
+ 	c.create_sq.sqid = cpu_to_le16(qid);
+ 	c.create_sq.qsize = cpu_to_le16(nvmeq->q_depth - 1);
+ 	c.create_sq.sq_flags = cpu_to_le16(flags);
+@@ -461,14 +464,14 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
+ 	memset(&c, 0, sizeof(c));
+ 	c.identify.opcode = nvme_admin_identify;
+ 	c.identify.nsid = cpu_to_le32(nsid);
+-	c.identify.prp1 = cpu_to_le64((u64)buffer);
+	c.identify.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, buffer));
+ 
+ 	length -= (page_size - offset);
+ 	if (length <= 0) {
+ 		c.identify.prp2 = 0;
+ 	} else {
+ 		buffer += (page_size - offset);
+-		c.identify.prp2 = cpu_to_le64((u64)buffer);
+		c.identify.prp2 = cpu_to_le64(nvme_virt_to_bus(dev, buffer));
+ 	}
+ 
+ 	c.identify.cns = cpu_to_le32(cns);
+@@ -493,7 +496,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid,
+ 	memset(&c, 0, sizeof(c));
+ 	c.features.opcode = nvme_admin_get_features;
+ 	c.features.nsid = cpu_to_le32(nsid);
+-	c.features.prp1 = cpu_to_le64((u64)buffer);
+	c.features.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, buffer));
+ 	c.features.fid = cpu_to_le32(fid);
+ 
+ 	ret = nvme_submit_admin_cmd(dev, &c, result);
+@@ -519,7 +522,7 @@ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11,
+ 
+ 	memset(&c, 0, sizeof(c));
+ 	c.features.opcode = nvme_admin_set_features;
+-	c.features.prp1 = cpu_to_le64((u64)buffer);
+	c.features.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, buffer));
+ 	c.features.fid = cpu_to_le32(fid);
+ 	c.features.dword11 = cpu_to_le32(dword11);
+ 
+@@ -776,7 +779,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr,
+ 		c.rw.slba = cpu_to_le64(slba);
+ 		slba += lbas;
+ 		c.rw.length = cpu_to_le16(lbas - 1);
+-		c.rw.prp1 = cpu_to_le64(temp_buffer);
+		c.rw.prp1 = cpu_to_le64(nvme_virt_to_bus(dev, temp_buffer));
+ 		c.rw.prp2 = cpu_to_le64(prp2);
+ 		status = nvme_submit_sync_cmd(dev->queues[NVME_IO_Q],
+ 				&c, NULL, IO_TIMEOUT);
+@@ -835,6 +838,7 @@ static int nvme_probe(struct udevice *udev)
+ 	struct nvme_id_ns *id;
+ 
+ 	ndev->instance = trailing_strtol(udev->name);
+	ndev->dev = udev->parent;
+ 
+ 	INIT_LIST_HEAD(&ndev->namespaces);
+ 	ndev->bar = dm_pci_map_bar(udev, PCI_BASE_ADDRESS_0,
+diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
+index c6aae4da5d..31e6899bca 100644
+--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
+@@ -7,8 +7,15 @@
+ #ifndef __DRIVER_NVME_H__
+ #define __DRIVER_NVME_H__
+ 
+#include <phys2bus.h>
+ #include <asm/io.h>
+ 
+#if CONFIG_IS_ENABLED(DM_USB)
+#define nvme_to_dev(_dev)     _dev->dev
+#else
+#define nvme_to_dev(_dev)     NULL
+#endif
+
+ struct nvme_id_power_state {
+ 	__le16			max_power;	/* centiwatts */
+ 	__u8			rsvd2;
+@@ -596,6 +603,9 @@ enum {
+ 
+ /* Represents an NVM Express device. Each nvme_dev is a PCI function. */
+ struct nvme_dev {
+#if CONFIG_IS_ENABLED(DM_USB)
+	struct udevice *dev;
+#endif
+ 	struct list_head node;
+ 	struct nvme_queue **queues;
+ 	u32 __iomem *dbs;
+@@ -635,4 +645,9 @@ struct nvme_ns {
+ 	u8 flbas;
+ };
+ 
+static inline dma_addr_t nvme_virt_to_bus(struct nvme_dev *dev, void *addr)
+{
+	return dev_phys_to_bus(nvme_to_dev(dev), virt_to_phys(addr));
+}
+
+ #endif /* __DRIVER_NVME_H__ */
+-- 
+2.36.0
+
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -1,63 +1,44 @@
-
-# Architecture
 BR2_aarch64=y
-BR2_ARM_FPU_FP_ARMV8=y
-
-# Misc
-BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
-
-# Needed for grub2
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 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_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
@@ -67,24 +48,25 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
-BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
-BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
@@ -92,57 +74,48 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_DOCKER_CLI=y
-BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
-BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
-# BR2_PACKAGE_SYSTEMD_HWDB is not set
-# BR2_PACKAGE_SYSTEMD_NETWORKD is not set
-BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_UTIL_LINUX_LOGIN=y
-BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
-BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GPTFDISK=y
-BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
-BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RPI_RF_MOD=y
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_ARM64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
-
-# Filesystem image
+BR2_PACKAGE_TINI=y
+BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
+BR2_PACKAGE_RAUC=y
+BR2_PACKAGE_RAUC_DBUS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
+# BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
+# BR2_PACKAGE_SYSTEMD_NETWORKD is not set
+BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
+BR2_PACKAGE_UTIL_LINUX_LOGIN=y
+BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
+BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
+BR2_TARGET_GRUB2_INSTALL_TOOLS=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_E2FSPROGS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_GPTFDISK=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_RAUC=y
+BR2_PACKAGE_GASKET=y
+BR2_PACKAGE_HASSIO=y
+BR2_PACKAGE_HASSIO_ARCH="aarch64"
+BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64"
+BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_RPI_RF_MOD=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -2,14 +2,13 @@ BR2_x86_64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -21,28 +20,25 @@ 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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 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_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
@@ -52,24 +48,25 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
-BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
-BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
@@ -77,59 +74,51 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GPTFDISK=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
-BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSIO_ARCH="amd64"
-BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RPI_RF_MOD=y
-BR2_PACKAGE_RTL88X2BU=y
-
-# Bootloader
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_I386_EFI=y
 BR2_TARGET_GRUB2_X86_64_EFI=y
 BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
 BR2_TARGET_GRUB2_INSTALL_TOOLS=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_E2FSPROGS=y
+BR2_PACKAGE_HOST_GPTFDISK=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_RAUC=y
+BR2_PACKAGE_GASKET=y
+BR2_PACKAGE_HASSIO=y
+BR2_PACKAGE_HASSIO_ARCH="amd64"
+BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64"
+BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_RPI_RF_MOD=y
+BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -2,14 +2,13 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -21,7 +20,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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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,28 +32,27 @@ 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_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -65,33 +63,30 @@ BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -101,25 +96,20 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/uboot.config"
-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/khadas/vim3/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/khadas/vim3/uboot-boot.ush"
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_KHADAS_BOOT=y
-BR2_PACKAGE_KHADAS_BOOT_VIM3=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -2,14 +2,13 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -21,7 +20,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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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"
@@ -33,27 +32,27 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -64,33 +63,30 @@ BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -100,28 +96,22 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config"
-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/hardkernel/odroid-c2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/hardkernel/odroid-c2/uboot-boot.ush"
+BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c2"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -2,14 +2,13 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -21,7 +20,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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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"
@@ -33,27 +32,25 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -64,33 +61,30 @@ BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -100,26 +94,23 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c4"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot.config"
-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/hardkernel/odroid-c4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/hardkernel/odroid-c4/uboot-boot.ush"
+BR2_PACKAGE_HARDKERNEL_BOOT=y
+BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c4"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -2,14 +2,13 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -21,7 +20,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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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"
@@ -33,27 +32,27 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -64,33 +63,30 @@ BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -100,28 +96,23 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config"
-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/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/hardkernel/odroid-n2/uboot-boot.ush"
+BR2_PACKAGE_HARDKERNEL_BOOT=y
+BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -3,14 +3,13 @@ BR2_cortex_a7=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -22,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-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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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
@@ -32,28 +31,28 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -64,33 +63,30 @@ BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -99,29 +95,24 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config"
-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/hardkernel/odroid-xu4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/hardkernel/odroid-xu4/uboot-boot.ush"
+BR2_PACKAGE_HARDKERNEL_BOOT=y
+BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-xu"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -2,19 +2,17 @@ BR2_x86_64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_GETTY=y
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
@@ -22,28 +20,25 @@ 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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 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_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
@@ -53,24 +48,25 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
-BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
-BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
@@ -78,60 +74,51 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_QEMU_GUEST_AGENT=y
-BR2_PACKAGE_XE_GUEST_UTILITIES=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_X86_64_EFI=y
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
+BR2_TARGET_GRUB2_INSTALL_TOOLS=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
-BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="amd64"
 BR2_PACKAGE_HASSIO_MACHINE="qemux86-64"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_QEMU_GUEST_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
+BR2_PACKAGE_XE_GUEST_UTILITIES=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -4,14 +4,13 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,22 +32,18 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_BOOTCODE_BIN=y
@@ -57,8 +52,11 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -67,35 +65,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -105,23 +99,19 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_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/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/uboot-boot.ush"
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi2"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -1,17 +1,15 @@
 BR2_aarch64=y
-BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,35 +31,34 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+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_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_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
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -70,35 +67,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -108,25 +101,21 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_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/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/uboot-boot64.ush"
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3-64"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -4,14 +4,13 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,35 +32,34 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+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_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_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
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -70,35 +68,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -108,25 +102,21 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_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/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/uboot-boot.ush"
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -1,17 +1,15 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,35 +31,35 @@ 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_STRESS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+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_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_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
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_NVME=y
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -70,37 +68,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_NVME=y
-BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -110,25 +102,22 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64/uboot.config"
-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/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/uboot-boot64.ush"
+BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -4,14 +4,13 @@ BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,34 +32,33 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+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_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_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
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -69,35 +67,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -107,25 +101,21 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4/uboot.config"
-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/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/uboot-boot.ush"
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -4,14 +4,13 @@ BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -23,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/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.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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"
@@ -35,28 +34,27 @@ 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_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -65,35 +63,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -103,30 +97,26 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config"
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
-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/asus/tinker/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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/asus/tinker/uboot-boot.ush"
+BR2_PACKAGE_BLUETOOTH_RTL8723=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="tinker"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BLUETOOTH_RTL8723=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -1,17 +1,15 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/patches"
 BR2_SSP_REGULAR=y
-BR2_SSP_OPTION="-fstack-protector"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -33,33 +31,34 @@ 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_STRESS_NG=y
 BR2_PACKAGE_JQ=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_UDISKS2=y
-# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
-BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
-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_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_INPUT_EVENT_DAEMON=y
+# BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
+BR2_PACKAGE_NVME=y
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -68,38 +67,31 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_NVME=y
-BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_ENGINE=y
+BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RAUC_DBUS=y
-BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_RAUC_NETWORK=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
+BR2_PACKAGE_SYSTEMD_COREDUMP=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-BR2_PACKAGE_SYSTEMD_RESOLVED=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
-BR2_PACKAGE_INPUT_EVENT_DAEMON=y
+BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -109,24 +101,21 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot.config"
-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_15=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HOST_TEMPIO=y
+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_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_APPARMOR_PROFILES=y
-BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
+BR2_PACKAGE_HOST_TEMPIO=y
+BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/kernel/hassos.config
+++ b/buildroot-external/kernel/hassos.config
@@ -32,6 +32,9 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_LOGO is not set
 # CONFIG_DEBUG_STACK_USAGE is not set

+CONFIG_IPV6=y
+CONFIG_IPV6_MROUTE=y
+
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
@@ -80,6 +83,9 @@ CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m

+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_BITMAP_IP=m
 CONFIG_IP_SET_BITMAP_IPMAC=m
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -4,4 +4,4 @@ VERSION_BUILD=0
 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"

-DEPLOYMENT="development"
+DEPLOYMENT="production"
--- a/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723
+++ b/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-echo "Setup the Bluetooth chip"
-echo 146 > /sys/class/gpio/export
-echo 149 > /sys/class/gpio/export
-echo 151 > /sys/class/gpio/export
-echo high > /sys/class/gpio/gpio146/direction
-echo high > /sys/class/gpio/gpio149/direction
-echo high > /sys/class/gpio/gpio151/direction
-
-
-echo "Resetting the Bluetooth chip"
-echo 0 > /sys/class/gpio/gpio149/value
-echo -e "\tBluetooth chip power down..."
-sleep 1
-echo 1 > /sys/class/gpio/gpio149/value
-echo -e "\tBluetooth chip power up..."
-sleep 1
-echo -e "\tResetting done"
-
-/usr/sbin/rtk_hciattach -s 115200 /dev/ttyS0 rtk_h5 115200 flow
--- a/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.mk
+++ b/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.mk
@@ -4,27 +4,19 @@
 #
 ################################################################################

-BLUETOOTH_RTL8723_VERSION = 1.0.0
+BLUETOOTH_RTL8723_VERSION = 1.1.0
 BLUETOOTH_RTL8723_LICENSE = Apache License 2.0
 BLUETOOTH_RTL8723_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
 BLUETOOTH_RTL8723_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-rtl8723
 BLUETOOTH_RTL8723_SITE_METHOD = local

 define BLUETOOTH_RTL8723_BUILD_CMDS
-	curl -L -o $(@D)/rtk_hciattach https://raw.githubusercontent.com/home-assistant/hassos-blobs/e0c8b7aebb626694cf5c017a9e03068aee2bc604/rtl_bt/rtk_hciattach
-
-	curl -L -o $(@D)/rtl8723b_config https://raw.githubusercontent.com/home-assistant/hassos-blobs/e0c8b7aebb626694cf5c017a9e03068aee2bc604/rtl_bt/rtl8723b_config.bin
-	curl -L -o $(@D)/rtl8723b_fw https://raw.githubusercontent.com/home-assistant/hassos-blobs/e0c8b7aebb626694cf5c017a9e03068aee2bc604/rtl_bt/rtl8723b_fw.bin
+	curl -L -o $(@D)/rtl8723bs_config.bin https://raw.githubusercontent.com/home-assistant/hassos-blobs/e0c8b7aebb626694cf5c017a9e03068aee2bc604/rtl_bt/rtl8723b_config.bin
 endef

 define BLUETOOTH_RTL8723_INSTALL_TARGET_CMDS
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
-	$(INSTALL) -m 0755 $(@D)/bluetooth-rtl8723 $(TARGET_DIR)/usr/sbin/
-	$(INSTALL) -m 0644 $(@D)/bluetooth-rtl8723.service $(TARGET_DIR)/usr/lib/systemd/system/
-
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/rtlbt
-	$(INSTALL) -m 0644 $(@D)/rtl8723b_* $(TARGET_DIR)/lib/firmware/rtlbt/
-	$(INSTALL) -m 0755 $(@D)/rtk_hciattach $(TARGET_DIR)/usr/sbin/
+	$(INSTALL) -m 0644 $(@D)/rtl8723bs_config.bin $(TARGET_DIR)/lib/firmware/rtl_bt/
 endef

 $(eval $(generic-package))
--- a/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.service
+++ b/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.service
@@ -1,11 +0,0 @@
-[Unit]
-Description=Bluetooth for RTL8723
-Before=bluetooth.service
-After=dev-ttyS0.device
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/bluetooth-rtl8723
-
-[Install]
-WantedBy=hassos-hardware.target
--- a/buildroot-external/package/hassio/fetch-container-image.sh
+++ b/buildroot-external/package/hassio/fetch-container-image.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash

+set -e
+set -u
+set -o pipefail
+
 arch=$1
 machine=$2
 version_json=$3
@@ -7,8 +11,6 @@ image_json_name=$4
 dl_dir=$5
 dst_dir=$6

-set -e
-
 image_name=$(jq -e -r --arg image_json_name "${image_json_name}" \
 	--arg arch "${arch}" --arg machine "${machine}" \
 	'.images[$image_json_name] | sub("{arch}"; $arch) | sub("{machine}"; $machine)' \
@@ -17,7 +19,7 @@ image_tag=$(jq -e -r --arg image_json_name "${image_json_name}" \
 	'.[$image_json_name]' < "${version_json}")
 full_image_name="${image_name}:${image_tag}"

-image_digest=$(skopeo inspect "docker://${full_image_name}" | jq -r '.Digest')
+image_digest=$(skopeo inspect --retry-times=5 "docker://${full_image_name}" | jq -r '.Digest')

 # Cleanup image name file name use
 image_file_name="${full_image_name//[:\/]/_}@${image_digest//[:\/]/_}"
--- a/buildroot-external/patches/grub2/0001-loadenv-add-file_env-to-load-var-from-file.patch
+++ b/buildroot-external/patches/grub2/0001-loadenv-add-file_env-to-load-var-from-file.patch
@@ -1,5 +1,5 @@
-From ee4adaa04e3ac1a5d20ad713a0133382c35da5a1 Mon Sep 17 00:00:00 2001
-Message-Id: <ee4adaa04e3ac1a5d20ad713a0133382c35da5a1.1645704230.git.stefan@agner.ch>
+From 184b6a054e04bb4c7fb4885a30d62314229dc551 Mon Sep 17 00:00:00 2001
+Message-Id: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 24 Feb 2022 12:38:48 +0100
 Subject: [PATCH] loadenv: add file_env to load var from file
@@ -115,5 +115,5 @@ index 3fd664aac..7e7b18139 100644
 +  grub_unregister_extcmd (cmd_file);
 }
 -- 
-2.35.1
+2.36.0

--- a/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
+++ b/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
@@ -0,0 +1,44 @@
+From 3b2b7d0c9a886d913062ed5a9ffa8b764d882540 Mon Sep 17 00:00:00 2001
+Message-Id: <3b2b7d0c9a886d913062ed5a9ffa8b764d882540.1651759401.git.stefan@agner.ch>
+In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
+References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 27 Jan 2020 15:01:16 -0500
+Subject: [PATCH] squash4: Fix an uninitialized variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc says:
+
+grub-core/fs/squash4.c: In function ‘direct_read’:
+grub-core/fs/squash4.c:868:10: error: ‘err’ may be used uninitialized in
+this function [-Werror=maybe-uninitialized]
+  868 |       if (err)
+      |          ^
+cc1: all warnings being treated as errors
+
+This patch initializes it to GRUB_ERR_NONE.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/squash4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
+index 95d5c1e1f..82704f966 100644
+--- a/grub-core/fs/squash4.c
+++ b/grub-core/fs/squash4.c
+@@ -746,7 +746,7 @@ direct_read (struct grub_squash_data *data,
+ 	     struct grub_squash_cache_inode *ino,
+ 	     grub_off_t off, char *buf, grub_size_t len)
+ {
+-  grub_err_t err;
+  grub_err_t err = GRUB_ERR_NONE;
+   grub_off_t cumulated_uncompressed_size = 0;
+   grub_uint64_t a = 0;
+   grub_size_t i;
+-- 
+2.36.0
+
--- a/buildroot-external/patches/grub2/0003-efidisk-pass-buffers-with-higher-alignment.patch
+++ b/buildroot-external/patches/grub2/0003-efidisk-pass-buffers-with-higher-alignment.patch
@@ -0,0 +1,70 @@
+From e3c27254802e1d7ebaa64df8edb93b0a899f1678 Mon Sep 17 00:00:00 2001
+Message-Id: <e3c27254802e1d7ebaa64df8edb93b0a899f1678.1652212828.git.stefan@agner.ch>
+In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652212828.git.stefan@agner.ch>
+References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652212828.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 5 May 2022 15:46:51 +0200
+Subject: [PATCH] efidisk: pass buffers with higher alignment
+
+Despite the UEFI specification saying "the requirement is that the
+start address of a buffer must be evenly divisible by IoAlign with
+no remainder.", it seems that a higher alignment requirement is
+neecssary on some system (e.g. a Intel NUC system with NVMe SSD).
+That particular system has IoAlign set to 2, and sometimes returns
+status 7 when buffers with alignment of 2 are passed. Things seem
+to work fine with buffers aligned to 4 bytes.
+
+It seems that some system interpret IoAlign > 1 to mean 2 ^ IoAlign.
+There is also such a hint in an example printed in the Driver Writer's
+Guide:
+ScsiPassThruMode.IoAlign = 2; // Data must be alligned on 4-byte boundary
+
+However, some systems (e.g. U-Boot and some drivers in EDK II) do follow
+the UEFI specification.
+
+Work around by using an alignment of at least 512 bytes in case
+alignment is requested. Also make sure that IoAlign is still respected
+as per UEFI specification if a higher alignment than block size is
+requested.
+
+Note: The problem has only noticed with compressed squashfs. It seems
+that ext4 (and presumably other file system drivers) pass buffers with
+a higher alignment already.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ grub-core/disk/efi/efidisk.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
+index 9e20af70e..c4eb4f4e7 100644
+--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
+@@ -553,8 +553,22 @@ grub_efidisk_readwrite (struct grub_disk *disk, grub_disk_addr_t sector,
+   d = disk->data;
+   bio = d->block_io;
+ 
+-  /* Set alignment to 1 if 0 specified */
+-  io_align = bio->media->io_align ? bio->media->io_align : 1;
+  /*
+   * If IoAlign is > 1, it should represent the required alignment. However,
+   * some UEFI implementation on Intel NUC systems seem to use IoAlign=2 but
+   * require 2^IoAlign.
+   * Make sure to align to at least block size if IO alignment is required.
+   */
+  if (bio->media->io_align > 1)
+    {
+      if (bio->media->io_align < bio->media->block_size)
+        io_align = bio->media->block_size;
+      else
+        io_align = bio->media->io_align;
+    }
+  else
+    io_align = 1;
+
+   num_bytes = size << disk->log_sector_size;
+ 
+   if ((grub_addr_t) buf & (io_align - 1))
+-- 
+2.36.1
+
--- a/buildroot-external/rootfs-overlay/etc/input-event-daemon.conf
+++ b/buildroot-external/rootfs-overlay/etc/input-event-daemon.conf
@@ -0,0 +1,10 @@
+#
+# /etc/input-event-daemon.conf
+#
+
+[Global]
+listen = /dev/input/by-path/platform-gpio-keys-event
+
+[Keys]
+BTN_1     = /usr/bin/systemctl start hassos-config.service
+
--- a/buildroot-external/rootfs-overlay/etc/systemd/logind.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/logind.conf
@@ -18,9 +18,14 @@
 #KillOnlyUsers=
 #KillExcludeUsers=root
 #InhibitDelayMaxSec=5
-#HandlePowerKey=poweroff
-#HandleSuspendKey=suspend
-#HandleHibernateKey=hibernate
+HandlePowerKey=ignore
+HandlePowerKeyLongPress=poweroff
+HandleRebootKey=ignore
+HandleRebootKeyLongPress=reboot
+HandleSuspendKey=ignore
+HandleSuspendKeyLongPress=suspend
+HandleHibernateKey=ignore
+HandleHibernateKeyLongPress=hibernate
 HandleLidSwitch=ignore
 HandleLidSwitchExternalPower=ignore
 HandleLidSwitchDocked=ignore
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount
@@ -2,6 +2,8 @@
 Description=HassOS boot partition
 DefaultDependencies=no
 Before=umount.target local-fs.target
+After=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2dboot.service
+Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2dboot.service
 Conflicts=umount.target

 [Mount]
Author	SHA1	Message	Date
Stefan Agner	80079db997	Set deployment type to production	2022-05-11 10:39:10 +02:00
Stefan Agner	3c5ba17b58	Fix boot issue on Khadas VIM3 (#1894 ) Make sure pin controller is enabled.	2022-05-11 10:36:48 +02:00
Stefan Agner	925984c09f	Improve GRUB2 boot to also adhere UEFI spec (#1830 ) (#1893 )	2022-05-11 01:51:30 +02:00
Stefan Agner	ba8bda73fa	Fix Bluetooth on ASUS Tinker (#1891 ) (#1892 ) * Use upstream Linux driver for Bluetooth on ASUS Tinker * Drop unnecessary Bluetooth initialization systemd service Bluetooth is now entirely handled by the kernel.	2022-05-11 01:51:19 +02:00
Stefan Agner	4a42d578fe	Linux: Update kernel 5.15.38 (#1890 )	2022-05-10 23:29:55 +02:00
Stefan Agner	e98edce5d3	Extend USB storage quirks for Raspberry Pi (#1883 ) Add StarTech.com SATA to USB Cable - USB 3.0 to 2.5" SATA III Hard Drive Adapter.	2022-05-05 18:49:36 +02:00
Stefan Agner	42d4b5f2a2	Linux: Update kernel 5.15.37 (#1882 )	2022-05-05 16:53:41 +02:00
Stefan Agner	fdf7823887	Fix booting on certain UEFI systems (#1830 ) (#1881 )	2022-05-05 16:53:26 +02:00
Stefan Agner	87319b6e29	Recreate defconfigs using savedefconfig target (#1876 ) * Recreate defconfigs using savedefconfig target Buildroot allows to generate minimal defconfigs using the savedefconfig target. Regenerate all our configurations so they all look alive and are minimalistc. * Fix generic_aarch64_defconfig	2022-04-27 22:52:15 +02:00
Stefan Agner	d284a1dee7	Small Yellow improvements (#1875 ) * Enable additional LED triggers * Improve Yellow device tree Fix soundcard name and use BTN_1 as key code. * Add input-event-daemon configuration Add minimal input-event-daemon configuration to avoid the default configuration taking effect. This minimal configuration triggers the USB configuration import on button press.	2022-04-27 22:51:55 +02:00
Stefan Agner	a9c2eedc71	Handle long-press system keys only (#1874 ) Only handle long-press system power, reboot and sleep keys.	2022-04-27 20:33:39 +02:00
Stefan Agner	bd52b7e97b	Enable Intel Wireless WiFi DVM Firmware support (#1872 ) (#1873 )	2022-04-27 20:28:17 +02:00
Stefan Agner	46ff688c20	Add Network options required for OpenThread Border Router (#1870 ) * Support firewall matching by pkttype Matching by pkttype is required by the reference OTBR firewall script. * Add additional Kernel configurations required for OpenThread.	2022-04-27 20:28:02 +02:00
Stefan Agner	be584a8a00	Support NVMe boot on Home Assistant Yellow (#1868 )	2022-04-26 00:54:42 +02:00
Stefan Agner	fd7d0253f3	Linux: Update kernel 5.15.35 (#1867 )	2022-04-25 14:58:31 +02:00
Stefan Agner	2114dd328f	Make container fetching more reliable (#1866 ) It seems that the GitHub container registry sometimes returns 503 service unavailable temporarily ("Error fetching tags list: invalid status code from registry 503"). Use skopeo's retry mechanism to try up to 5 times before failing.	2022-04-25 14:58:22 +02:00
Stefan Agner	e61246f5ba	Cleanup Yellow config.txt (#1865 )	2022-04-25 14:58:12 +02:00
Stefan Agner	2ac8222f19	Add USB storage quirks for Raspberry Pi by default (#1864 ) Add VID/PID of some known problematic USB SSD controllers to USB storage quirk list. This should make most USB SSD's work with Home Assistant OS out-of-the box.	2022-04-25 14:58:04 +02:00
Stefan Agner	5bd466c27d	Use board information from json for release builds (#1863 ) * Use board information from json for release builds	2022-04-25 14:57:53 +02:00
Karol Stosik	56baadc829	Update configuration.md (#1856 ) With CR LF my configuration wasn't used at all.	2022-04-25 14:35:01 +02:00
Stefan Agner	91d2092938	Add bugfix in GRUB2 squash4 squashfs code (#1830 ) (#1858 )	2022-04-20 14:07:13 +02:00
Stefan Agner	4310cfe916	Enable file system check for FAT boot partition (#1857 )	2022-04-20 14:06:56 +02:00
Stefan Agner	8994a59dfc	Add Intel WiFi 22000 series firmwares (#1853 ) (#1855 ) * Bump buildroot * buildroot 34328de0d9...ee56159464 (2): > package/linux-firmware: Add more Intel WiFi 22000 series variants > package/linux-firmware: Add Intel WiFi 22000 series * Add Intel WiFi 22000 series firmwares	2022-04-20 10:41:09 +02:00
Stefan Agner	734323eb1e	Bump buildroot (#1854 ) * buildroot c62532023d...34328de0d9 (2): > package/dhcp: build internal bind tool gen for host (not target) > Merge tag '2022.02.1' into 2022.02.x-haos	2022-04-19 17:25:47 +02:00