Set deployment type to production

2022-05-11 10:39:10 +02:00
122 changed files with 365 additions and 1069 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,12 @@
-# Ignore everything except what we really need
-*
-!scripts/
+# 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/
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,7 +25,6 @@ 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)
@@ -38,7 +37,6 @@ 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/issues
+    url: https://github.com/home-assistant/developers.home-assistant.io/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
@@ -1,6 +0,0 @@
-version: 2
-updates:
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-      interval: "weekly"
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -12,9 +12,6 @@ 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 }}
@@ -35,7 +32,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@v3
+      - uses: actions/checkout@v2
      - name: Get Major/Minor version
        id: version_main
        run: |
@@ -43,7 +40,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@v6
+        uses: actions/github-script@v4
        id: generate_matrix
        with:
          script: |
@@ -72,7 +69,7 @@ jobs:

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

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

      - name: Upload images
-        uses: burnett01/rsync-deployments@5.2
+        uses: burnett01/rsync-deployments@4.1
        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@v3
+      uses: actions/checkout@v2
      with:
        submodules: true

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

--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -3,13 +3,11 @@ 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@v3
+      - uses: actions/checkout@v2
      - 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@v6
+        uses: actions/github-script@v4
        id: generate_matrix
        with:
          script: |
@@ -44,8 +44,6 @@ 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:
@@ -54,7 +52,7 @@ jobs:

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

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -8,9 +8,6 @@ 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
@@ -19,7 +16,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@v5
+        uses: actions/stale@v4
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
--- a/17
+++ b/17
@@ -28,24 +28,27 @@ 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 \
-        qemu-utils \
+        graphviz \
        rsync \
-        skopeo \
        sudo \
        unzip \
-        vim \
-        wget \
        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 \
    && 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,7 +12,6 @@ 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) |
@@ -49,7 +48,7 @@ The following cards are supported:

 ## Bluetooth

-Bluetooth integrated in Intel Wireless cards working OK, other options untested.
+Bluetooth is 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.90 |
-| Raspberry Pi | 5.15.84 |
-| Raspberry Pi 0-W | 5.15.84 |
-| Raspberry Pi 2 | 5.15.84 |
-| Raspberry Pi 3 | 5.15.84 |
-| Raspberry Pi 4 | 5.15.84 |
-| Home Assistant Yellow | 5.15.84 |
-| Tinker Board | 5.15.90 |
-| Odroid-C2 | 5.15.90 |
-| Odroid-C4 | 5.15.90 |
-| Odroid-N2 | 5.15.90 |
-| Odroid-XU4 | 5.15.90 |
-| Generic aarch64 | 5.15.90 |
-| Generic x86-64 | 5.15.90 |
-| Khadas VIM3 | 5.15.90 |
+| Open Virtual Appliance | 5.15.38 |
+| Raspberry Pi | 5.15.32 |
+| Raspberry Pi 0-W | 5.15.32 |
+| Raspberry Pi 2 | 5.15.32 |
+| Raspberry Pi 3 | 5.15.32 |
+| Raspberry Pi 4 | 5.15.32 |
+| Home Assistant Yellow | 5.15.32 |
+| Tinker Board | 5.15.38 |
+| Odroid-C2 | 5.15.38 |
+| Odroid-C4 | 5.15.38 |
+| Odroid-N2 | 5.15.38 |
+| Odroid-XU4 | 5.15.38 |
+| Generic aarch64 | 5.15.38 |
+| Generic x86-64 | 5.15.38 |
+| Khadas VIM3 | 5.15.38 |
--- a/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 Wi-Fi
+### Enabling WiFi

-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):
+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):

 ```bash
-ha network update wlan0 --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid "MY-SSID" --wifi-psk MY_PASS
+ha network update wlan0 --enabled --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,7 +11,6 @@ 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/grub.cfg
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/grub.cfg
@@ -15,48 +15,34 @@ for SLOT in $ORDER; do
        INDEX=0
        OK=$A_OK
        TRY=$A_TRY
+        A_TRY=1
    fi
    if [ "$SLOT" == "B" ]; then
        INDEX=1
        OK=$B_OK
        TRY=$B_TRY
+        B_TRY=1
    fi
-    if [ "$OK" -eq 1 -a "$TRY" -lt 3 ]; then
+    if [ "$OK" -eq 1 -a "$TRY" -eq 0 ]; then
        default=$INDEX
-
-        # increment attempts and save back to slot
-        if [ "$TRY" -eq 1 ]; then
-            TRY=2
-        elif [ "$TRY" -eq 2 ]; then
-            TRY=3
-	else
-            TRY=1
-        fi
-
-	if [ "$SLOT" == "A" ]; then
-            A_TRY=$TRY
-        fi
-	if [ "$SLOT" == "B" ]; then
-            B_TRY=$TRY
-        fi
-
        break
    fi
 done

-# No bootable slot found, choose rescue...
+# reset booted flags
 if [ "$default" -eq 99 ]; then
-    if [ "$A_OK" -eq 1 ]; then
-        default=2
+    if [ "$A_OK" -eq 1 -a "$A_TRY" -eq 1 ]; then
+        A_TRY=0
    fi
-    if [ "$B_OK" -eq 1 ]; then
-        default=3
+    if [ "$B_OK" -eq 1 -a "$B_TRY" -eq 1 ]; then
+        B_TRY=0
    fi
+    default=0
 fi

 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID

-default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=$MACHINE_ID fsck.repair=yes"
+default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=$MACHINE_ID cgroup_enable=memory fsck.repair=yes"
 file_env -f ($root)/cmdline.txt cmdline

 # root is a full HDD/partition definition in GRUB format like hd0,gpt1
@@ -71,11 +57,3 @@ menuentry "Slot A (OK=$A_OK TRY=$A_TRY)" {
 menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
    linux (${boothd},gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B
 }
-
-menuentry "Slot A (rescue shell)" {
-    linux (${boothd},gpt2)/Image 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)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
-}
--- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
@@ -13,8 +13,4 @@ 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,6 +120,7 @@ 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
--- a/buildroot-external/board/asus/tinker/uboot-boot.ush
+++ b/buildroot-external/board/asus/tinker/uboot-boot.ush
@@ -17,7 +17,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/kernel-amlogic.config
+++ b/buildroot-external/board/hardkernel/kernel-amlogic.config
@@ -145,6 +145,7 @@ 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 is not set
 CONFIG_CGROUP_FREEZER=y
@@ -1616,6 +1617,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 # CONFIG_FW_LOADER_COMPRESS is not set
 CONFIG_FW_CACHE=y
 # end of Firmware loader
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@@ -19,7 +19,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
@@ -19,7 +19,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
@@ -19,7 +19,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- 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
@@ -1,94 +0,0 @@
-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/hardkernel/odroid-xu4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
@@ -21,7 +21,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch
@@ -1,8 +1,8 @@
-From ff269d57d23c2edee262e14c6cf4116bc16d8019 Mon Sep 17 00:00:00 2001
-Message-Id: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 9f8390a715bc58e7423b65a18c4499761c84b819 Mon Sep 17 00:00:00 2001
+Message-Id: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:20:48 +0100
-Subject: [PATCH] arm64: dts: meson: g12b: add power button support
+Subject: [PATCH 1/7] arm64: dts: meson: g12b: add power button support

 Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The
 GPIO is low active, e.g. when connecting with pin 9 (GND) a power
@@ -36,5 +36,5 @@ index d33e54b5e196..5f0f036b1265 100644
 		compatible = "gpio-leds";
 
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
@@ -1,10 +1,10 @@
-From b4024d399bb13d46cd1a5d3be3793669b3d80e97 Mon Sep 17 00:00:00 2001
-Message-Id: <b4024d399bb13d46cd1a5d3be3793669b3d80e97.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 26917e25696e7156a85d4dfcc578cb4cf4f42dde Mon Sep 17 00:00:00 2001
+Message-Id: <26917e25696e7156a85d4dfcc578cb4cf4f42dde.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:38:54 +0100
-Subject: [PATCH] arm64: dts: meson: g12b: add GPIO fan support
+Subject: [PATCH 2/7] arm64: dts: meson: g12b: add GPIO fan support

 Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the
 pad used to control the fan does not support real PWM, hence the RPM
@@ -38,5 +38,5 @@ index 5f0f036b1265..36dbd2666015 100644
 		compatible = "gpio-keys-polled";
 		poll-interval = <100>;
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
@@ -1,10 +1,11 @@
-From 9f82b2c1cdbdd172e7e7bfdccc88be3257fd4c91 Mon Sep 17 00:00:00 2001
-Message-Id: <9f82b2c1cdbdd172e7e7bfdccc88be3257fd4c91.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 5b2b8c960269eba18f0557bf49990b9c28e5e6af Mon Sep 17 00:00:00 2001
+Message-Id: <5b2b8c960269eba18f0557bf49990b9c28e5e6af.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 15:53:55 +0100
-Subject: [PATCH] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device
+Subject: [PATCH 3/7] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
+ device
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -69,5 +70,5 @@ index 36dbd2666015..5ca75696bd5c 100644
 	cpu-supply = <&vddcpu_b>;
 	operating-points-v2 = <&cpu_opp_table_0>;
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch
@@ -1,10 +1,10 @@
-From 025e89230336ccea12ff89195231dd0c03cd3eec Mon Sep 17 00:00:00 2001
-Message-Id: <025e89230336ccea12ff89195231dd0c03cd3eec.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From fee88e0053de7878977913311bdb153494aa6c61 Mon Sep 17 00:00:00 2001
+Message-Id: <fee88e0053de7878977913311bdb153494aa6c61.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Fri, 27 Mar 2020 17:05:22 +0900
-Subject: [PATCH] arm64: dts: meson: add uart_A node
+Subject: [PATCH 4/7] arm64: dts: meson: add uart_A node

 The UART_A is available through J3 pin 8/10 and documented to be
 available as UART by default.
@@ -40,5 +40,5 @@ index 5ca75696bd5c..738eb0339333 100644
 	status = "okay";
 	pinctrl-0 = <&uart_ao_a_pins>;
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
@@ -1,10 +1,10 @@
-From 96909bf9c466f99cdb5fdd45e82379198063c06d Mon Sep 17 00:00:00 2001
-Message-Id: <96909bf9c466f99cdb5fdd45e82379198063c06d.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 51ded393003a60d3932081114bff142c4c69b293 Mon Sep 17 00:00:00 2001
+Message-Id: <51ded393003a60d3932081114bff142c4c69b293.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 29 Apr 2021 21:32:43 +0200
-Subject: [PATCH] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
+Subject: [PATCH 5/7] arm64: dts: meson: add i2c2 node to ODROID N2/N2+

 The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
 are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
@@ -33,5 +33,5 @@ index 738eb0339333..2e9fefc20b19 100644
 	status = "okay";
 	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch
@@ -1,10 +1,10 @@
-From 23fae187ce1f409811c4f3b293d78e53cc750def Mon Sep 17 00:00:00 2001
-Message-Id: <23fae187ce1f409811c4f3b293d78e53cc750def.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 0ad900b2d6e895b1f1788d51e471863743727d71 Mon Sep 17 00:00:00 2001
+Message-Id: <0ad900b2d6e895b1f1788d51e471863743727d71.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:51:50 +0100
-Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node
+Subject: [PATCH 6/7] ODROID-C4: arm64/dts: add uart_A node

 ---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 9 ++++++++-
@@ -39,5 +39,5 @@ index 76ad052fbf0c..690e4823a9d0 100644
 	status = "okay";
 	pinctrl-0 = <&uart_ao_a_pins>;
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch
@@ -1,10 +1,10 @@
-From ba8dc083b2bdd7fb24efccada671ef5650143a91 Mon Sep 17 00:00:00 2001
-Message-Id: <ba8dc083b2bdd7fb24efccada671ef5650143a91.1663008544.git.stefan@agner.ch>
-In-Reply-To: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
-References: <ff269d57d23c2edee262e14c6cf4116bc16d8019.1663008544.git.stefan@agner.ch>
+From 105003d49a505e0f0e033a6f3d945f745912c7b1 Mon Sep 17 00:00:00 2001
+Message-Id: <105003d49a505e0f0e033a6f3d945f745912c7b1.1646168061.git.stefan@agner.ch>
+In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
+References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:53:32 +0100
-Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node
+Subject: [PATCH 7/7] ODROID-C4: arm64/dts: add i2c2, i2c3 node

 ---
 .../boot/dts/amlogic/meson-sm1-odroid.dtsi    | 53 +++++++++++++++++++
@@ -82,5 +82,5 @@ index 690e4823a9d0..85637c1c846b 100644
 	pinctrl-0 = <&pwm_ao_d_e_pins>;
 	pinctrl-names = "default";
 -- 
-2.37.3
+2.35.1

--- a/buildroot-external/board/khadas/kernel-vim.config
+++ b/buildroot-external/board/khadas/kernel-vim.config
@@ -13,6 +13,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
@@ -163,6 +164,8 @@ CONFIG_PCIE_DW_PLAT_HOST=y
 # CONFIG_PCI_MESON is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
--- a/buildroot-external/board/khadas/vim3/uboot-boot.ush
+++ b/buildroot-external/board/khadas/vim3/uboot-boot.ush
@@ -19,7 +19,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 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 systemd.machine_id=${MACHINE_ID} fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@@ -1,11 +1,6 @@
 CONFIG_EFI_STUB=y

-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_INTEL_IDLE=y
-
 CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_HPSA=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_BLK_DEV_NVME=y

@@ -35,12 +30,14 @@ 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
@@ -159,5 +156,3 @@ 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
@@ -15,48 +15,34 @@ for SLOT in $ORDER; do
        INDEX=0
        OK=$A_OK
        TRY=$A_TRY
+        A_TRY=1
    fi
    if [ "$SLOT" == "B" ]; then
        INDEX=1
        OK=$B_OK
        TRY=$B_TRY
+        B_TRY=1
    fi
-    if [ "$OK" -eq 1 -a "$TRY" -lt 3 ]; then
+    if [ "$OK" -eq 1 -a "$TRY" -eq 0 ]; then
        default=$INDEX
-
-        # increment attempts and save back to slot
-        if [ "$TRY" -eq 1 ]; then
-            TRY=2
-        elif [ "$TRY" -eq 2 ]; then
-            TRY=3
-	else
-            TRY=1
-        fi
-
-	if [ "$SLOT" == "A" ]; then
-            A_TRY=$TRY
-        fi
-	if [ "$SLOT" == "B" ]; then
-            B_TRY=$TRY
-        fi
-
        break
    fi
 done

-# No bootable slot found, choose rescue...
+# reset booted flags
 if [ "$default" -eq 99 ]; then
-    if [ "$A_OK" -eq 1 ]; then
-        default=2
+    if [ "$A_OK" -eq 1 -a "$A_TRY" -eq 1 ]; then
+        A_TRY=0
    fi
-    if [ "$B_OK" -eq 1 ]; then
-        default=3
+    if [ "$B_OK" -eq 1 -a "$B_TRY" -eq 1 ]; then
+        B_TRY=0
    fi
+    default=0
 fi

 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID

-default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=$MACHINE_ID fsck.repair=yes"
+default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=$MACHINE_ID cgroup_enable=memory fsck.repair=yes"
 file_env -f ($root)/cmdline.txt cmdline

 # root is a full HDD/partition definition in GRUB format like hd0,gpt1
@@ -71,11 +57,3 @@ 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
@@ -1,45 +0,0 @@
-#  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
+dwc_otg.lpm_enable=0 console=tty1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:55aa:u
--- a/buildroot-external/board/raspberrypi/config.txt
+++ b/buildroot-external/board/raspberrypi/config.txt
@@ -75,8 +75,6 @@ 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.1654086219.git.stefan@agner.ch>
+Message-Id: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
+Subject: [PATCH 1/5] 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.36.1
+2.35.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.1654086219.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+Message-Id: <c942eb452c1c31fe6259178b6e9fea5456d7fb9c.1645627172.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 27 Sep 2021 12:28:04 +0200
-Subject: [PATCH] usb: xhci: reset endpoint on USB stall
+Subject: [PATCH 2/5] 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.36.1
+2.35.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.1654086219.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+Message-Id: <ae45864457182fcaa67911e1e3d8db242dff3646.1645627172.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 29 Dec 2020 23:34:52 +0100
-Subject: [PATCH] rpi: add NVMe to boot order
+Subject: [PATCH 3/5] 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.36.1
+2.35.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,10 +1,11 @@
 From 3a13ff4eb509e8e80a52ae45c9a5573e745803c3 Mon Sep 17 00:00:00 2001
-Message-Id: <3a13ff4eb509e8e80a52ae45c9a5573e745803c3.1654086219.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+Message-Id: <3a13ff4eb509e8e80a52ae45c9a5573e745803c3.1645627172.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 23 Sep 2021 23:43:31 +0200
-Subject: [PATCH] Revert "nvme: Correct the prps per page calculation method"
+Subject: [PATCH 4/5] Revert "nvme: Correct the prps per page calculation
+ method"

 This reverts commit 859b33c948945f7904f60a2c12a3792d356d51ad.

@@ -39,5 +40,5 @@ index 3c529a2fce..3bda491e12 100644
 
 	length -= (page_size - offset);
 -- 
-2.36.1
+2.35.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.1654086219.git.stefan@agner.ch>
-In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
-References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1654086219.git.stefan@agner.ch>
+Message-Id: <b00922ee48987ef91f0ca2aa3a66ad22c6c83d57.1645627172.git.stefan@agner.ch>
+In-Reply-To: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
+References: <24b77460dbfa2497ceb7a1611bf28b6eb88a1d74.1645627172.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 7 Oct 2021 12:02:39 +0200
-Subject: [PATCH] usb: xhci-brcm: Make driver compatible with downstream device
- tree
+Subject: [PATCH 5/5] 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.36.1
+2.35.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=ttyAMA2,115200n8
+dwc_otg.lpm_enable=0 console=tty1 console=serial0,115200n8 console=ttyAMA2,115200n8
--- a/buildroot-external/board/raspberrypi/yellow/config.txt
+++ b/buildroot-external/board/raspberrypi/yellow/config.txt
@@ -7,12 +7,9 @@ disable_splash=1
 kernel=u-boot.bin
 arm_64bit=1

-# Enable primary UART by default
+# uncomment to enable primary UART console
 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
@@ -26,7 +23,9 @@ 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=yellow
+SUPERVISOR_MACHINE=raspberrypi4-64
 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,9 @@
-From b28a8f5b591841f88f19cbf9850d713a602d912e Mon Sep 17 00:00:00 2001
-Message-Id: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From 2d3d8c091bc692999a1c519c1dc1570cc8be2358 Mon Sep 17 00:00:00 2001
+Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Apr 2022 14:47:59 +0200
-Subject: [PATCH] ARM: dts: bcm2711: Add device tree for Home Assistant Yellow
+Subject: [PATCH 01/10] ARM: dts: bcm2711: Add device tree for Home Assistant
+ Yellow

 Add device tree for Home Assistant Yellow, a Compute Module 4 based I/O
 board.
@@ -18,11 +19,11 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
 create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 3dfe451bcb16..d147c3400732 100644
+index f9acf5c4a59b..fb5b4555d42e 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -18,7 +18,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
- 	bcm2709-rpi-cm2.dtb \
+@@ -17,7 +17,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+ 	bcm2711-rpi-400.dtb \
 	bcm2710-rpi-cm3.dtb \
 	bcm2711-rpi-cm4.dtb \
 -	bcm2711-rpi-cm4s.dtb
@@ -636,13 +637,13 @@ index 000000000000..61d8c81d3de4
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 9873335d0ed2..8c19b62e189e 100644
+index 8eadc747ae1f..786dfe43d804 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb
+@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4s.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb
 
 subdir-y	+= bcm4908
@@ -655,5 +656,5 @@ index 000000000000..fdc5ec5bc956
@@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts"
 -- 
-2.37.3
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
@@ -1,10 +1,11 @@
-From 7eb647452bb1a3294fae8edc5a323070adff922b Mon Sep 17 00:00:00 2001
-Message-Id: <7eb647452bb1a3294fae8edc5a323070adff922b.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+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>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:33:09 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module
+Subject: [PATCH 02/10] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio
+ module

 Enable UART4 by default and mux pins including hardware flow control.

@@ -56,5 +57,5 @@ index 61d8c81d3de4..8db71876a78c 100644
 
 	uart5_pins: uart5_pins {
 -- 
-2.37.3
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
@@ -1,10 +1,10 @@
-From a7b86d8d0d81f841d8399a83f0f59f383d1556ed Mon Sep 17 00:00:00 2001
-Message-Id: <a7b86d8d0d81f841d8399a83f0f59f383d1556ed.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+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>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:44:23 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux debug UART5
+Subject: [PATCH 03/10] ARM: dts: bcm2711: yellow: Mux debug UART5

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
@@ -1,10 +1,10 @@
-From 8ec364f50abcd9f5fa89f421a7ef8f70dfb2564a Mon Sep 17 00:00:00 2001
-Message-Id: <8ec364f50abcd9f5fa89f421a7ef8f70dfb2564a.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+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>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:48:48 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Enable I2C6 by default
+Subject: [PATCH 04/10] ARM: dts: bcm2711: yellow: Enable I2C6 by default

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

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
@@ -1,10 +1,10 @@
-From 50abc7980f8c575930cc4c928d356763742e81fb Mon Sep 17 00:00:00 2001
-Message-Id: <50abc7980f8c575930cc4c928d356763742e81fb.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From 298d5254c1c2151b34eaf87f7e2f44205d34d909 Mon Sep 17 00:00:00 2001
+Message-Id: <298d5254c1c2151b34eaf87f7e2f44205d34d909.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 17:19:01 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add I2S audio codec
+Subject: [PATCH 05/10] ARM: dts: bcm2711: yellow: add I2S audio codec

 Add TI PCM5122 I2S audio codec.

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
@@ -1,10 +1,10 @@
-From 67751f4575c3837ada1bdec85184c77ea917b83a Mon Sep 17 00:00:00 2001
-Message-Id: <67751f4575c3837ada1bdec85184c77ea917b83a.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From 41127a02d66d07d0a17e904557899b15a067a692 Mon Sep 17 00:00:00 2001
+Message-Id: <41127a02d66d07d0a17e904557899b15a067a692.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 9 Mar 2021 15:02:53 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: enable GPIO keys
+Subject: [PATCH 06/10] ARM: dts: bcm2711: yellow: enable GPIO keys

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
@@ -1,10 +1,10 @@
-From e4db609b1080e4aabb027394966c07e050e02aab Mon Sep 17 00:00:00 2001
-Message-Id: <e4db609b1080e4aabb027394966c07e050e02aab.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From efe5e827dc0653066ebc9f71de2ccf391a4bb27e Mon Sep 17 00:00:00 2001
+Message-Id: <efe5e827dc0653066ebc9f71de2ccf391a4bb27e.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 28 Oct 2021 19:38:04 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add user LED
+Subject: [PATCH 07/10] ARM: dts: bcm2711: yellow: add user LED

 Add yellow user LED.

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
@@ -1,10 +1,10 @@
-From 6625adc479a3e89873127a91064a94881449c0d8 Mon Sep 17 00:00:00 2001
-Message-Id: <6625adc479a3e89873127a91064a94881449c0d8.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From 31ab383d0803e39e94472eea192e712fcc6e3cd6 Mon Sep 17 00:00:00 2001
+Message-Id: <31ab383d0803e39e94472eea192e712fcc6e3cd6.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 12 Nov 2021 17:33:32 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
+Subject: [PATCH 08/10] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
@@ -1,10 +1,11 @@
-From 1acd279eca810707856e5038438f52d694a62170 Mon Sep 17 00:00:00 2001
-Message-Id: <1acd279eca810707856e5038438f52d694a62170.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From f1553f413c8f53694d2f27db5b5c43d19cf1ff4f Mon Sep 17 00:00:00 2001
+Message-Id: <f1553f413c8f53694d2f27db5b5c43d19cf1ff4f.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 7 Jan 2022 17:10:00 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: enable USB host mode by default
+Subject: [PATCH 09/10] ARM: dts: bcm2711: yellow: enable USB host mode by
+ default

 The DWC2 controller is disable by default. Enable it since Home
 Assistant Yellow has a USB hub and USB ports connected to it.
@@ -35,5 +36,5 @@ index f78428ea64f3..711a09441ad0 100644
 	led-modes = <0x00 0x08>; /* link/activity link */
 };
 -- 
-2.37.3
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
@@ -1,11 +1,11 @@
-From 92332ba4302096777ea47e408f3406da0b2ef2c5 Mon Sep 17 00:00:00 2001
-Message-Id: <92332ba4302096777ea47e408f3406da0b2ef2c5.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+From 6f5e8133651df38d187c05bc27fd8fa25f0216da Mon Sep 17 00:00:00 2001
+Message-Id: <6f5e8133651df38d187c05bc27fd8fa25f0216da.1651085802.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 27 Apr 2022 20:36:19 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: use generic activity trigger for
- green LED
+Subject: [PATCH 10/10] ARM: dts: bcm2711: yellow: use generic activity trigger
+ for green LED

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

--- 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
@@ -1,32 +0,0 @@
-From 59e44006c1e7406bd1fc52aa9b1fc88a67652ddd Mon Sep 17 00:00:00 2001
-Message-Id: <59e44006c1e7406bd1fc52aa9b1fc88a67652ddd.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 26 Jul 2022 15:53:59 +0200
-Subject: [PATCH] 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.3
-
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
@@ -1,68 +0,0 @@
-From f69ef30ade36371215d02546d603143cc13adef2 Mon Sep 17 00:00:00 2001
-Message-Id: <f69ef30ade36371215d02546d603143cc13adef2.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Sat, 30 Jul 2022 11:21:31 +0200
-Subject: [PATCH] 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.3
-
--- 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 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 78924e9cf8c4af0baafcb2e7224bf04ad65276de Mon Sep 17 00:00:00 2001
+Message-Id: <78924e9cf8c4af0baafcb2e7224bf04ad65276de.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 23 Sep 2021 23:52:44 +0200
-Subject: [PATCH] nvme: improve readability of nvme_setup_prps()
+Subject: [PATCH 3/5] nvme: improve readability of nvme_setup_prps()

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

--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0004-nvme-Use-pointer-for-CPU-addressed-buffers.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0004-nvme-Use-pointer-for-CPU-addressed-buffers.patch
@@ -1,10 +1,10 @@
-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 e040d976ecbdd8071bbcb73d78e17ababa88c51f Mon Sep 17 00:00:00 2001
+Message-Id: <e040d976ecbdd8071bbcb73d78e17ababa88c51f.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 23 Sep 2021 23:58:35 +0200
-Subject: [PATCH] nvme: Use pointer for CPU addressed buffers
+Subject: [PATCH 4/5] nvme: Use pointer for CPU addressed buffers

 Pass buffers which use CPU addressing as void pointers. This aligns with
 DMA APIs which use void pointers as argument. It will avoid unnecessary
@@ -259,5 +259,5 @@ index 2cdf8ce320..8ff823cd81 100644
 /**
  * nvme_scan_namespace - scan all namespaces attached to NVMe controllers
 -- 
-2.36.1
+2.36.0

--- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0005-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0005-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch
@@ -1,10 +1,10 @@
-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 c4736c35141e519d15430660e17c274e142e886d Mon Sep 17 00:00:00 2001
+Message-Id: <c4736c35141e519d15430660e17c274e142e886d.1650924333.git.stefan@agner.ch>
+In-Reply-To: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
+References: <78704bc154d695ee16fdf8396f4d60b740190014.1650924333.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 24 Sep 2021 00:27:39 +0200
-Subject: [PATCH] nvme: translate virtual addresses into the bus's address
+Subject: [PATCH 5/5] nvme: translate virtual addresses into the bus's address
 space

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

--- a/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
+++ b/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
@@ -20,22 +20,12 @@ 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 ${devtype} ${devnum}: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 ${devtype} ${devnum}
 fi

 # HassOS system A/B
--- a/buildroot-external/board/raspberrypi/yellow/uboot.config
+++ b/buildroot-external/board/raspberrypi/yellow/uboot.config
@@ -1,3 +1,2 @@
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 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
@@ -53,7 +53,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
@@ -65,7 +64,6 @@ BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_RNG_TOOLS=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -73,18 +71,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -92,7 +84,6 @@ 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
@@ -125,9 +116,6 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="GenericAarch64"
-BR2_PACKAGE_QEMU_GUEST_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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -53,7 +53,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
@@ -65,7 +64,6 @@ BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_RNG_TOOLS=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -73,18 +71,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -126,9 +118,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="amd64"
 BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="GenericAmd64"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -58,19 +58,13 @@ 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
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -113,11 +107,9 @@ 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="khadas-vim3"
+BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
 BR2_PACKAGE_KHADAS_BOOT=y
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="KhadasVim3"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -58,19 +58,13 @@ 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
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -115,11 +109,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c2"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="OdroidC2"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -56,19 +56,13 @@ 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
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -114,11 +108,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c4"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="OdroidC4"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
@@ -58,19 +58,13 @@ 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
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -116,11 +110,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="OdroidN2"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -58,19 +58,13 @@ 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
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -118,9 +112,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-xu"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="OdroidXu"
 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_EXTERNAL_HASSOS_PATH)/board/pc/ova/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -53,7 +53,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
@@ -65,7 +64,6 @@ BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_RNG_TOOLS=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -73,18 +71,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -125,11 +117,8 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="amd64"
 BR2_PACKAGE_HASSIO_MACHINE="qemux86-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="Ova"
 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
@@ -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/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -62,18 +62,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -117,7 +111,6 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi2"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi2"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_HOST_TEMPIO=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -64,18 +64,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -119,11 +113,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi3"
 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
@@ -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/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -65,18 +65,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -120,11 +114,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi3"
 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
@@ -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/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -65,18 +65,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -121,11 +115,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi4"
 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
@@ -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/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -64,18 +64,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -119,11 +113,9 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi4"
 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.90"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -60,18 +60,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -121,7 +115,6 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="tinker"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="Tinker"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER=y
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_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/raspberrypi/yellow $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -56,7 +56,6 @@ BR2_PACKAGE_INPUT_EVENT_DAEMON=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_NVME=y
 BR2_PACKAGE_RNG_TOOLS=y
-BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -65,18 +64,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_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_IPTABLES_NFTABLES=y
-BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
 BR2_PACKAGE_APPARMOR=y
@@ -119,9 +112,8 @@ 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="yellow"
+BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
 BR2_PACKAGE_OS_AGENT=y
-BR2_PACKAGE_OS_AGENT_BOARD="Yellow"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
--- a/buildroot-external/kernel/device-support.config
+++ b/buildroot-external/kernel/device-support.config
@@ -1,10 +1,3 @@
-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
@@ -35,6 +28,9 @@ 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
@@ -45,7 +41,6 @@ CONFIG_BT_HCIBTUSB_RTL=y
 # Wi-Fi Support
 CONFIG_RTL_CARDS=y
 CONFIG_RTL8192CU=m
-CONFIG_RTL8XXXU=m
 CONFIG_R8188EU=m

 CONFIG_WLAN_VENDOR_MEDIATEK=y
--- a/buildroot-external/kernel/docker.config
+++ b/buildroot-external/kernel/docker.config
@@ -2,8 +2,8 @@ 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_RT_GROUP_SCHED is not set

 CONFIG_CGROUPS=y
 CONFIG_HUGETLB_PAGE=y
@@ -48,10 +48,6 @@ 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
@@ -75,6 +71,7 @@ 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
@@ -2,8 +2,6 @@ CONFIG_KERNEL_LZ4=y
 CONFIG_CMDLINE=""
 CONFIG_PANIC_TIMEOUT=5

-CONFIG_MODULE_COMPRESS_NONE=y
-
 CONFIG_ZRAM=y
 CONFIG_ZSMALLOC=y

@@ -34,22 +32,7 @@ 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_SIT=m
-
-CONFIG_IP_MROUTE=y
 CONFIG_IPV6_MROUTE=y

 CONFIG_NF_TABLES=m
@@ -128,9 +111,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y

-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FQ_CODEL=m
-
 CONFIG_WIRELESS=y
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PROC=y
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -1,5 +1,5 @@
-VERSION_MAJOR=9
-VERSION_BUILD=5
+VERSION_MAJOR=8
+VERSION_BUILD=0

 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@@ -56,23 +56,6 @@ 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

@@ -96,9 +79,6 @@ 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/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 = LGPL-2.1+ (kernel drivers)
-EQ3_CHAR_LOOP_LICENSE_FILES = LicenseDE.txt
+EQ3_CHAR_LOOP_LICENSE = GPL2
+#EQ3_CHAR_LOOP_LICENSE_FILES = LICENSE
 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  5bf0ec821f8492ebaaa367c47be35ce543ba3a3a6c04a3824ebfc33ddb9f0f42  generic_raw_uart-020698473cf9b980a1962b5ddd7ed4c9d58164e2.tar.gz
+sha256  6c054e86c8edebfd7ee5f8c8e3ff2383ae624bb10c4e9936d75af8f57ae5cf56  generic_raw_uart-58b10fff652ad2e67f71e7e07270b50d27e55d40.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/HmIP-RFUSB
+# communication with a RPI-RF-MOD/HM-MOD-RPI-PCB
 #
-# Copyright (c) 2021-2022 Alexander Reinert
+# Copyright (c) 2021 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 = 020698473cf9b980a1962b5ddd7ed4c9d58164e2
+GENERIC_RAW_UART_VERSION = 58b10fff652ad2e67f71e7e07270b50d27e55d40
 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,19 +10,15 @@ while ! docker version 2> /dev/null > /dev/null; do
 done

 # Install Supervisor, plug-ins and landing page
-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
+echo "Loading containers..."
+for image in /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}" "ghcr.io/home-assistant/${arch}-hassio-supervisor:latest"
+docker tag "${supervisor}" "homeassistant/${arch}-hassio-supervisor:latest"

 # Setup AppArmor
 mkdir -p "/data/supervisor/apparmor"
--- a/buildroot-external/package/os-agent/Config.in
+++ b/buildroot-external/package/os-agent/Config.in
@@ -2,12 +2,3 @@ config BR2_PACKAGE_OS_AGENT
 	bool "Home Assistant OS Agent"
 	help
 	  Install the Home Assistant OS Agent
-
-if BR2_PACKAGE_OS_AGENT
-
-config BR2_PACKAGE_OS_AGENT_BOARD
-	string "OS-Agent board"
-	help
-	  OS Agent board feature which should be pull.
-
-endif
--- a/buildroot-external/package/os-agent/os-agent.mk
+++ b/buildroot-external/package/os-agent/os-agent.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################

-OS_AGENT_VERSION = 1.4.1
+OS_AGENT_VERSION = 1.2.1
 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
 OS_AGENT_LICENSE = Apache License 2.0
 OS_AGENT_LICENSE_FILES = LICENSE
 OS_AGENT_GOMOD = github.com/home-assistant/os-agent
-OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION) -X main.board=$(BR2_PACKAGE_OS_AGENT_BOARD)
+OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION)

 define OS_AGENT_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 0644 $(@D)/contrib/io.hass.conf \
--- a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.hash
+++ b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.hash
@@ -1,4 +0,0 @@
-# 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 = 7.0.0
+QEMU_GUEST_AGENT_VERSION = 4.2.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 =
+QEMU_GUEST_AGENT_OPTS = -lrt -lm

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

@@ -38,8 +38,6 @@ 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 \
@@ -62,6 +60,7 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-virtfs \
 			--disable-brlapi \
 			--disable-fdt \
+			--disable-bluez \
 			--disable-kvm \
 			--disable-rdma \
 			--disable-vde \
@@ -69,7 +68,6 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-cap-ng \
 			--disable-attr \
 			--disable-vhost-net \
-			--disable-vhost-user \
 			--disable-spice \
 			--disable-rbd \
 			--disable-libiscsi \
@@ -87,18 +85,19 @@ 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)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) qemu-ga
 endef

 define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/build/qga/qemu-ga $(TARGET_DIR)/usr/libexec/qemu-ga
+	$(INSTALL) -m 755 $(@D)/qemu-ga $(TARGET_DIR)/usr/libexec/
 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  afea59eff58551d0fe34dd6a37a65f35f23e0c099a3c9bb88442bfb489a28b29  rpi-rf-mod-41a25de861e84d411f92d9139da81f19c857d91e.tar.gz
+sha256  115e5c0e0174f21005e6e1d8a616dd86ad5ad61df5929b06e6f7b7b20a8c9e48  rpi-rf-mod-7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d.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,15 +6,12 @@
 # This includes compiling of required device tree overlays for
 # selected platforms
 #
-# Codeload URL:
-# https://codeload.github.com/jens-maus/RaspberryMatic/tar.gz/COMMIT
-#
-# Copyright (c) 2018-2022 Jens Maus <mail@jens-maus.de>
+# Copyright (c) 2018-2021 Jens Maus <mail@jens-maus.de>
 # https://github.com/jens-maus/RaspberryMatic/tree/master/buildroot-external/package/rpi-rf-mod
 #
 ################################################################################

-RPI_RF_MOD_VERSION = 41a25de861e84d411f92d9139da81f19c857d91e
+RPI_RF_MOD_VERSION = 7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d
 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
@@ -1,21 +0,0 @@
-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
@@ -1,5 +0,0 @@
-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
@@ -1,20 +0,0 @@
-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.1652945863.git.stefan@agner.ch>
+Message-Id: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 24 Feb 2022 12:38:48 +0100
 Subject: [PATCH] loadenv: add file_env to load var from file
@@ -115,5 +115,5 @@ index 3fd664aac..7e7b18139 100644
 +  grub_unregister_extcmd (cmd_file);
 }
 -- 
-2.36.1
+2.36.0

--- a/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
+++ b/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch
@@ -1,7 +1,7 @@
 From 3b2b7d0c9a886d913062ed5a9ffa8b764d882540 Mon Sep 17 00:00:00 2001
-Message-Id: <3b2b7d0c9a886d913062ed5a9ffa8b764d882540.1652945863.git.stefan@agner.ch>
-In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch>
-References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch>
+Message-Id: <3b2b7d0c9a886d913062ed5a9ffa8b764d882540.1651759401.git.stefan@agner.ch>
+In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
+References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1651759401.git.stefan@agner.ch>
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Jan 2020 15:01:16 -0500
 Subject: [PATCH] squash4: Fix an uninitialized variable
@@ -40,5 +40,5 @@ index 95d5c1e1f..82704f966 100644
   grub_uint64_t a = 0;
   grub_size_t i;
 -- 
-2.36.1
+2.36.0

--- a/Show More
+++ b/Show More