ODROID-XU4: Reset Ethernet properly on reboot (#1488 ) (#2108 )

Enable dependencies for IPv6 NAT support (#2106 )
* Enable dependencies for IPv6 NAT support This makes the ODROID-XU4 kernel to build properly with IPv6 NAT enabled as well.
2022-09-02 23:34:16 +02:00 · 2022-09-02 23:29:48 +02:00 · 2022-09-02 23:27:40 +02:00 · 2022-09-02 15:33:49 +02:00 · 2022-09-02 15:23:38 +02:00 · 2022-09-02 14:49:25 +02:00
115 changed files with 1015 additions and 482 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,12 +1,3 @@
-# We don't need this folder because we map the hole folder
-buildroot/
-buildroot-external/
-buildroot-patches/
-
-# Output/Release directory gets created using build scripts
-output*/
-release/
-
-# Ignore hidden directories as well
-.git/
-.github/
+# Ignore everything except what we really need
+*
+!scripts/
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,6 +25,7 @@ body:
      label: What operating system image do you use?
      options:
        - generic-x86-64 (Generic UEFI capable x86-64 systems)
+        - generic-aarch64 (Generic UEFI capable aarch64 systems)
        - khadas-vim3 (Khadas VIM3)
        - odroid-c2 (Hardkernel ODROID-C2)
        - odroid-c4 (Hardkernel ODROID-C4)
@@ -37,6 +38,7 @@ body:
        - rpi4  (Raspberry Pi 4/400 32-bit OS)
        - rpi4-64  (Raspberry Pi 4/400 64-bit OS)
        - tinker (ASUS Tinker Board/Tinker Board S)
+        - yellow (Home Assistant Yellow)
      description: >
        Can be found in the [Configuration panel -> Settings -> Info](https://my.home-assistant.io/redirect/info/). It is listed as the `Board` value.

--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,7 +5,7 @@ contact_links:
    about: Our documentation has its own issue tracker. Please report issues with the website there.

  - name: Report incorrect or missing information on our developer documentation
-    url: https://github.com/home-assistant/developers.home-assistant.io/issues
+    url: https://github.com/home-assistant/developers.home-assistant/issues
    about: Our developer documentation has its own issue tracker. Please report issues with the website there.

  - name: Request a feature for the Operating System
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -12,6 +12,9 @@ jobs:
    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
    name: Prepare build
    runs-on: [ "ubuntu-20.04" ]
+    permissions:
+      contents: read
+      pull-requests: read
    outputs:
      version_main: ${{ steps.version_main.outputs.version_main }}
      version_dev: ${{ steps.version_dev.outputs.version_dev }}${{ steps.version_pr.outputs.version_pr }}
@@ -32,7 +35,7 @@ jobs:
          version_pr=$(printf "%05d" ${{ github.event.pull_request.number }})
          echo "Development build for PR #${{ github.event.pull_request.number }}"
          echo "::set-output name=version_pr::${version_pr}"
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Get Major/Minor version
        id: version_main
        run: |
@@ -40,7 +43,7 @@ jobs:
          build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
          echo "::set-output name=version_main::${major}.${build}"
      - name: Create build matrix
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
        id: generate_matrix
        with:
          script: |
@@ -69,7 +72,7 @@ jobs:

    steps:
      - name: Define git reference
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
        id: generate_gitref
        with:
          script: |
@@ -78,7 +81,7 @@ jobs:
            return { "ref": context.payload.pull_request.head.sha }

      - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true
          persist-credentials: false
@@ -106,7 +109,7 @@ jobs:
            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}

      - name: Upload images
-        uses: burnett01/rsync-deployments@4.1
+        uses: burnett01/rsync-deployments@5.2
        with:
          rsh: -q
          switches: -aW
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -9,12 +9,12 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
      with:
        submodules: true

    - name: Check Dockerfile
-      uses: brpaz/hadolint-action@v1.1.0
+      uses: brpaz/hadolint-action@v1.5.0
      with:
        dockerfile: Dockerfile

--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -3,11 +3,13 @@ name: Release Drafter
 on:
  push:
    branches:
-      - dev
      - rel-*

 jobs:
  update_release_draft:
+    permissions:
+      contents: write  # for release-drafter/release-drafter to create a github release
+      pull-requests: read  # for release-drafter/release-drafter to read PR content and labels
    runs-on: ubuntu-latest
    steps:
      - uses: release-drafter/release-drafter@v5
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
      version_dev: ${{ steps.version_check.outputs.version_dev }}
      matrix: ${{ steps.generate_matrix.outputs.result }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Validate version
        id: version_check
        run: |
@@ -36,7 +36,7 @@ jobs:
          fi
          echo "::set-output name=version_dev::${tag_dev}"
      - name: Create build matrix
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
        id: generate_matrix
        with:
          script: |
@@ -44,6 +44,8 @@ jobs:
            return { "board": boards }

  build:
+    permissions:
+      contents: write  # for actions/upload-release-asset to upload release asset
    name: Release build for ${{ matrix.board.id }}
    needs: validate_release
    strategy:
@@ -52,7 +54,7 @@ jobs:

    steps:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          submodules: true

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -8,6 +8,9 @@ on:

 jobs:
  stale:
+    permissions:
+      issues: write  # for actions/stale to close stale issues
+      pull-requests: write  # for actions/stale to close stale PRs
    runs-on: ubuntu-latest
    steps:
      # The 90 day stale policy
@@ -16,7 +19,7 @@ jobs:
      # - No PRs marked as no-stale or pinned
      # - No issues marked as no-stale, help-wanted or pinned
      - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v4
+        uses: actions/stale@v5
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
--- a/17
+++ b/17
@@ -28,27 +28,24 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
        cpio \
        file \
        git \
+        graphviz \
+        jq \
        make \
        ncurses-dev \
+        openssh-client \
        patch \
        perl \
        python3 \
        python3-matplotlib \
        python-is-python3 \
-        graphviz \
+        qemu-utils \
        rsync \
+        skopeo \
        sudo \
        unzip \
-        zip \
-        wget \
-        qemu-utils \
-        openssh-client \
        vim \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-	skopeo \
-	jq \
+        wget \
+        zip \
    && rm -rf /var/lib/apt/lists/*

 # Init entry
--- a/Documentation/boards/generic-x86-64/README.md
+++ b/Documentation/boards/generic-x86-64/README.md
@@ -12,6 +12,7 @@ been tested with is listed below.
 |-----------------------|--------------|---------|-------------|
 | Intel NUC5CPYH        | Q3 2015      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC6CAYH        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+| Intel NUC6CAYS        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC7i3DNHE	| Q3 2017      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC10i3FNK2     | Q4 2019      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Gigabyte GB-BPCE-3455 | 2017         | yes*    | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
@@ -48,7 +49,7 @@ The following cards are supported:

 ## Bluetooth

-Bluetooth is untested.
+Bluetooth integrated in Intel Wireless cards working OK, other options untested.

 ## Installation

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

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.15.37 |
+| Open Virtual Appliance | 5.15.64 |
 | 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.37 |
-| Odroid-C2 | 5.15.37 |
-| Odroid-C4 | 5.15.37 |
-| Odroid-N2 | 5.15.37 |
-| Odroid-XU4 | 5.15.37 |
-| Generic aarch64 | 5.15.37 |
-| Generic x86-64 | 5.15.37 |
-| Khadas VIM3 | 5.15.37 |
+| Tinker Board | 5.15.64 |
+| Odroid-C2 | 5.15.64 |
+| Odroid-C4 | 5.15.64 |
+| Odroid-N2 | 5.15.64 |
+| Odroid-XU4 | 5.15.64 |
+| Generic aarch64 | 5.15.64 |
+| Generic x86-64 | 5.15.64 |
+| Khadas VIM3 | 5.15.64 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@@ -128,12 +128,12 @@ profile using DHCP, use the following commands on the host console:

 Home Assistant OS will recreate the default connection profile during boot.

-### Enabling WiFi
+### Enabling Wi-Fi

-WiFi is discouraged for reliability reasons. However if you're still like to use WiFi, you can us the `ha network` command to set up WiFi (example for a Raspberry Pi 4, check `ha network info` to check if your board supports WiFi and the name of the WiFi device):
+Wi-Fi is discouraged for reliability reasons. However, if you still prefer to use Wi-Fi, you can us the `ha network` command to set up Wi-Fi (example for a Raspberry Pi 4, check `ha network info` to check if your board supports Wi-Fi and the name of the Wi-Fi device):

 ```bash
-ha network update wlan0 --enabled --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid MY-SSID --wifi-psk MY_PASS
+ha network update wlan0 --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid "MY-SSID" --wifi-psk MY_PASS
 ````

 ### Powersave
--- a/2
+++ b/2
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -11,6 +11,7 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8821cu/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"
--- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
@@ -13,4 +13,8 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_SCSI_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y

+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_HWMON=y
+
 CONFIG_DRM_VIRTIO_GPU=m
--- a/buildroot-external/board/asus/tinker/kernel.config
+++ b/buildroot-external/board/asus/tinker/kernel.config
@@ -120,7 +120,6 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
@@ -1517,7 +1516,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 +1526,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 +2474,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/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch
+++ b/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch
@@ -0,0 +1,94 @@
+From 1fb890d987088f5b6b4c165d8d05480e15b8882e Mon Sep 17 00:00:00 2001
+Message-Id: <1fb890d987088f5b6b4c165d8d05480e15b8882e.1662147854.git.stefan@agner.ch>
+From: memeka <mihailescu2m@gmail.com>
+Date: Fri, 18 Jan 2019 14:36:21 +1030
+Subject: [PATCH] ODROID-XU4: regulator: s2mps11: add ethernet power reset in
+ shutdown function
+
+Ethernet device cannot be detected on warm boot sometimes. This patch is
+to add the power reset routines for ethernet device using PMIC. Then
+ethernet device can be reset hardware-wise.
+
+Change-Id: Iffbe2966da7e4679f63b91ab79241167391792df
+Signed-off-by: Brian Kim <brian.kim@hardkernel.com>
+Signed-off-by: Marian Mihailescu <mihailescu2m@gmail.com>
+---
+ drivers/regulator/s2mps11.c | 55 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
+diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
+index ebc67e3ddd4f..51f128076db9 100644
+--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
+@@ -1117,6 +1117,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
+ 	regulator_desc_s2mpu02_buck7(7),
+ };
+ 
+static int s2mps11_pmic_ethonoff(struct platform_device *pdev, bool onoff)
+{
+	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
+	unsigned int reg_val = 0;
+	int ret = 0;
+
+	ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, &reg_val);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to read S2MPS11_REG_L15CTRL value\n");
+		return ret;
+	}
+
+	ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, &reg_val);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to read S2MPS11_REG_L17CTRL value\n");
+		return ret;
+	}
+
+	if (onoff) {
+		/* ETH VDD0 ON */
+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, 0xFF, 0x72);
+		if (ret) {
+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL15 register\n");
+			return ret;
+		}
+
+		/* ETH VDD1 ON */
+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, 0xFF, 0x72);
+		if (ret) {
+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL17 register\n");
+			return ret;
+		}
+	} else {
+		/* ETH VDD0 OFF */
+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, 0x3F, 0x00);
+		if (ret) {
+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL15 register\n");
+			return ret;
+		}
+
+		/* ETH VDD1 OFF */
+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, 0x3F, 0x00);
+		if (ret) {
+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL17 register\n");
+			return ret;
+		}
+	}
+
+	return ret;
+}
+
+ static int s2mps11_pmic_probe(struct platform_device *pdev)
+ {
+ 	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
+@@ -1219,6 +1270,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
+ 		}
+ 	}
+ 
+	dev_info(&pdev->dev, "Resetting Ethernet\n");
+	s2mps11_pmic_ethonoff(pdev, false);
+	mdelay(10);
+	s2mps11_pmic_ethonoff(pdev, true);
+ out:
+ 	kfree(rdata);
+ 
+-- 
+2.37.2
+
--- 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
@@ -30,14 +30,12 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m

 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y

 CONFIG_FB=y
 CONFIG_FB_EFI=y

 CONFIG_DRM=y
 CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
@@ -156,3 +154,5 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_XTENSA=m

 CONFIG_THINKPAD_ACPI=m
+
+CONFIG_SENSORS_K10TEMP=m
--- a/buildroot-external/board/pc/grub.cfg
+++ b/buildroot-external/board/pc/grub.cfg
@@ -57,3 +57,11 @@ menuentry "Slot A (OK=$A_OK TRY=$A_TRY)" {
 menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
    linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B
 }
+
+menuentry "Slot A (rescue shell)" {
+    linux (${boothd},gpt2)/bzImage root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target
+}
+
+menuentry "Slot B (rescue shell)" {
+    linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
+}
--- a/buildroot-external/board/pc/ova/rootfs-overlay/etc/systemd/logind.conf
+++ b/buildroot-external/board/pc/ova/rootfs-overlay/etc/systemd/logind.conf
@@ -0,0 +1,45 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
+#
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the logind.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config.
+#
+# See logind.conf(5) for details.
+
+[Login]
+#NAutoVTs=6
+#ReserveVT=6
+#KillUserProcesses=yes
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#InhibitDelayMaxSec=5
+#UserStopDelaySec=10
+#HandlePowerKey=poweroff
+#HandleSuspendKey=suspend
+#HandleHibernateKey=hibernate
+#HandleLidSwitch=suspend
+#HandleLidSwitchExternalPower=suspend
+#HandleLidSwitchDocked=ignore
+#HandleRebootKey=reboot
+#HandleRebootKeyLongPress=poweroff
+#PowerKeyIgnoreInhibited=no
+#SuspendKeyIgnoreInhibited=no
+#HibernateKeyIgnoreInhibited=no
+#LidSwitchIgnoreInhibited=yes
+#RebootKeyIgnoreInhibited=no
+#HoldoffTimeoutSec=30s
+#IdleAction=ignore
+#IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RuntimeDirectoryInodesMax=400k
+#RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192
--- a/buildroot-external/board/raspberrypi/cmdline.txt
+++ b/buildroot-external/board/raspberrypi/cmdline.txt
@@ -1 +1 @@
-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
+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
--- a/buildroot-external/board/raspberrypi/config.txt
+++ b/buildroot-external/board/raspberrypi/config.txt
@@ -75,6 +75,8 @@ dtparam=audio=on
 # Enable DRM VC4 V3D driver on top of the dispmanx display stack
 dtoverlay=vc4-fkms-v3d
 max_framebuffers=2
+# Enable boost from 1.5Ghz to 1.8Ghz on compatible models
+arm_boost=1

 [all]
 #dtoverlay=vc4-fkms-v3d
--- a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch
+++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch
@@ -1,8 +1,8 @@
 From 24b77460dbfa2497ceb7a1611bf28b6eb88a1d74 Mon Sep 17 00:00:00 2001
-Message-Id: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+Message-Id: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH 1/5] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
+Subject: [PATCH] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -79,5 +79,5 @@ index 8acf04d0e4..5d5e700224 100644
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 -- 
-2.35.1
+2.36.1

--- a/buildroot-external/board/raspberrypi/patches/uboot/0002-usb-xhci-reset-endpoint-on-USB-stall.patch
+++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-usb-xhci-reset-endpoint-on-USB-stall.patch
@@ -1,10 +1,10 @@
 From c942eb452c1c31fe6259178b6e9fea5456d7fb9c Mon Sep 17 00:00:00 2001
-Message-Id: <c942eb452c1c31fe6259178b6e9fea5456d7fb9c.1645627172.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+Message-Id: <c942eb452c1c31fe6259178b6e9fea5456d7fb9c.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 27 Sep 2021 12:28:04 +0200
-Subject: [PATCH 2/5] usb: xhci: reset endpoint on USB stall
+Subject: [PATCH] usb: xhci: reset endpoint on USB stall

 There are devices which cause a USB stall when trying to read strings.
 Specifically Arduino Mega R3 stalls when trying to read the product
@@ -83,5 +83,5 @@ index 35bd5cd29e..430823cb9d 100644
 	/* Invalidate buffer to make it available to usb-core */
 	if (length > 0)
 -- 
-2.35.1
+2.36.1

--- a/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-add-NVMe-to-boot-order.patch
+++ b/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-add-NVMe-to-boot-order.patch
@@ -1,10 +1,10 @@
 From ae45864457182fcaa67911e1e3d8db242dff3646 Mon Sep 17 00:00:00 2001
-Message-Id: <ae45864457182fcaa67911e1e3d8db242dff3646.1645627172.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+Message-Id: <ae45864457182fcaa67911e1e3d8db242dff3646.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 29 Dec 2020 23:34:52 +0100
-Subject: [PATCH 3/5] rpi: add NVMe to boot order
+Subject: [PATCH] rpi: add NVMe to boot order

 The Compute Module 4 I/O Board can support a NVMe. Add NVMe to the boot
 order.
@@ -40,5 +40,5 @@ index 4c5c1ac31f..e24c94c7d2 100644
 	BOOT_TARGET_PXE(func) \
 	BOOT_TARGET_DHCP(func)
 -- 
-2.35.1
+2.36.1

--- a/buildroot-external/board/raspberrypi/patches/uboot/0004-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch
+++ b/buildroot-external/board/raspberrypi/patches/uboot/0004-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch
@@ -1,11 +1,10 @@
 From 3a13ff4eb509e8e80a52ae45c9a5573e745803c3 Mon Sep 17 00:00:00 2001
-Message-Id: <3a13ff4eb509e8e80a52ae45c9a5573e745803c3.1645627172.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+Message-Id: <3a13ff4eb509e8e80a52ae45c9a5573e745803c3.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 23 Sep 2021 23:43:31 +0200
-Subject: [PATCH 4/5] Revert "nvme: Correct the prps per page calculation
- method"
+Subject: [PATCH] Revert "nvme: Correct the prps per page calculation method"

 This reverts commit 859b33c948945f7904f60a2c12a3792d356d51ad.

@@ -40,5 +39,5 @@ index 3c529a2fce..3bda491e12 100644
 
 	length -= (page_size - offset);
 -- 
-2.35.1
+2.36.1

--- a/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch
+++ b/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch
@@ -1,11 +1,11 @@
 From b00922ee48987ef91f0ca2aa3a66ad22c6c83d57 Mon Sep 17 00:00:00 2001
-Message-Id: <b00922ee48987ef91f0ca2aa3a66ad22c6c83d57.1645627172.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+Message-Id: <b00922ee48987ef91f0ca2aa3a66ad22c6c83d57.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 7 Oct 2021 12:02:39 +0200
-Subject: [PATCH 5/5] usb: xhci-brcm: Make driver compatible with downstream
- device tree
+Subject: [PATCH] usb: xhci-brcm: Make driver compatible with downstream device
+ tree

 The downstream device tree uses just "generic-xhci" as compatible
 string. Use this string to make U-Boot work with the downstream Kernel.
@@ -29,5 +29,5 @@ index fe17924028..0c6938187b 100644
 };
 
 -- 
-2.35.1
+2.36.1

--- 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
@@ -1,10 +1,10 @@
-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 4ef63d77803aeb322fe72eb5445897eba52c68ff Mon Sep 17 00:00:00 2001
+Message-Id: <4ef63d77803aeb322fe72eb5445897eba52c68ff.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.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()
+Subject: [PATCH] nvme: improve readability of nvme_setup_prps()

 Improve readability by introducing consts, reuse consts where
 appropriate and adding variables with discriptive name.
@@ -47,5 +47,5 @@ index 3bda491e12..1601651449 100644
 			prp_pool += page_size;
 		}
 -- 
-2.36.0
+2.36.1

--- 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
@@ -1,10 +1,10 @@
-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 b3441191724335b5a41d73875584ea293f85a56b Mon Sep 17 00:00:00 2001
+Message-Id: <b3441191724335b5a41d73875584ea293f85a56b.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.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
+Subject: [PATCH] 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
@@ -259,5 +259,5 @@ index 2cdf8ce320..8ff823cd81 100644
 /**
  * nvme_scan_namespace - scan all namespaces attached to NVMe controllers
 -- 
-2.36.0
+2.36.1

--- 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
@@ -1,10 +1,10 @@
-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 54d797d83265e31e16db922eb7c12d4bbc749127 Mon Sep 17 00:00:00 2001
+Message-Id: <54d797d83265e31e16db922eb7c12d4bbc749127.1654086219.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.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
+Subject: [PATCH] nvme: translate virtual addresses into the bus's address
 space

 So far we've been content with passing physical/CPU addresses when
@@ -194,5 +194,5 @@ index c6aae4da5d..31e6899bca 100644
 +
 #endif /* __DRIVER_NVME_H__ */
 -- 
-2.36.0
+2.36.1

--- a/buildroot-external/board/raspberrypi/yellow/cmdline.txt
+++ b/buildroot-external/board/raspberrypi/yellow/cmdline.txt
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty1 console=serial0,115200n8 console=ttyAMA2,115200n8
+dwc_otg.lpm_enable=0 console=tty1 console=ttyAMA2,115200n8
--- a/buildroot-external/board/raspberrypi/yellow/config.txt
+++ b/buildroot-external/board/raspberrypi/yellow/config.txt
@@ -7,9 +7,12 @@ disable_splash=1
 kernel=u-boot.bin
 arm_64bit=1

-# uncomment to enable primary UART console
+# Enable primary UART by default
 enable_uart=1

+# Free up full-fledged PL011 UART for J11
+dtoverlay=miniuart-bt
+
 # No HDMI on Yellow, but we can't set to 16 since we need the full firmware
 # for codecs
 gpu_mem=32
@@ -23,9 +26,7 @@ gpu_mem=32
 #dtoverlay=lirc-rpi

 # Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
-#enable_uart=1
 #dtparam=i2c_arm=on
-#dtoverlay=miniuart-bt
 #dtoverlay=rpi-rf-mod

 # Additional overlays and parameters are documented /boot/overlays/README
--- a/buildroot-external/board/raspberrypi/yellow/meta
+++ b/buildroot-external/board/raspberrypi/yellow/meta
@@ -6,5 +6,5 @@ KERNEL_FILE=Image
 BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
-SUPERVISOR_MACHINE=raspberrypi4-64
+SUPERVISOR_MACHINE=yellow
 SUPERVISOR_ARCH=aarch64
--- 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.1651085802.git.stefan@agner.ch>
+Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Apr 2022 14:47:59 +0200
-Subject: [PATCH 01/10] ARM: dts: bcm2711: Add device tree for Home Assistant
+Subject: [PATCH 01/13] 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.36.0
+2.37.1

--- 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.1651085802.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+Message-Id: <a4a63bb6f6789c00762b92f0469d10bac525d1f9.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:33:09 +0100
-Subject: [PATCH 02/10] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio
+Subject: [PATCH 02/13] 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.36.0
+2.37.1

--- 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.1651085802.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+Message-Id: <c0ddd45166d5aa922045da915202540db3ef2dc2.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:44:23 +0100
-Subject: [PATCH 03/10] ARM: dts: bcm2711: yellow: Mux debug UART5
+Subject: [PATCH 03/13] 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.36.0
+2.37.1

--- 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.1651085802.git.stefan@agner.ch>
-In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:48:48 +0100
-Subject: [PATCH 04/10] ARM: dts: bcm2711: yellow: Enable I2C6 by default
+Subject: [PATCH 04/13] 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.36.0
+2.37.1

--- 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 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>
+Message-Id: <298d5254c1c2151b34eaf87f7e2f44205d34d909.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 17:19:01 +0100
-Subject: [PATCH 05/10] ARM: dts: bcm2711: yellow: add I2S audio codec
+Subject: [PATCH 05/13] ARM: dts: bcm2711: yellow: add I2S audio codec

 Add TI PCM5122 I2S audio codec.

@@ -63,5 +63,5 @@ index 0bdbfdd44aed..f6f42bf45c92 100644
 	pinctrl-names = "default";
 	pinctrl-0 = <&audio_pins>;
 -- 
-2.36.0
+2.37.1

--- 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 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>
+Message-Id: <41127a02d66d07d0a17e904557899b15a067a692.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 9 Mar 2021 15:02:53 +0100
-Subject: [PATCH 06/10] ARM: dts: bcm2711: yellow: enable GPIO keys
+Subject: [PATCH 06/13] ARM: dts: bcm2711: yellow: enable GPIO keys

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -68,5 +68,5 @@ index f6f42bf45c92..e2fa42a11cc9 100644
 		brcm,pins = <9 10 11>;
 		brcm,function = <BCM2835_FSEL_ALT0>;
 -- 
-2.36.0
+2.37.1

--- 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 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>
+Message-Id: <efe5e827dc0653066ebc9f71de2ccf391a4bb27e.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 28 Oct 2021 19:38:04 +0200
-Subject: [PATCH 07/10] ARM: dts: bcm2711: yellow: add user LED
+Subject: [PATCH 07/13] ARM: dts: bcm2711: yellow: add user LED

 Add yellow user LED.

@@ -39,5 +39,5 @@ index e2fa42a11cc9..6039c7894796 100644
 
 &pwm1 {
 -- 
-2.36.0
+2.37.1

--- 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 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>
+Message-Id: <31ab383d0803e39e94472eea192e712fcc6e3cd6.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 12 Nov 2021 17:33:32 +0100
-Subject: [PATCH 08/10] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
+Subject: [PATCH 08/13] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -28,5 +28,5 @@ index 6039c7894796..f78428ea64f3 100644
 
 &i2s {
 -- 
-2.36.0
+2.37.1

--- 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 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>
+Message-Id: <f1553f413c8f53694d2f27db5b5c43d19cf1ff4f.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 7 Jan 2022 17:10:00 +0100
-Subject: [PATCH 09/10] ARM: dts: bcm2711: yellow: enable USB host mode by
+Subject: [PATCH 09/13] ARM: dts: bcm2711: yellow: enable USB host mode by
 default

 The DWC2 controller is disable by default. Enable it since Home
@@ -36,5 +36,5 @@ index f78428ea64f3..711a09441ad0 100644
 	led-modes = <0x00 0x08>; /* link/activity link */
 };
 -- 
-2.36.0
+2.37.1

--- 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
@@ -1,10 +1,10 @@
 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>
+Message-Id: <6f5e8133651df38d187c05bc27fd8fa25f0216da.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.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
+Subject: [PATCH 10/13] ARM: dts: bcm2711: yellow: use generic activity trigger
 for green LED

 Use the generic trigger "activity" for the green LED so that any
@@ -29,5 +29,5 @@ index 711a09441ad0..f2f4f1a49592 100644
 	};
 
 -- 
-2.36.0
+2.37.1

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0011-ARM-dts-bcm2711-yellow-use-USB-OTG-mode-by-default.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0011-ARM-dts-bcm2711-yellow-use-USB-OTG-mode-by-default.patch
@@ -0,0 +1,32 @@
+From f626368d2e2c7b5fc9066e80ef33d58071c297b6 Mon Sep 17 00:00:00 2001
+Message-Id: <f626368d2e2c7b5fc9066e80ef33d58071c297b6.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 26 Jul 2022 15:53:59 +0200
+Subject: [PATCH 11/13] ARM: dts: bcm2711: yellow: use USB OTG mode by default
+
+OTG seems to work fine, and allows to use the USB-C port as a USB
+peripheral (e.g. in U-Boot via UMS command).
+
+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 f2f4f1a49592..f354bfb69093 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -601,7 +601,7 @@ &sdhost {
+ 
+ &usb {
+ 	compatible = "brcm,bcm2835-usb";
+-	dr_mode = "host";
+	dr_mode = "otg";
+ 	g-np-tx-fifo-size = <32>;
+ 	g-rx-fifo-size = <558>;
+ 	g-tx-fifo-size = <512 512 512 512 512 256 256>;
+-- 
+2.37.1
+
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-gpio-raspberrypi-exp-Workaround-polarity-firmware-bu.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-gpio-raspberrypi-exp-Workaround-polarity-firmware-bu.patch
@@ -0,0 +1,41 @@
+From 01e15ae929bb8442f3c9cb31b7cad182ecc4d520 Mon Sep 17 00:00:00 2001
+Message-Id: <01e15ae929bb8442f3c9cb31b7cad182ecc4d520.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Sat, 30 Jul 2022 11:12:13 +0200
+Subject: [PATCH 12/13] gpio: raspberrypi-exp: Workaround polarity firmware bug
+
+When configuring a GPIO as output, the firmware seems to invert the
+initial state when active low polarity is declared in the device tree.
+The bug has been acknowledged by the firmware team and will be fixed
+in a future firmware release:
+https://github.com/raspberrypi/linux/issues/5107
+
+Fix this by inverting the polarity on our side as well to make sure
+the initial output is set correctly.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/gpio/gpio-raspberrypi-exp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
+index 64a552ecc2ad..f986940c3a5d 100644
+--- a/drivers/gpio/gpio-raspberrypi-exp.c
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
+@@ -119,6 +119,11 @@ static int rpi_exp_gpio_dir_out(struct gpio_chip *gc, unsigned int off, int val)
+ 		return ret;
+ 	set_out.polarity = ret;		/* Retain existing setting */
+ 
+	/* Need to invert the GPIO in first config set if inverted polarity */
+	/* See https://github.com/raspberrypi/linux/issues/5107 */
+	if (set_out.polarity)
+		set_out.state = !val;
+
+ 	ret = rpi_firmware_property(gpio->fw, RPI_FIRMWARE_SET_GPIO_CONFIG,
+ 				    &set_out, sizeof(set_out));
+ 	if (ret || set_out.gpio != 0) {
+-- 
+2.37.1
+
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
@@ -0,0 +1,68 @@
+From 713afd6c80d4635306682a5643799195846271b1 Mon Sep 17 00:00:00 2001
+Message-Id: <713afd6c80d4635306682a5643799195846271b1.1659172941.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1659172941.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Sat, 30 Jul 2022 11:21:31 +0200
+Subject: [PATCH 13/13] ARM: dts: bcm2711: yellow: Add LED overrides
+
+Add device tree overrides for all three LEDs.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+index f354bfb69093..2d272a02128b 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -621,20 +621,24 @@ audio_pins: audio_pins {
+ 
+ &leds {
+ 	act_led: led-act {
+-		label = "led0";
+		label = "act";
+ 		linux,default-trigger = "activity";
+		default-state = "off";
+ 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ 	};
+ 
+ 	pwr_led: led-pwr {
+-		label = "led1";
+		label = "pwr";
+ 		linux,default-trigger = "default-on";
+		default-state = "off";
+ 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+ 	};
+ 
+-	user_led: led-user {
+-		label = "led2";
+	usr_led: led-usr {
+		label = "usr";
+ 		linux,default-trigger = "heartbeat";
+		default-state = "off";
+		panic-indicator;
+ 		gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
+ 	};
+ };
+@@ -670,14 +674,13 @@ cam0_reg: &cam1_reg {
+ 
+ / {
+ 	__overrides__ {
+-		act_led_gpio = <&act_led>,"gpios:4";
+-		act_led_activelow = <&act_led>,"gpios:8";
+ 		act_led_trigger = <&act_led>,"linux,default-trigger";
+ 
+-		pwr_led_gpio = <&pwr_led>,"gpios:4";
+ 		pwr_led_activelow = <&pwr_led>,"gpios:8";
+ 		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
+ 
+		usr_led_trigger = <&usr_led>,"linux,default-trigger";
+
+ 		eth_led0 = <&phy1>,"led-modes:0";
+ 		eth_led1 = <&phy1>,"led-modes:4";
+ 
+-- 
+2.37.1
+
--- a/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
+++ b/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
@@ -20,12 +20,22 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

+# Red Button pressed?
 if gpio input GPIO27; then
  sleep 1
+  # ... and Blue Button Pressed?
+  if gpio input GPIO26; then
+    echo "Boot wipe has been pressed, deleting boot files to trigger USB boot..."
+    fatrm mmc 0:1 /start4.elf
+    reset
+  fi
+  # Red still pressed?
  if gpio input GPIO27; then
    echo "Device wipe button has been pressed, setting wipe flag..."
    setenv bootargs_hassos "${bootargs_hassos} haos.wipe=1"
  fi
+elif gpio input GPIO26; then
+  ums 0 mmc 0
 fi

 # HassOS system A/B
--- a/buildroot-external/board/raspberrypi/yellow/uboot.config
+++ b/buildroot-external/board/raspberrypi/yellow/uboot.config
@@ -1,2 +1,3 @@
 CONFIG_CMD_NVME=y
 CONFIG_NVME=y
+CONFIG_CMD_USB_MASS_STORAGE=y
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -20,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/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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 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
@@ -71,7 +71,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -84,6 +88,7 @@ BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_TINI=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_DBUS=y
@@ -117,5 +122,6 @@ BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64"
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
+BR2_PACKAGE_RTL8821CU=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
@@ -20,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/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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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
@@ -71,7 +71,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -120,5 +124,6 @@ BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64"
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -20,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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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"
@@ -58,8 +58,12 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -111,5 +115,6 @@ BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
 BR2_PACKAGE_KHADAS_BOOT=y
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -20,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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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"
@@ -58,8 +58,12 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -113,5 +117,6 @@ 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_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -20,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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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"
@@ -56,8 +56,12 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -112,5 +116,6 @@ 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_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -20,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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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"
@@ -58,8 +58,12 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -114,5 +118,6 @@ 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_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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
@@ -58,8 +58,12 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -114,5 +118,6 @@ BR2_PACKAGE_HASSIO_MACHINE="odroid-xu"
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -14,13 +14,13 @@ 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_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/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/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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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
@@ -71,7 +71,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -119,6 +123,8 @@ BR2_PACKAGE_HASSIO_MACHINE="qemux86-64"
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_QEMU_GUEST_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
+BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=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
@@ -62,7 +62,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -64,7 +64,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -117,5 +121,6 @@ BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -65,7 +65,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -118,5 +122,6 @@ BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -65,7 +65,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -119,5 +123,6 @@ BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -64,7 +64,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -117,5 +121,6 @@ BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RTL88X2BU=y
+BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.64"
 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"
@@ -60,7 +60,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -64,7 +64,11 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -112,7 +116,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/boa
 BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
+BR2_PACKAGE_HASSIO_MACHINE="yellow"
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
--- a/buildroot-external/kernel/device-support.config
+++ b/buildroot-external/kernel/device-support.config
@@ -1,3 +1,10 @@
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_OPTION=m
@@ -28,9 +35,6 @@ CONFIG_USB_NET_SMSC95XX=m

 CONFIG_MEDIA_CEC_SUPPORT=y

-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_LE=y
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
--- a/buildroot-external/kernel/docker.config
+++ b/buildroot-external/kernel/docker.config
@@ -2,7 +2,6 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_NET_SCHED=y

 CONFIG_CGROUPS=y
@@ -48,6 +47,10 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_NAT=y
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_NAT=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
@@ -71,7 +74,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_OVERLAY_FS=y
-CONFIG_OVERLAY_FS_REDIRECT_DIR=y
 CONFIG_OVERLAY_FS_METACOPY=y

 CONFIG_CRYPTO_CCM=m
--- a/buildroot-external/kernel/hassos.config
+++ b/buildroot-external/kernel/hassos.config
@@ -32,8 +32,21 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_LOGO is not set
 # CONFIG_DEBUG_STACK_USAGE is not set

+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_LE=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_LEDS=y
+
 CONFIG_IPV6=y
 CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_SIT=m

 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -1,4 +1,4 @@
-VERSION_MAJOR=8
+VERSION_MAJOR=9
 VERSION_BUILD=0

 HASSOS_NAME="Home Assistant OS"
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@@ -56,6 +56,23 @@ install_spl() {
    fi
 }

+check_grubenv() {
+    BOOT_MNT=/mnt/boot
+
+    # Mount boot
+    if ! systemctl -q is-active mnt-boot.mount; then
+        systemctl start mnt-boot.mount
+    fi
+
+    # If GRUB is installed, check if GRUB environment has been currupted
+    if command -v grub-editenv > /dev/null; then
+        if ! grub-editenv "${BOOT_MNT}/EFI/BOOT/grubenv" list > /dev/null; then
+            echo "GRUB environment seems to be corrupted. Recreating a new environment."
+            grub-editenv "${BOOT_MNT}"/EFI/BOOT/grubenv create
+        fi
+    fi
+}
+
 post_install_kernel() {
    BOOT_MNT=/mnt/boot

@@ -79,6 +96,9 @@ post_install_kernel() {
 case "$1" in
     install-check)
         if [ "$RAUC_MF_COMPATIBLE" = "$RAUC_SYSTEM_COMPATIBLE" ]; then
+             # Check if GRUB env has been corrupted. This is only problematic
+             # with OS 8, where compatible matches.
+             check_grubenv
             exit 0
         fi
         # Be compatible with hassos OS ID
--- 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/eq3_char_loop/eq3_char_loop.mk
+++ b/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk
@@ -10,8 +10,8 @@

 EQ3_CHAR_LOOP_VERSION = e60183fc5b8375d9eea185c716f716c07657fa00
 EQ3_CHAR_LOOP_SITE = $(call github,eq-3,occu,$(EQ3_CHAR_LOOP_VERSION))
-EQ3_CHAR_LOOP_LICENSE = GPL2
-#EQ3_CHAR_LOOP_LICENSE_FILES = LICENSE
+EQ3_CHAR_LOOP_LICENSE = LGPL-2.1+ (kernel drivers)
+EQ3_CHAR_LOOP_LICENSE_FILES = LicenseDE.txt
 EQ3_CHAR_LOOP_MODULE_SUBDIRS = KernelDrivers

 $(eval $(kernel-module))
--- a/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch
+++ b/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch
@@ -26,7 +26,7 @@ Signed-off-by: Jens Maus <mail@jens-maus.de>
 -obj-m += led_trigger_timer.o
 +#obj-m += led_trigger_timer.o
 obj-m += hb_rf_usb.o
- obj-m += hb_rf_usb-2.o
+ obj-m += hb_rf_usb_2.o
 obj-m += hb_rf_eth.o
 -obj-m += rtc-rx8130.o
 +#obj-m += rtc-rx8130.o
--- a/buildroot-external/package/generic_raw_uart/generic_raw_uart.hash
+++ b/buildroot-external/package/generic_raw_uart/generic_raw_uart.hash
@@ -1,3 +1,3 @@
 # Locally computed
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  6c054e86c8edebfd7ee5f8c8e3ff2383ae624bb10c4e9936d75af8f57ae5cf56  generic_raw_uart-58b10fff652ad2e67f71e7e07270b50d27e55d40.tar.gz
+sha256  5bf0ec821f8492ebaaa367c47be35ce543ba3a3a6c04a3824ebfc33ddb9f0f42  generic_raw_uart-020698473cf9b980a1962b5ddd7ed4c9d58164e2.tar.gz
--- a/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk
+++ b/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk
@@ -1,9 +1,9 @@
 ################################################################################
 #
 # Generic raw uart kernel module for low-latency uart
-# communication with a RPI-RF-MOD/HM-MOD-RPI-PCB
+# communication with a RPI-RF-MOD/HM-MOD-RPI-PCB/HmIP-RFUSB
 #
-# Copyright (c) 2021 Alexander Reinert
+# Copyright (c) 2021-2022 Alexander Reinert
 # https://github.com/alexreinert/piVCCU/tree/master/kernel
 #
 # Uses parts of bcm2835_raw_uart.c
@@ -13,7 +13,7 @@
 #
 ################################################################################

-GENERIC_RAW_UART_VERSION = 58b10fff652ad2e67f71e7e07270b50d27e55d40
+GENERIC_RAW_UART_VERSION = 020698473cf9b980a1962b5ddd7ed4c9d58164e2
 GENERIC_RAW_UART_SITE = $(call github,alexreinert,piVCCU,$(GENERIC_RAW_UART_VERSION))
 GENERIC_RAW_UART_LICENSE = GPL2
 GENERIC_RAW_UART_LICENSE_FILES = LICENSE
--- a/buildroot-external/package/hassio/dind-import-containers.sh
+++ b/buildroot-external/package/hassio/dind-import-containers.sh
@@ -10,15 +10,19 @@ while ! docker version 2> /dev/null > /dev/null; do
 done

 # Install Supervisor, plug-ins and landing page
-echo "Loading containers..."
-for image in /build/images/*.tar; do
+echo "Loading container images..."
+
+# Make sure to order images by size (largest first)
+# It seems docker load requires space during operation
+# shellcheck disable=SC2045
+for image in $(ls -S /build/images/*.tar); do
 	docker load --input "${image}"
 done

 # Tag the Supervisor how the OS expects it to be tagged
 supervisor=$(docker images --filter "label=io.hass.type=supervisor" --quiet)
 arch=$(docker inspect --format '{{ index .Config.Labels "io.hass.arch" }}' "${supervisor}")
-docker tag "${supervisor}" "homeassistant/${arch}-hassio-supervisor:latest"
+docker tag "${supervisor}" "ghcr.io/home-assistant/${arch}-hassio-supervisor:latest"

 # Setup AppArmor
 mkdir -p "/data/supervisor/apparmor"
--- a/buildroot-external/package/os-agent/os-agent.mk
+++ b/buildroot-external/package/os-agent/os-agent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-OS_AGENT_VERSION = 1.2.1
+OS_AGENT_VERSION = 1.3.0
 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
 OS_AGENT_LICENSE = Apache License 2.0
 OS_AGENT_LICENSE_FILES = LICENSE
--- a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.hash
+++ b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.hash
@@ -0,0 +1,4 @@
+# Locally computed
+sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
+sha256  f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839  qemu-7.0.0.tar.xz
--- a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk
+++ b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-QEMU_GUEST_AGENT_VERSION = 4.2.0
+QEMU_GUEST_AGENT_VERSION = 7.0.0
 QEMU_GUEST_AGENT_SOURCE = qemu-$(QEMU_GUEST_AGENT_VERSION).tar.xz
 QEMU_GUEST_AGENT_SITE = http://download.qemu.org
 QEMU_GUEST_AGENT_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -19,7 +19,7 @@ QEMU_GUEST_AGENT_DEPENDENCIES = host-pkgconf libglib2 zlib
 # not automatically pulled. :-(
 QEMU_GUEST_AGENT_LIBS = -lrt -lm

-QEMU_GUEST_AGENT_OPTS = -lrt -lm
+#QEMU_GUEST_AGENT_OPTS =

 QEMU_GUEST_AGENT_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool

@@ -38,6 +38,8 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--localstatedir=/var \
 			--cross-prefix=$(TARGET_CROSS) \
 			--audio-drv-list= \
+			--meson=$(HOST_DIR)/bin/meson \
+			--ninja=$(HOST_DIR)/bin/ninja \
 			--disable-kvm \
 			--disable-linux-user \
 			--disable-linux-aio \
@@ -60,7 +62,6 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-virtfs \
 			--disable-brlapi \
 			--disable-fdt \
-			--disable-bluez \
 			--disable-kvm \
 			--disable-rdma \
 			--disable-vde \
@@ -68,6 +69,7 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-cap-ng \
 			--disable-attr \
 			--disable-vhost-net \
+			--disable-vhost-user \
 			--disable-spice \
 			--disable-rbd \
 			--disable-libiscsi \
@@ -85,19 +87,18 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-numa \
 			--disable-blobs \
 			--disable-capstone \
-			--disable-tools \
-			--disable-slirp \
 			--disable-tcg-interpreter \
+			--enable-tools \
 			--enable-guest-agent
 endef

 define QEMU_GUEST_AGENT_BUILD_CMDS
 	unset TARGET_DIR; \
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) qemu-ga
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef

 define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 $(@D)/qemu-ga $(TARGET_DIR)/usr/libexec/
+	$(INSTALL) -D -m 0755 $(@D)/build/qga/qemu-ga $(TARGET_DIR)/usr/libexec/qemu-ga
 endef

 define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD
--- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash
+++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  115e5c0e0174f21005e6e1d8a616dd86ad5ad61df5929b06e6f7b7b20a8c9e48  rpi-rf-mod-7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d.tar.gz
+sha256  afea59eff58551d0fe34dd6a37a65f35f23e0c099a3c9bb88442bfb489a28b29  rpi-rf-mod-41a25de861e84d411f92d9139da81f19c857d91e.tar.gz
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
--- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
+++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
@@ -6,12 +6,15 @@
 # This includes compiling of required device tree overlays for
 # selected platforms
 #
-# Copyright (c) 2018-2021 Jens Maus <mail@jens-maus.de>
+# Codeload URL:
+# https://codeload.github.com/jens-maus/RaspberryMatic/tar.gz/COMMIT
+#
+# Copyright (c) 2018-2022 Jens Maus <mail@jens-maus.de>
 # https://github.com/jens-maus/RaspberryMatic/tree/master/buildroot-external/package/rpi-rf-mod
 #
 ################################################################################

-RPI_RF_MOD_VERSION = 7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d
+RPI_RF_MOD_VERSION = 41a25de861e84d411f92d9139da81f19c857d91e
 RPI_RF_MOD_SITE = $(call github,jens-maus,RaspberryMatic,$(RPI_RF_MOD_VERSION))
 RPI_RF_MOD_LICENSE = Apache-2.0
 RPI_RF_MOD_DEPENDENCIES = host-dtc
--- a/buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch
+++ b/buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch
@@ -0,0 +1,21 @@
+Makefile: expose platform variables
+
+Signed-off-by: s-ol <s+removethis@s-ol.nu>
+
+diff --git a/Makefile b/Makefile
+index 22bd0e0..72321a4 100755
+--- a/Makefile
+++ b/Makefile
+@@ -96,9 +96,9 @@
+ ###################### MP HW TX MODE FOR VHT #######################
+ CONFIG_MP_VHT_HW_TX_MODE = n
+ ###################### Platform Related #######################
+-CONFIG_PLATFORM_I386_PC = y
+-CONFIG_PLATFORM_ARM_RPI = n
+-CONFIG_PLATFORM_ARM64_RPI = n
+CONFIG_PLATFORM_I386_PC ?= n
+CONFIG_PLATFORM_ARM_RPI ?= n
+CONFIG_PLATFORM_ARM64_RPI ?= n
+ CONFIG_PLATFORM_ANDROID_X86 = n
+ CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
+ CONFIG_PLATFORM_JB_X86 = n
--- a/buildroot-external/package/rtl8821cu/Config.in
+++ b/buildroot-external/package/rtl8821cu/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_RTL8821CU
+	tristate "Realtek 8821cu USB WiFi"
+	depends on BR2_LINUX_KERNEL
+	---help---
+	  Driver for RTL8821CU USB WiFi adapters (no firmware needed).
--- a/buildroot-external/package/rtl8821cu/rtl8821cu.mk
+++ b/buildroot-external/package/rtl8821cu/rtl8821cu.mk
@@ -0,0 +1,20 @@
+RTL8821CU_VERSION = 8c2226a74ae718439d56248bd2e44ccf717086d5
+RTL8821CU_SITE = $(call github,brektrou,rtl8821CU,$(RTL8821CU_VERSION))
+RTL8821CU_LICENSE = GPL-2.0
+RTL8821CU_LICENSE_FILES = LICENSE
+
+RTL8821CU_MODULE_MAKE_OPTS = \
+	CONFIG_RTL8821CU=m \
+	KVER=$(LINUX_VERSION_PROBED) \
+	KBASE=$(LINUX_DIR) \
+	CROSS_COMPILE=$(TARGET_CROSS)
+
+ifeq (arm, $(filter arm, $(KERNEL_ARCH)))
+RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_ARM_RPI=y
+RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_ARM64_RPI=y
+else
+RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_I386_PC=y
+endif
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
--- 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 184b6a054e04bb4c7fb4885a30d62314229dc551 Mon Sep 17 00:00:00 2001
-Message-Id: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
+Message-Id: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.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.36.0
+2.36.1

--- a/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
+++ b/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
@@ -1,7 +1,7 @@
 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>
+Message-Id: <3b2b7d0c9a886d913062ed5a9ffa8b764d882540.1652945863.git.stefan@agner.ch>
+In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch>
+References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.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
@@ -40,5 +40,5 @@ index 95d5c1e1f..82704f966 100644
   grub_uint64_t a = 0;
   grub_size_t i;
 -- 
-2.36.0
+2.36.1

--- 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
@@ -1,58 +1,73 @@
-From 74d815143bb9b504fb54d3eaf0ed3e382b26000a Mon Sep 17 00:00:00 2001
-Message-Id: <74d815143bb9b504fb54d3eaf0ed3e382b26000a.1651759401.git.stefan@agner.ch>
-In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
-References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
+From 7eaacdbf00ec29931553384f914c229c6078582e Mon Sep 17 00:00:00 2001
+Message-Id: <7eaacdbf00ec29931553384f914c229c6078582e.1652945863.git.stefan@agner.ch>
+In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch>
+References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.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.
+Some devices report a IoAlign value of 2, however seem to require a
+buffer with higher alignment.

-It seems that IoAlign > 1 means 2 ^ IoAlign. There is also such a hint
-in an example printed in the Driver Writer's Guide:
+The UEFI specification is saying: "IoAlign values of 0 and 1 mean that
+the buffer can be placed anywhere in memory. Otherwise, IoAlign must
+be a power of 2, and the requirement is that the start address of a
+buffer must be evenly divisible by IoAlign with no remainder."
+
+It seems that this got misinterpreted by some vendors assuming IoAlign
+is 2^IoAlign. There is also such a hint in an example in earlier
+versions of the Driver Writer's Guide:
 ScsiPassThruMode.IoAlign = 2; // Data must be alligned on 4-byte boundary

-Pass 2 ^ IoAlign aligned buffers to make sure GRUB2 works properly on
-all systems.
+However, it is unsafe to just blindly align buffers by 2^IoAlign, as
+this would lead to an overflow for systems which use block size
+alignment (e.g. 512 bytes, for example U-Boot).
+
+Ontop of that, some devices seem to report no alignment requirements
+but seem to read corrupt data or report read errors if the buffer is
+not aligned.
+
+Work around by using an alignment of at least BlockSize (typically 512
+bytes) in any casea. 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.

+Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- grub-core/disk/efi/efidisk.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
+ grub-core/disk/efi/efidisk.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)

 diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
-index 9e20af70e..eaf22367f 100644
+index 9e20af70e..c6e37f131 100644
 --- a/grub-core/disk/efi/efidisk.c
 +++ b/grub-core/disk/efi/efidisk.c
-@@ -553,8 +553,16 @@ grub_efidisk_readwrite (struct grub_disk *disk, grub_disk_addr_t sector,
+@@ -553,8 +553,19 @@ 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 means alignment by 2^IoAlign
-+   * Note: UEFI spec claims alignment by IoAlign. But there are systems
-+   * with IoAlign=2 which return status 7 if 2 bytes aligned buffers are
-+   * passed.
+   * 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. Some implementation seem to require alignment despite
+   * not reporting any requirements.
+   *
+   * Make sure to align to at least block size in any case.
 +   */
-+  if (bio->media->io_align > 1)
-+    io_align = 1 << bio->media->io_align;
+  if (bio->media->io_align < bio->media->block_size)
+    io_align = bio->media->block_size;
 +  else
-+    io_align = 1;
+    io_align = bio->media->io_align;
+
   num_bytes = size << disk->log_sector_size;
 
   if ((grub_addr_t) buf & (io_align - 1))
 -- 
-2.36.0
+2.36.1

--- a/buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch
+++ b/buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch
@@ -0,0 +1,46 @@
+From 88f63699c444e43096e765b2603aa211a8ae58bb Mon Sep 17 00:00:00 2001
+Message-Id: <88f63699c444e43096e765b2603aa211a8ae58bb.1661980860.git.stefan@agner.ch>
+From: Thomas Haller <thaller@redhat.com>
+Date: Fri, 8 Apr 2022 15:33:39 +0200
+Subject: [PATCH] connectivity: handle "NoNameServers" resolved error and don't
+ callback to system resolver
+
+No need to try further. The verdict is clear.
+
+From the log:
+
+  <debug> [1649424031.1507] connectivity: (wlan0,IPv4,427) can't resolve a name via systemd-resolved: GDBus.Error:org.freedesktop.resolve1.NoNameServers: No appropriate name servers or networks for name found
+  <debug> [1649424031.1507] connectivity: (wlan0,IPv4,427) start request to 'http://fedoraproject.org/static/hotspot.txt' (try resolving 'fedoraproject.org' using system resolver)
+
+(cherry picked from commit 5b779c1ab7fb53857db235383af8274ab824a55e)
+(altered to apply to 1.34.0)
+---
+ src/core/nm-connectivity.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
+index 13fb026514..3e4914ee3b 100644
+--- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
+@@ -719,8 +719,17 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data)
+     g_clear_object(&cb_data->concheck.resolve_cancellable);
+ 
+     if (!result) {
+-        /* Never mind. Just let do curl do its own resolving. */
+        gs_free char *dbus_error = NULL;
+
+         _LOG2D("can't resolve a name via systemd-resolved: %s", error->message);
+
+        dbus_error = g_dbus_error_get_remote_error(error);
+        if (nm_streq0(dbus_error, "org.freedesktop.resolve1.NoNameServers")) {
+            cb_data_complete(cb_data, NM_CONNECTIVITY_LIMITED, "resolve-error");
+            return;
+        }
+
+        /* Never mind. Just let do curl do its own resolving. */
+         do_curl_request(cb_data);
+         return;
+     }
+-- 
+2.37.2
+
--- a/buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf
+++ b/buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf
@@ -15,7 +15,7 @@ connection.mdns=2
 connection.llmnr=2

 [connectivity]
-uri=http://version.home-assistant.io/online.txt
+uri=http://checkonline.home-assistant.io/online.txt

 [device]
 wifi.scan-rand-mac-address=no
--- a/Show More
+++ b/Show More