Bump version to 10.4

* buildroot 7e37cfe4f7...005b88359c (1):
  > Merge tag '2023.02.3' into 2023.02.x-haos

.github/workflows/dev.yml

@@ -11,7 +11,7 @@ jobs:
   prepare:
     if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
     name: Prepare build
-    runs-on: [ "ubuntu-20.04" ]
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       pull-requests: read
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
-    runs-on: ${{ matrix.board.runner }}
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Define git reference
@@ -98,14 +98,34 @@ jobs:
           echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
           echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
 
+      - name: Free space on build drive
+        run: |
+          # Inspired by https://github.com/easimon/maximize-build-space/blob/v7/action.yml
+          sudo rm -rf /usr/local/lib/android/sdk/ndk
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          # Make sure cache action can restore this lcoation
+          sudo mkdir /mnt/cache
+          sudo chown -R runner:runner /mnt/cache
+
+      - name: Cache downloads
+        uses: actions/cache@v3
+        with:
+          path: /mnt/cache/dl
+          key: haos-dl
+
+      - name: Cache object files
+        uses: actions/cache@v3
+        with:
+          path: /mnt/cache/cc
+          key: haos-cc-${{ matrix.board.architecture }}
+
       - name: Build
         run: |
           BUILDER_UID="$(id -u)"
           BUILDER_GID="$(id -g)"
           docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
             -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
-            -v "${{ matrix.board.runner }}-build-cache:/cache" \
+            -v "/mnt/cache:/cache" \
-            -v "/build/output" \
             haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}
 
       - name: Upload images
@@ -113,13 +133,14 @@ jobs:
         with:
           rsh: -q
           switches: -aW
-          path: release/
+          path: output/images/haos_*
           remote_path: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}/
           remote_host: ${{ secrets.DEV_HOST }}
           remote_port: ${{ secrets.DEV_PORT }}
           remote_user: ${{ secrets.DEV_USERNAME }}
           remote_key: ${{ secrets.DEV_SSH_KEY }}
 
+
   bump_version:
     name: Bump dev channel version
     if: ${{ github.event_name == 'workflow_dispatch' }}

.github/workflows/matrix.json

@@ -2,97 +2,97 @@
   {
     "id": "ova",
     "defconfig": "ova",
-    "runner": "x86-64-runner",
+    "architecture": "x86-64",
     "label": "board/ova"
   },
   {
     "id": "generic-x86-64",
     "defconfig": "generic_x86_64",
-    "runner": "x86-64-runner",
+    "architecture": "x86-64",
     "label": "board/generic-x86-64"
   },
   {
     "id": "generic-aarch64",
     "defconfig": "generic_aarch64",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/generic-aarch64"
   },
   {
     "id": "khadas-vim3",
     "defconfig": "khadas_vim3",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/khadas"
   },
   {
     "id": "odroid-c2",
     "defconfig": "odroid_c2",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/odroid"
   },
   {
     "id": "odroid-c4",
     "defconfig": "odroid_c4",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/odroid"
   },
   {
     "id": "odroid-m1",
     "defconfig": "odroid_m1",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/odroid"
   },
   {
     "id": "odroid-n2",
     "defconfig": "odroid_n2",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/odroid"
   },
   {
     "id": "odroid-xu4",
     "defconfig": "odroid_xu4",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/odroid"
   },
   {
     "id": "rpi2",
     "defconfig": "rpi2",
-    "runner": "arm-runner",
+    "architecture": "arm",
     "label": "board/raspberrypi"
   },
   {
     "id": "rpi3",
     "defconfig": "rpi3",
-    "runner": "arm-runner",
+    "architecture": "arm",
     "label": "board/raspberrypi"
   },
   {
     "id": "rpi3-64",
     "defconfig": "rpi3_64",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/raspberrypi"
   },
   {
     "id": "rpi4",
     "defconfig": "rpi4",
-    "runner": "arm-runner",
+    "architecture": "arm",
     "label": "board/raspberrypi"
   },
   {
     "id": "rpi4-64",
     "defconfig": "rpi4_64",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/raspberrypi"
   },
   {
     "id": "yellow",
     "defconfig": "yellow",
-    "runner": "aarch64-runner",
+    "architecture": "aarch64",
     "label": "board/yellow"
   },
   {
     "id": "tinker",
     "defconfig": "tinker",
-    "runner": "arm-runner",
+    "architecture": "arm",
     "label": "board/tinker"
   }
 ]

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   validate_release:
     name: Validate release
-    runs-on: [ "ubuntu-20.04" ]
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.version_check.outputs.version }}
       version_dev: ${{ steps.version_check.outputs.version_dev }}
@@ -49,11 +49,11 @@ jobs:
     needs: validate_release
     strategy:
       matrix: ${{ fromJson(needs.validate_release.outputs.matrix) }}
-    runs-on: ${{ matrix.board.runner }}
+    runs-on: ubuntu-22.04
 
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout source
-      - uses: actions/checkout@v3
+        uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -68,91 +68,41 @@ jobs:
           echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
           echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
 
+      - name: Free space on build drive
+        run: |
+          # Inspired by https://github.com/easimon/maximize-build-space/blob/v7/action.yml
+          sudo rm -rf /usr/local/lib/android/sdk/ndk
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          # Make sure cache action can restore this lcoation
+          sudo mkdir /mnt/cache
+          sudo chown -R runner:runner /mnt/cache
+
+      - name: Cache downloads
+        uses: actions/cache@v3
+        with:
+          path: /mnt/cache/dl
+          key: haos-dl
+
+      - name: Cache object files
+        uses: actions/cache@v3
+        with:
+          path: /mnt/cache/cc
+          key: haos-cc-${{ matrix.board.architecture }}
+
       - name: Build
         run: |
           BUILDER_UID="$(id -u)"
           BUILDER_GID="$(id -g)"
           docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
             -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
-            -v "${{ matrix.board.runner }}-build-cache:/cache" \
+            -v "/mnt/cache:/cache" \
-            -v "/build/output" \
             haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.defconfig }}
 
-      - name: Upload disk image
+      - name: Upload release assets
-        if: ${{ matrix.board.id != 'ova' }}
+        uses: shogo82148/actions-upload-release-asset@v1
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_path: output/images/haos_*
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload rauc update
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_content_type: application/octet-stream
-
-      - name: Upload ova image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_content_type: application/x-tar
-
-      - name: Upload qcow2 image
-        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload vdi image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
-          asset_content_type: application/zip
-
-      - name: Upload vhdx image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
-          asset_content_type: application/zip
-
-      - name: Upload vmdk image
-        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
-          asset_content_type: application/zip
 
   bump_version:
     name: Bump dev version to ${{ needs.validate_release.outputs.version }}

Documentation/kernel.md

@@ -1,23 +1,23 @@
 
 # Kernel Version
 
-Default Kernel tree: 5.15
+Default Kernel tree: 6.1
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.1.21 |
+| Open Virtual Appliance | 6.1.39 |
-| Raspberry Pi | 6.1.19 |
+| Raspberry Pi | 6.1.21 |
-| Raspberry Pi 0-W | 6.1.19 |
+| Raspberry Pi 0-W | 6.1.21 |
-| Raspberry Pi 2 | 6.1.19 |
+| Raspberry Pi 2 | 6.1.21 |
-| Raspberry Pi 3 | 6.1.19 |
+| Raspberry Pi 3 | 6.1.21 |
-| Raspberry Pi 4 | 6.1.19 |
+| Raspberry Pi 4 | 6.1.21 |
-| Home Assistant Yellow | 6.1.19 |
+| Home Assistant Yellow | 6.1.21 |
-| Tinker Board | 6.1.21 |
+| Tinker Board | 6.1.39 |
-| ODROID-C2 | 6.1.21 |
+| ODROID-C2 | 6.1.39 |
-| ODROID-C4 | 6.1.21 |
+| ODROID-C4 | 6.1.39 |
-| ODROID-M1 | 6.1.21 |
+| ODROID-M1 | 6.1.39 |
-| ODROID-N2 | 6.1.21 |
+| ODROID-N2 | 6.1.39 |
-| ODROID-XU4 | 6.1.21 |
+| ODROID-XU4 | 6.1.39 |
-| Generic aarch64 | 6.1.21 |
+| Generic aarch64 | 6.1.39 |
-| Generic x86-64 | 6.1.21 |
+| Generic x86-64 | 6.1.39 |
-| Khadas VIM3 | 6.1.21 |
+| Khadas VIM3 | 6.1.39 |

Makefile

@@ -1,5 +1,4 @@
 BUILDDIR:=$(shell pwd)
-RELEASE_DIR = $(BUILDDIR)/release
 
 BUILDROOT=$(BUILDDIR)/buildroot
 BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
@@ -23,9 +22,6 @@ endif
 
 all: $(TARGETS)
 
-$(RELEASE_DIR):
-	mkdir -p $(RELEASE_DIR)
-
 savedefconfig:
 	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "savedefconfig"
@@ -34,10 +30,9 @@ $(TARGETS_CONFIG): %-config:
 	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
 
-$(TARGETS): %: $(RELEASE_DIR) %-config
+$(TARGETS): %: %-config
 	@echo "build $@"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
-	cp -f $(O)/images/haos_* $(RELEASE_DIR)/
 
 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)

buildroot

@@ -1 +1 @@
-Subproject commit 2ccc4c3f04e4c23beb286ac969061b911bb84c0f
+Subproject commit 005b88359ccf628dc017ca867ea3fd9dba16ed69

buildroot-external/board/hardkernel/kernel-rockchip.config

@@ -4289,3 +4289,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_MEMTEST=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0001-arm64-dts-rockchip-Add-Hardkernel-ODROID-M1-board.patch

@@ -1,5 +1,5 @@
 From d388735d551e09b00317a509859fca51776b9826 Mon Sep 17 00:00:00 2001
-Message-Id: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+Message-ID: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Dongjin Kim <tobetter@gmail.com>
 Date: Fri, 30 Sep 2022 07:12:35 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add Hardkernel ODROID-M1 board
@@ -451,5 +451,5 @@ index 000000000000..b3016437640b
 +	status = "okay";
 +};
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0002-arm64-dts-rockchip-add-thermal-support-to-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From 24048c1753916bd983746542b16d19d2b399eeb7 Mon Sep 17 00:00:00 2001
-Message-Id: <24048c1753916bd983746542b16d19d2b399eeb7.1678107917.git.stefan@agner.ch>
+Message-ID: <24048c1753916bd983746542b16d19d2b399eeb7.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:36 +0200
 Subject: [PATCH] arm64: dts: rockchip: add thermal support to ODROID-M1
@@ -34,5 +34,5 @@ index b3016437640b..112c65af3f55 100644
  	status = "okay";
  };
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0003-arm64-dts-rockchip-Add-NOR-flash-to-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From 982bb2beab8e38a7c0a365770be2ad9c5221a650 Mon Sep 17 00:00:00 2001
-Message-Id: <982bb2beab8e38a7c0a365770be2ad9c5221a650.1678107917.git.stefan@agner.ch>
+Message-ID: <982bb2beab8e38a7c0a365770be2ad9c5221a650.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:37 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add NOR flash to ODROID-M1
@@ -99,5 +99,5 @@ index 112c65af3f55..94e839c9afab 100644
  	rockchip,hw-tshut-mode = <1>;
  	rockchip,hw-tshut-polarity = <0>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0004-arm64-dts-rockchip-Add-analog-audio-on-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From ae25f92a09abb7dd16a9ad3b74e0c105b385f214 Mon Sep 17 00:00:00 2001
-Message-Id: <ae25f92a09abb7dd16a9ad3b74e0c105b385f214.1678107917.git.stefan@agner.ch>
+Message-ID: <ae25f92a09abb7dd16a9ad3b74e0c105b385f214.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:38 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add analog audio on ODROID-M1
@@ -98,5 +98,5 @@ index 94e839c9afab..634c1bd80b4e 100644
  
  &pmu_io_domains {
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0005-arm64-dts-rockchip-Enable-vop2-and-hdmi-tx-on-ODROID.patch

@@ -1,7 +1,7 @@
 From 3a1be3d8719ef6335385d4e5e456371e7bf7383f Mon Sep 17 00:00:00 2001
-Message-Id: <3a1be3d8719ef6335385d4e5e456371e7bf7383f.1678107917.git.stefan@agner.ch>
+Message-ID: <3a1be3d8719ef6335385d4e5e456371e7bf7383f.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:39 +0200
 Subject: [PATCH] arm64: dts: rockchip: Enable vop2 and hdmi tx on ODROID-M1
@@ -93,5 +93,5 @@ index 634c1bd80b4e..126b893048fe 100644
 +	};
 +};
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0006-arm64-dts-rockchip-Enable-HDMI-audio-on-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From ded87dc761951205b8b9ba8ee4081e28a850a3db Mon Sep 17 00:00:00 2001
-Message-Id: <ded87dc761951205b8b9ba8ee4081e28a850a3db.1678107917.git.stefan@agner.ch>
+Message-ID: <ded87dc761951205b8b9ba8ee4081e28a850a3db.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:40 +0200
 Subject: [PATCH] arm64: dts: rockchip: Enable HDMI audio on ODROID-M1.
@@ -44,5 +44,5 @@ index 126b893048fe..ac4e94d18feb 100644
  	rockchip,trcm-sync-tx-only;
  	status = "okay";
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0007-arm64-dts-rockchip-Enable-the-GPU-on-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From 13438a717627cae086cc3a1126552cffa2f4bd16 Mon Sep 17 00:00:00 2001
-Message-Id: <13438a717627cae086cc3a1126552cffa2f4bd16.1678107917.git.stefan@agner.ch>
+Message-ID: <13438a717627cae086cc3a1126552cffa2f4bd16.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:41 +0200
 Subject: [PATCH] arm64: dts: rockchip: Enable the GPU on ODROID-M1
@@ -33,5 +33,5 @@ index ac4e94d18feb..e4b7699d3eea 100644
  	avdd-0v9-supply = <&vdda0v9_image>;
  	avdd-1v8-supply = <&vcca1v8_image>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0008-arm64-dts-rockchip-Enable-the-USB-2.0-ports-on-ODROI.patch

@@ -1,7 +1,7 @@
 From 0f0a85a289b4d0fbd5c39eb5ddbb681a37ad490c Mon Sep 17 00:00:00 2001
-Message-Id: <0f0a85a289b4d0fbd5c39eb5ddbb681a37ad490c.1678107917.git.stefan@agner.ch>
+Message-ID: <0f0a85a289b4d0fbd5c39eb5ddbb681a37ad490c.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:42 +0200
 Subject: [PATCH] arm64: dts: rockchip: Enable the USB 2.0 ports on ODROID-M1
@@ -107,5 +107,5 @@ index e4b7699d3eea..2e4cc20bd676 100644
  	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
  	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0009-arm64-dts-rockchip-Enable-the-USB-3.0-ports-on-ODROI.patch

@@ -1,7 +1,7 @@
 From d8abc451c669a8fd36b31db5cb96ec49da819124 Mon Sep 17 00:00:00 2001
-Message-Id: <d8abc451c669a8fd36b31db5cb96ec49da819124.1678107917.git.stefan@agner.ch>
+Message-ID: <d8abc451c669a8fd36b31db5cb96ec49da819124.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:43 +0200
 Subject: [PATCH] arm64: dts: rockchip: Enable the USB 3.0 ports on ODROID-M1
@@ -110,5 +110,5 @@ index 2e4cc20bd676..9a84a7e76d7a 100644
  	status = "okay";
  };
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0010-arm64-dts-rockchip-Add-SATA-support-to-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From 2f6d4521403932ca22cb4dabef9033f1d52232ba Mon Sep 17 00:00:00 2001
-Message-Id: <2f6d4521403932ca22cb4dabef9033f1d52232ba.1678107917.git.stefan@agner.ch>
+Message-ID: <2f6d4521403932ca22cb4dabef9033f1d52232ba.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:44 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add SATA support to ODROID-M1
@@ -44,5 +44,5 @@ index 9a84a7e76d7a..bd24ccf94e76 100644
  	bus-width = <8>;
  	max-frequency = <200000000>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0011-arm64-dts-rockchip-Add-PCIEe-v3-nodes-to-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From 1572a9c5d9fa9f654fbc1909528ae5940ad34aa3 Mon Sep 17 00:00:00 2001
-Message-Id: <1572a9c5d9fa9f654fbc1909528ae5940ad34aa3.1678107917.git.stefan@agner.ch>
+Message-ID: <1572a9c5d9fa9f654fbc1909528ae5940ad34aa3.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:45 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add PCIEe v3 nodes to ODROID-M1
@@ -76,5 +76,5 @@ index bd24ccf94e76..2f685c606bb9 100644
  		pmic_int_l: pmic-int-l {
  			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0012-arm64-dts-rockchip-Add-IR-receiver-node-to-ODROID-M1.patch

@@ -1,7 +1,7 @@
 From b2eae73eeb32dd9383571de6af18fc8bd39aac3a Mon Sep 17 00:00:00 2001
-Message-Id: <b2eae73eeb32dd9383571de6af18fc8bd39aac3a.1678107917.git.stefan@agner.ch>
+Message-ID: <b2eae73eeb32dd9383571de6af18fc8bd39aac3a.1688490481.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Fri, 30 Sep 2022 07:12:46 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add IR receiver node to ODROID-M1
@@ -50,5 +50,5 @@ index 2f685c606bb9..59ecf868dbd0 100644
  		led_power_pin: led-power-pin {
  			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
 -- 
-2.39.2
+2.41.0
 

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0013-hwrng-add-Rockchip-SoC-hwrng-driver.patch

@@ -0,0 +1,323 @@
+From 08264b26ac568035ff04bcccc5c47d4a5d50f93b Mon Sep 17 00:00:00 2001
+Message-ID: <08264b26ac568035ff04bcccc5c47d4a5d50f93b.1688490481.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Mon, 28 Nov 2022 19:47:17 +0100
+Subject: [PATCH] hwrng: add Rockchip SoC hwrng driver
+
+Rockchip SoCs used to have a random number generator as part of their
+crypto device, and support for it has to be added to the corresponding
+driver. However newer Rockchip SoCs like the RK356x have an independent
+True Random Number Generator device. This patch adds a driver for it,
+greatly inspired from the downstream driver.
+
+The TRNG device does not seem to have a signal conditionner and the FIPS
+140-2 test returns a lot of failures. They can be reduced by increasing
+RK_RNG_SAMPLE_CNT, in a tradeoff between quality and speed. This value
+has been adjusted to get ~90% of successes and the quality value has
+been set accordingly.
+
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+[conservatively estimate quality as per review feedback]
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/char/hw_random/Kconfig        |  14 ++
+ drivers/char/hw_random/Makefile       |   1 +
+ drivers/char/hw_random/rockchip-rng.c | 250 ++++++++++++++++++++++++++
+ 3 files changed, 265 insertions(+)
+ create mode 100644 drivers/char/hw_random/rockchip-rng.c
+
+diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
+index 3da8e85f8aae..8e5c88504f72 100644
+--- a/drivers/char/hw_random/Kconfig
++++ b/drivers/char/hw_random/Kconfig
+@@ -549,6 +549,20 @@ config HW_RANDOM_CN10K
+ 	 To compile this driver as a module, choose M here.
+ 	 The module will be called cn10k_rng. If unsure, say Y.
+ 
++config HW_RANDOM_ROCKCHIP
++        tristate "Rockchip True Random Number Generator"
++        depends on HW_RANDOM && (ARCH_ROCKCHIP || COMPILE_TEST)
++        depends on HAS_IOMEM
++        default HW_RANDOM
++        help
++          This driver provides kernel-side support for the True Random Number
++          Generator hardware found on some Rockchip SoC like RK3566 or RK3568.
++
++          To compile this driver as a module, choose M here: the
++          module will be called rockchip-rng.
++
++          If unsure, say Y.
++
+ endif # HW_RANDOM
+ 
+ config UML_RANDOM
+diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
+index 3e948cf04476..b7e989535fd6 100644
+--- a/drivers/char/hw_random/Makefile
++++ b/drivers/char/hw_random/Makefile
+@@ -47,3 +47,4 @@ obj-$(CONFIG_HW_RANDOM_XIPHERA) += xiphera-trng.o
+ obj-$(CONFIG_HW_RANDOM_ARM_SMCCC_TRNG) += arm_smccc_trng.o
+ obj-$(CONFIG_HW_RANDOM_CN10K) += cn10k-rng.o
+ obj-$(CONFIG_HW_RANDOM_POLARFIRE_SOC) += mpfs-rng.o
++obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o
+diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c
+new file mode 100644
+index 000000000000..9b7b334d6410
+--- /dev/null
++++ b/drivers/char/hw_random/rockchip-rng.c
+@@ -0,0 +1,250 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * rockchip-rng.c True Random Number Generator driver for Rockchip SoCs
++ *
++ * Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd.
++ * Copyright (c) 2022, Aurelien Jarno
++ * Authors:
++ *  Lin Jinhan <troy.lin@rock-chips.com>
++ *  Aurelien Jarno <aurelien@aurel32.net>
++ */
++#include <linux/clk.h>
++#include <linux/hw_random.h>
++#include <linux/io.h>
++#include <linux/iopoll.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/of_platform.h>
++#include <linux/pm_runtime.h>
++#include <linux/reset.h>
++#include <linux/slab.h>
++
++#define RK_RNG_AUTOSUSPEND_DELAY	100
++#define RK_RNG_MAX_BYTE			32
++#define RK_RNG_POLL_PERIOD_US		100
++#define RK_RNG_POLL_TIMEOUT_US		10000
++
++/*
++ * TRNG collects osc ring output bit every RK_RNG_SAMPLE_CNT time. The value is
++ * a tradeoff between speed and quality and has been adjusted to get a quality
++ * of ~900 (~90% of FIPS 140-2 successes).
++ */
++#define RK_RNG_SAMPLE_CNT		1000
++
++/* TRNG registers from RK3568 TRM-Part2, section 5.4.1 */
++#define TRNG_RST_CTL			0x0004
++#define TRNG_RNG_CTL			0x0400
++#define TRNG_RNG_CTL_LEN_64_BIT		(0x00 << 4)
++#define TRNG_RNG_CTL_LEN_128_BIT	(0x01 << 4)
++#define TRNG_RNG_CTL_LEN_192_BIT	(0x02 << 4)
++#define TRNG_RNG_CTL_LEN_256_BIT	(0x03 << 4)
++#define TRNG_RNG_CTL_OSC_RING_SPEED_0	(0x00 << 2)
++#define TRNG_RNG_CTL_OSC_RING_SPEED_1	(0x01 << 2)
++#define TRNG_RNG_CTL_OSC_RING_SPEED_2	(0x02 << 2)
++#define TRNG_RNG_CTL_OSC_RING_SPEED_3	(0x03 << 2)
++#define TRNG_RNG_CTL_ENABLE		BIT(1)
++#define TRNG_RNG_CTL_START		BIT(0)
++#define TRNG_RNG_SAMPLE_CNT		0x0404
++#define TRNG_RNG_DOUT_0			0x0410
++#define TRNG_RNG_DOUT_1			0x0414
++#define TRNG_RNG_DOUT_2			0x0418
++#define TRNG_RNG_DOUT_3			0x041c
++#define TRNG_RNG_DOUT_4			0x0420
++#define TRNG_RNG_DOUT_5			0x0424
++#define TRNG_RNG_DOUT_6			0x0428
++#define TRNG_RNG_DOUT_7			0x042c
++
++struct rk_rng {
++	struct hwrng rng;
++	void __iomem *base;
++	struct reset_control *rst;
++	int clk_num;
++	struct clk_bulk_data *clk_bulks;
++};
++
++/* The mask determine the bits that are updated */
++static void rk_rng_write_ctl(struct rk_rng *rng, u32 val, u32 mask)
++{
++	writel_relaxed((mask << 16) | val, rng->base + TRNG_RNG_CTL);
++}
++
++static int rk_rng_init(struct hwrng *rng)
++{
++	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
++	u32 reg;
++	int ret;
++
++	/* start clocks */
++	ret = clk_bulk_prepare_enable(rk_rng->clk_num, rk_rng->clk_bulks);
++	if (ret < 0) {
++		dev_err((struct device *) rk_rng->rng.priv,
++			"Failed to enable clks %d\n", ret);
++		return ret;
++	}
++
++	/* set the sample period */
++	writel(RK_RNG_SAMPLE_CNT, rk_rng->base + TRNG_RNG_SAMPLE_CNT);
++
++	/* set osc ring speed and enable it */
++	reg = TRNG_RNG_CTL_LEN_256_BIT |
++		   TRNG_RNG_CTL_OSC_RING_SPEED_0 |
++		   TRNG_RNG_CTL_ENABLE;
++	rk_rng_write_ctl(rk_rng, reg, 0xffff);
++
++	return 0;
++}
++
++static void rk_rng_cleanup(struct hwrng *rng)
++{
++	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
++	u32 reg;
++
++	/* stop TRNG */
++	reg = 0;
++	rk_rng_write_ctl(rk_rng, reg, 0xffff);
++
++	/* stop clocks */
++	clk_bulk_disable_unprepare(rk_rng->clk_num, rk_rng->clk_bulks);
++}
++
++static int rk_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
++{
++	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
++	u32 reg;
++	int ret = 0;
++	int i;
++
++	pm_runtime_get_sync((struct device *) rk_rng->rng.priv);
++
++	/* Start collecting random data */
++	reg = TRNG_RNG_CTL_START;
++	rk_rng_write_ctl(rk_rng, reg, reg);
++
++	ret = readl_poll_timeout(rk_rng->base + TRNG_RNG_CTL, reg,
++				 !(reg & TRNG_RNG_CTL_START),
++				 RK_RNG_POLL_PERIOD_US,
++				 RK_RNG_POLL_TIMEOUT_US);
++	if (ret < 0)
++		goto out;
++
++	/* Read random data stored in the registers */
++	ret = min_t(size_t, max, RK_RNG_MAX_BYTE);
++	for (i = 0; i < ret; i += 4) {
++		*(u32 *)(buf + i) = readl_relaxed(rk_rng->base + TRNG_RNG_DOUT_0 + i);
++	}
++
++out:
++	pm_runtime_mark_last_busy((struct device *) rk_rng->rng.priv);
++	pm_runtime_put_sync_autosuspend((struct device *) rk_rng->rng.priv);
++
++	return ret;
++}
++
++static int rk_rng_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct rk_rng *rk_rng;
++	int ret;
++
++	rk_rng = devm_kzalloc(dev, sizeof(struct rk_rng), GFP_KERNEL);
++	if (!rk_rng)
++		return -ENOMEM;
++
++	rk_rng->base = devm_platform_ioremap_resource(pdev, 0);
++	if (IS_ERR(rk_rng->base))
++		return PTR_ERR(rk_rng->base);
++
++	rk_rng->clk_num = devm_clk_bulk_get_all(dev, &rk_rng->clk_bulks);
++	if (rk_rng->clk_num < 0)
++		return dev_err_probe(dev, rk_rng->clk_num,
++				     "Failed to get clks property\n");
++
++	rk_rng->rst = devm_reset_control_array_get(&pdev->dev, false, false);
++	if (IS_ERR(rk_rng->rst))
++		return dev_err_probe(dev, PTR_ERR(rk_rng->rst),
++				     "Failed to get reset property\n");
++
++	reset_control_assert(rk_rng->rst);
++	udelay(2);
++	reset_control_deassert(rk_rng->rst);
++
++	platform_set_drvdata(pdev, rk_rng);
++
++	rk_rng->rng.name = dev_driver_string(dev);
++#ifndef CONFIG_PM
++	rk_rng->rng.init = rk_rng_init;
++	rk_rng->rng.cleanup = rk_rng_cleanup;
++#endif
++	rk_rng->rng.read = rk_rng_read;
++	rk_rng->rng.priv = (unsigned long) dev;
++	rk_rng->rng.quality = 512;
++
++	pm_runtime_set_autosuspend_delay(dev, RK_RNG_AUTOSUSPEND_DELAY);
++	pm_runtime_use_autosuspend(dev);
++	pm_runtime_enable(dev);
++
++	ret = devm_hwrng_register(dev, &rk_rng->rng);
++	if (ret)
++		return dev_err_probe(&pdev->dev, ret, "Failed to register Rockchip hwrng\n");
++
++	dev_info(&pdev->dev, "Registered Rockchip hwrng\n");
++
++	return 0;
++}
++
++static int rk_rng_remove(struct platform_device *pdev)
++{
++	pm_runtime_disable(&pdev->dev);
++
++	return 0;
++}
++
++#ifdef CONFIG_PM
++static int rk_rng_runtime_suspend(struct device *dev)
++{
++	struct rk_rng *rk_rng = dev_get_drvdata(dev);
++
++	rk_rng_cleanup(&rk_rng->rng);
++
++	return 0;
++}
++
++static int rk_rng_runtime_resume(struct device *dev)
++{
++	struct rk_rng *rk_rng = dev_get_drvdata(dev);
++
++	return rk_rng_init(&rk_rng->rng);
++}
++#endif
++
++static const struct dev_pm_ops rk_rng_pm_ops = {
++	SET_RUNTIME_PM_OPS(rk_rng_runtime_suspend,
++				rk_rng_runtime_resume, NULL)
++	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
++				pm_runtime_force_resume)
++};
++
++static const struct of_device_id rk_rng_dt_match[] = {
++	{
++		.compatible = "rockchip,rk3568-rng",
++	},
++	{},
++};
++
++MODULE_DEVICE_TABLE(of, rk_rng_dt_match);
++
++static struct platform_driver rk_rng_driver = {
++	.driver	= {
++		.name	= "rockchip-rng",
++		.pm	= &rk_rng_pm_ops,
++		.of_match_table = rk_rng_dt_match,
++	},
++	.probe	= rk_rng_probe,
++	.remove = rk_rng_remove,
++};
++
++module_platform_driver(rk_rng_driver);
++
++MODULE_DESCRIPTION("Rockchip True Random Number Generator driver");
++MODULE_AUTHOR("Lin Jinhan <troy.lin@rock-chips.com>, Aurelien Jarno <aurelien@aurel32.net>");
++MODULE_LICENSE("GPL v2");
+-- 
+2.41.0
+

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0014-arm64-dts-rockchip-add-DT-entry-for-RNG-to-RK356x.patch

@@ -0,0 +1,38 @@
+From 8bb36ab21d6c44a8a0d690b3c9df3d5efe2f3685 Mon Sep 17 00:00:00 2001
+Message-ID: <8bb36ab21d6c44a8a0d690b3c9df3d5efe2f3685.1688490481.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Mon, 28 Nov 2022 19:47:18 +0100
+Subject: [PATCH] arm64: dts: rockchip: add DT entry for RNG to RK356x
+
+Enable the just added Rockchip RNG driver for RK356x SoCs.
+
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+---
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+index 164708f1eb67..4be94ff45180 100644
+--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+@@ -1770,6 +1770,15 @@ usb2phy1_otg: otg-port {
+ 		};
+ 	};
+ 
++	rng: rng@fe388000 {
++		compatible = "rockchip,rk3568-rng";
++		reg = <0x0 0xfe388000 0x0 0x4000>;
++		clocks = <&cru CLK_TRNG_NS>, <&cru HCLK_TRNG_NS>;
++		clock-names = "trng_clk", "trng_hclk";
++		resets = <&cru SRST_TRNG_NS>;
++		reset-names = "reset";
++	};
++
+ 	pinctrl: pinctrl {
+ 		compatible = "rockchip,rk3568-pinctrl";
+ 		rockchip,grf = <&grf>;
+-- 
+2.41.0
+

buildroot-external/board/hardkernel/odroid-m1/patches/linux/0015-dt-bindings-RNG-Add-Rockchip-RNG-bindings.patch

@@ -0,0 +1,85 @@
+From 1ad5bd5a1d8e83728745e3e12e620061f8281f19 Mon Sep 17 00:00:00 2001
+Message-ID: <1ad5bd5a1d8e83728745e3e12e620061f8281f19.1688490481.git.stefan@agner.ch>
+In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+References: <d388735d551e09b00317a509859fca51776b9826.1688490481.git.stefan@agner.ch>
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Mon, 28 Nov 2022 19:47:16 +0100
+Subject: [PATCH] dt-bindings: RNG: Add Rockchip RNG bindings
+
+Add the RNG bindings for the RK3568 SoC from Rockchip
+
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+---
+ .../bindings/rng/rockchip,rk3568-rng.yaml     | 60 +++++++++++++++++++
+ 1 file changed, 60 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
+
+diff --git a/Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml b/Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
+new file mode 100644
+index 000000000000..c2f5ef69cf07
+--- /dev/null
++++ b/Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
+@@ -0,0 +1,60 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/rng/rockchip,rk3568-rng.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Rockchip TRNG
++
++description: True Random Number Generator for some Rockchip SoCs
++
++maintainers:
++  - Aurelien Jarno <aurelien@aurel32.net>
++
++properties:
++  compatible:
++    enum:
++      - rockchip,rk3568-rng
++
++  reg:
++    maxItems: 1
++
++  clocks:
++    items:
++      - description: TRNG clock
++      - description: TRNG AHB clock
++
++  clock-names:
++    items:
++      - const: trng_clk
++      - const: trng_hclk
++
++  resets:
++    maxItems: 1
++
++required:
++  - compatible
++  - reg
++  - clocks
++  - clock-names
++  - resets
++
++additionalProperties: false
++
++examples:
++  - |
++    #include <dt-bindings/clock/rk3568-cru.h>
++    bus {
++      #address-cells = <2>;
++      #size-cells = <2>;
++
++      rng@fe388000 {
++        compatible = "rockchip,rk3568-rng";
++        reg = <0x0 0xfe388000 0x0 0x4000>;
++        clocks = <&cru CLK_TRNG_NS>, <&cru HCLK_TRNG_NS>;
++        clock-names = "trng_clk", "trng_hclk";
++        resets = <&cru SRST_TRNG_NS>;
++      };
++    };
++
++...
+-- 
+2.41.0
+

buildroot-external/board/khadas/kernel-vim.config

@@ -469,15 +469,19 @@ CONFIG_VIDEO_EM28XX_V4L2=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_CEC_CORE=m
+CONFIG_CEC_PIN=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_DW_HDMI_CEC=y
+CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_MESON=y
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
-CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB=y
-CONFIG_FB_EFI=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_SOUND=y

buildroot-external/board/pc/generic-x86-64/kernel.config

@@ -9,24 +9,6 @@ CONFIG_SCSI_HPSA=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_BLK_DEV_NVME=y
 
-CONFIG_IGB=y
-CONFIG_IGC=m
-
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ALX=m
-
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNXT=m
-
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
@@ -37,6 +19,10 @@ CONFIG_IWLMVM=m
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8723BE=y
+CONFIG_RTL8723BS=y
+CONFIG_RTW88=m
+
+CONFIG_BCMA=m
 
 CONFIG_SYSFB=y
 
@@ -166,5 +152,6 @@ CONFIG_SND_SOC_SOF_XTENSA=m
 CONFIG_THINKPAD_ACPI=m
 
 CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_CORETEMP=m
 
 CONFIG_UHID=y

buildroot-external/board/pc/ova/kernel.config

@@ -70,6 +70,19 @@ CONFIG_SND_XEN_FRONTEND=y
 CONFIG_XEN_PVCALLS_FRONTEND=m
 CONFIG_XEN_WDT=y
 
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8723BE=y
+
+CONFIG_BCMA=m
+
 CONFIG_SYSFB=y
 CONFIG_SYSFB_SIMPLEFB=y
 

buildroot-external/board/raspberrypi/hassos-hook.sh

@@ -19,7 +19,7 @@ function hassos_pre_image() {
     else
         cp "${BOARD_DIR}/../cmdline.txt" "${BOOT_DATA}/cmdline.txt"
     fi
-    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/" 2>/dev/null || true
 
     # EEPROM update for Raspberry Pi 4/Compute Module 4
     if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then

buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch

@@ -1,5 +1,5 @@
-From 135d886b4e5077c8fa96a5449a70d81ae9c1c3d0 Mon Sep 17 00:00:00 2001
+From 01b4d231cbb66ca193ba422a22d25c75d21ff8ee Mon Sep 17 00:00:00 2001
-Message-Id: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+Message-Id: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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
@@ -79,5 +79,5 @@ index 1d356b4b2e..6f345c790b 100644
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-add-NVMe-to-boot-order.patch

@@ -1,7 +1,7 @@
-From 191b5f4e0408e40f35379fdaab6b37a7ad93e298 Mon Sep 17 00:00:00 2001
+From 8870872f359771effddd74bcb4c7e0a4316d99f7 Mon Sep 17 00:00:00 2001
-Message-Id: <191b5f4e0408e40f35379fdaab6b37a7ad93e298.1668448794.git.stefan@agner.ch>
+Message-Id: <8870872f359771effddd74bcb4c7e0a4316d99f7.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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
@@ -40,5 +40,5 @@ index cd8fe8b518..7257659932 100644
  	BOOT_TARGET_PXE(func) \
  	BOOT_TARGET_DHCP(func)
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0003-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch

@@ -1,7 +1,7 @@
-From 644bd3743aa8771ef7ecb7b7239308d6da2a5b35 Mon Sep 17 00:00:00 2001
+From 60afc919643d212439a63908c83523879af21032 Mon Sep 17 00:00:00 2001
-Message-Id: <644bd3743aa8771ef7ecb7b7239308d6da2a5b35.1668448794.git.stefan@agner.ch>
+Message-Id: <60afc919643d212439a63908c83523879af21032.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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"
@@ -39,5 +39,5 @@ index 6d0d3f3ca2..73db80a294 100644
  
  	length -= (page_size - offset);
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch

@@ -1,7 +1,7 @@
-From de29ca70117fb2bfafa8b5699b34e9e94560b785 Mon Sep 17 00:00:00 2001
+From cca49e815fbdcbb436f238d362b5f145471153dc Mon Sep 17 00:00:00 2001
-Message-Id: <de29ca70117fb2bfafa8b5699b34e9e94560b785.1668448794.git.stefan@agner.ch>
+Message-Id: <cca49e815fbdcbb436f238d362b5f145471153dc.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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
@@ -29,5 +29,5 @@ index fe17924028..0c6938187b 100644
  };
  
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0005-nvme-improve-readability-of-nvme_setup_prps.patch

@@ -1,7 +1,7 @@
-From ab2790f8ff78790ea8a9cb0b05cafc55648ebbc4 Mon Sep 17 00:00:00 2001
+From 11176a6ca068e0b572abbe5da8fef1d57bd40e7a Mon Sep 17 00:00:00 2001
-Message-Id: <ab2790f8ff78790ea8a9cb0b05cafc55648ebbc4.1668448794.git.stefan@agner.ch>
+Message-Id: <11176a6ca068e0b572abbe5da8fef1d57bd40e7a.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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()
@@ -45,5 +45,5 @@ index 73db80a294..751abc3cd5 100644
  			prp_pool += page_size;
  		}
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0006-nvme-Use-pointer-for-CPU-addressed-buffers.patch

@@ -1,7 +1,7 @@
-From 2b508d92673738d837576301866dc234d8b008c4 Mon Sep 17 00:00:00 2001
+From 3bccb6eb7f9e8e996cd50409eb96450c313953ec Mon Sep 17 00:00:00 2001
-Message-Id: <2b508d92673738d837576301866dc234d8b008c4.1668448794.git.stefan@agner.ch>
+Message-Id: <3bccb6eb7f9e8e996cd50409eb96450c313953ec.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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
@@ -260,5 +260,5 @@ index 2cdf8ce320..8ff823cd81 100644
  /**
   * nvme_scan_namespace - scan all namespaces attached to NVMe controllers
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0007-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch

@@ -1,7 +1,7 @@
-From c70926d8b8ad11b8e489e92a8ca9ca93fb201595 Mon Sep 17 00:00:00 2001
+From ca73fb28fa86b7de243b6713d2756dee445c5f56 Mon Sep 17 00:00:00 2001
-Message-Id: <c70926d8b8ad11b8e489e92a8ca9ca93fb201595.1668448794.git.stefan@agner.ch>
+Message-Id: <ca73fb28fa86b7de243b6713d2756dee445c5f56.1682350496.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.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
@@ -172,5 +172,5 @@ index bc1d612dde..f52103c009 100644
 +
  #endif /* __DRIVER_NVME_H__ */
 -- 
-2.38.1
+2.40.0
 

buildroot-external/board/raspberrypi/patches/uboot/0008-Revert-pci-Check-region-ranges-are-addressable.patch

@@ -0,0 +1,50 @@
+From 89df39ccb71062a06f4548c11fba9101dfd82445 Mon Sep 17 00:00:00 2001
+Message-Id: <89df39ccb71062a06f4548c11fba9101dfd82445.1682350496.git.stefan@agner.ch>
+In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
+References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 24 Apr 2023 15:44:15 +0200
+Subject: [PATCH] Revert "pci: Check region ranges are addressable"
+
+This reverts commit ec8eba8c2d4e10e77699c56918d2078210aa1339.
+
+This commit seems to cause boot hangs when USB via XHCI is enabled on
+Raspberry Pi 4 32-bit. Reverting the commit fixes USB device detection
+and makes the devices boot again.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/pci/pci-uclass.c | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
+index 9343cfc62a..ac2a8c8aa0 100644
+--- a/drivers/pci/pci-uclass.c
++++ b/drivers/pci/pci-uclass.c
+@@ -1027,22 +1027,7 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node,
+ 
+ 		if (!IS_ENABLED(CONFIG_SYS_PCI_64BIT) &&
+ 		    type == PCI_REGION_MEM && upper_32_bits(pci_addr)) {
+-			debug(" - pci_addr beyond the 32-bit boundary, ignoring\n");
+-			continue;
+-		}
+-
+-		if (!IS_ENABLED(CONFIG_PHYS_64BIT) && upper_32_bits(addr)) {
+-			debug(" - addr beyond the 32-bit boundary, ignoring\n");
+-			continue;
+-		}
+-
+-		if (~((pci_addr_t)0) - pci_addr < size) {
+-			debug(" - PCI range exceeds max address, ignoring\n");
+-			continue;
+-		}
+-
+-		if (~((phys_addr_t)0) - addr < size) {
+-			debug(" - phys range exceeds max address, ignoring\n");
++			debug(" - beyond the 32-bit boundary, ignoring\n");
+ 			continue;
+ 		}
+ 
+-- 
+2.40.0
+

buildroot-external/board/raspberrypi/uboot.config

@@ -1,3 +1,5 @@
+CONFIG_CMD_NVME=y
+
 # CONFIG_DOS_PARTITION is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
@@ -6,3 +8,6 @@ CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 
 CONFIG_USB_XHCI_BRCM=y
+
+CONFIG_NVME=y
+CONFIG_NVME_PCI=y

buildroot-external/board/raspberrypi/yellow/config.txt

@@ -10,9 +10,6 @@ arm_64bit=1
 # Enable primary UART by default
 enable_uart=1
 
-# Free up full-fledged PL011 UART for J11
-dtoverlay=miniuart-bt
-
 # No HDMI on Yellow, but we can't set to 16 since we need the full firmware
 # for codecs
 gpu_mem=32

buildroot-external/board/raspberrypi/yellow/patches/linux/0013-Revert-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch

@@ -0,0 +1,56 @@
+From e223dcd78da4356a2aebb2d99412229978ee4c12 Mon Sep 17 00:00:00 2001
+Message-Id: <e223dcd78da4356a2aebb2d99412229978ee4c12.1685522257.git.stefan@agner.ch>
+In-Reply-To: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685522257.git.stefan@agner.ch>
+References: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685522257.git.stefan@agner.ch>
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Thu, 23 Feb 2023 09:34:12 +0000
+Subject: [PATCH] Revert "amba_pl011: Don't use DT aliases for numbering"
+
+This reverts commit c2fa32a8dae4c4b2638c9f4de5e398e98460e693.
+
+Consistent, logical UART numbering is desirable, so remove the
+effective revert.
+
+See: https://forums.raspberrypi.com/viewtopic.php?t=347868
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/tty/serial/amba-pl011.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
+index 6f92f581e18c..d301253e26b1 100644
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -2671,7 +2671,6 @@ static struct uart_driver amba_reg = {
+ 	.cons			= AMBA_CONSOLE,
+ };
+ 
+-#if 0
+ static int pl011_probe_dt_alias(int index, struct device *dev)
+ {
+ 	struct device_node *np;
+@@ -2703,7 +2702,6 @@ static int pl011_probe_dt_alias(int index, struct device *dev)
+ 
+ 	return ret;
+ }
+-#endif
+ 
+ /* unregisters the driver also if no more ports are left */
+ static void pl011_unregister_port(struct uart_amba_port *uap)
+@@ -2755,12 +2753,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
+ 	if (IS_ERR(base))
+ 		return PTR_ERR(base);
+ 
+-	/* Don't use DT serial<n> aliases - it causes the device to
+-	   be renumbered to ttyAMA1 if it is the second serial port in the
+-	   system, even though the other one is ttyS0. The 8250 driver
+-	   doesn't use this logic, so always remains ttyS0.
+ 	index = pl011_probe_dt_alias(index, dev);
+-	*/
+ 
+ 	uap->port.dev = dev;
+ 	uap->port.mapbase = mmiobase->start;
+-- 
+2.40.1
+

buildroot-external/board/raspberrypi/yellow/patches/linux/0014-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch

@@ -0,0 +1,46 @@
+From 60e2cd5b6747992f47feef0ee36e2d0d80706c18 Mon Sep 17 00:00:00 2001
+Message-Id: <60e2cd5b6747992f47feef0ee36e2d0d80706c18.1685523528.git.stefan@agner.ch>
+In-Reply-To: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685523528.git.stefan@agner.ch>
+References: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685523528.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Wed, 31 May 2023 10:57:43 +0200
+Subject: [PATCH] ARM: dts: bcm2711: yellow: use serial alias to enumerate
+ ttyAMA
+
+Now that the driver actually uses the index from the serial aliases,
+make sure to correctly enumerate the serial aliases.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 8 ++------
+ 1 file changed, 2 insertions(+), 6 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 f7fdf8bbb395..b8f0bc2df062 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -17,11 +17,6 @@ / {
+ 	compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711";
+ 	model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow";
+ 
+-	aliases {
+-		serial4 = &uart4;
+-		serial5 = &uart5;
+-	};
+-
+ 	chosen {
+ 		/* 8250 auxiliary UART instead of pl011 */
+ 		stdout-path = "serial1:115200n8";
+@@ -324,7 +319,8 @@ chosen {
+ 
+ 	aliases {
+ 		serial0 = &uart1;
+-		serial1 = &uart0;
++		serial1 = &uart4;
++		serial2 = &uart5;
+ 		mmc0 = &emmc2;
+ 		mmc1 = &mmcnr;
+ 		mmc2 = &sdhost;
+-- 
+2.40.1
+

buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch

@@ -0,0 +1,79 @@
+From 51e62f1491c1fce95541008d29d154e4ae117a22 Mon Sep 17 00:00:00 2001
+Message-Id: <51e62f1491c1fce95541008d29d154e4ae117a22.1685609747.git.stefan@agner.ch>
+In-Reply-To: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685609747.git.stefan@agner.ch>
+References: <f0292972b38d512fce48384ebbb72b2da46f03bd.1685609747.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 1 Jun 2023 10:22:12 +0200
+Subject: [PATCH] ARM: dts: bcm2711: yellow: Use mini-UART for Bluetooth by
+ default
+
+Use the mini UART for Bluetooth by default. This makes sure that the
+full UART is always available on J11.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts    | 23 ++++++++++++-------
+ 1 file changed, 15 insertions(+), 8 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 b8f0bc2df062..78e61e628d66 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -318,7 +318,7 @@ chosen {
+ 	};
+ 
+ 	aliases {
+-		serial0 = &uart1;
++		serial0 = &uart0;
+ 		serial1 = &uart4;
+ 		serial2 = &uart5;
+ 		mmc0 = &emmc2;
+@@ -348,12 +348,14 @@ &mmcnr {
+ };
+ 
+ &uart0 {
+-	pinctrl-0 = <&uart0_pins &bt_pins>;
++	pinctrl-0 = <&uart0_pins>;
+ 	status = "okay";
+ };
+ 
+ &uart1 {
+-	pinctrl-0 = <&uart1_pins>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins &bt_pins &fake_bt_cts>;
++	status = "okay";
+ };
+ 
+ &spi0 {
+@@ -489,18 +491,23 @@ bt_pins: bt_pins {
+ 		brcm,pull = <2>;
+ 	};
+ 
+-	uart0_pins: uart0_pins {
+-		brcm,pins = <32 33>;
+-		brcm,function = <BCM2835_FSEL_ALT3>;
+-		brcm,pull = <0 2>;
++	fake_bt_cts: fake_bt_cts {
++		brcm,pins = <31>;
++		brcm,function = <1>; /* output */
+ 	};
+ 
+-	uart1_pins: uart1_pins {
++	uart0_pins: uart0_pins {
+ 		brcm,pins;
+ 		brcm,function;
+ 		brcm,pull;
+ 	};
+ 
++	uart1_pins: uart1_pins {
++		brcm,pins = <32 33>;
++		brcm,function = <2>; /* alt5=UART1 */
++		brcm,pull = <0 2>;
++	};
++
+ 	uart2_pins: uart2_pins {
+ 		brcm,pins = <0 1>;
+ 		brcm,function = <BCM2835_FSEL_ALT4>;
+-- 
+2.40.1
+

buildroot-external/board/raspberrypi/yellow/rootfs-overlay/usr/lib/udev/rules.d/99-com.rules

@@ -0,0 +1,4 @@
+
+KERNEL=="ttyAMA0", SYMLINK+="serial0"
+
+KERNEL=="ttyS0", SYMLINK+="serial1"

buildroot-external/board/raspberrypi/yellow/uboot.config

@@ -1,4 +1 @@
-CONFIG_NVME_PCI=y
-CONFIG_CMD_NVME=y
-CONFIG_NVME=y
 CONFIG_CMD_USB_MASS_STORAGE=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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
@@ -58,6 +58,7 @@ 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
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
@@ -65,10 +66,10 @@ BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -86,6 +87,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

buildroot-external/configs/generic_x86_64_defconfig

@@ -20,9 +20,9 @@ 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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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_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)/kernel/device-support-pcie.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
@@ -60,17 +60,19 @@ 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
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -88,6 +90,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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"
@@ -45,14 +45,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -72,6 +73,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
@@ -125,6 +129,7 @@ BR2_PACKAGE_HASSIO_MACHINE="khadas-vim3"
 BR2_PACKAGE_KHADAS_BOOT=y
 BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_OS_AGENT_BOARD="KhadasVim3"
+BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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"
@@ -45,14 +45,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -72,6 +73,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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"
@@ -43,14 +43,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -70,6 +71,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

buildroot-external/configs/odroid_m1_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-m1 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-rockchip.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-m1/kernel.config"
@@ -45,14 +45,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -72,6 +73,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
@@ -108,7 +112,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/u-boot/u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2023.04-rc4"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2023.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-m1"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
@@ -130,11 +134,13 @@ BR2_PACKAGE_ROCKCHIP_BLOBS=y
 BR2_PACKAGE_ROCKCHIP_BLOBS_VERSION="b2dec11618b644d7fc8ac0eb7694a245667f5981"
 BR2_PACKAGE_ROCKCHIP_BLOBS_ATF="bin/rk35/rk3568_bl31_v1.28.elf"
 BR2_PACKAGE_ROCKCHIP_BLOBS_TPL="bin/rk35/rk3568_ddr_1056MHz_v1.09.bin"
+BR2_PACKAGE_GASKET=y
 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_OS_AGENT_BOARD="OdroidM1"
+BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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"
@@ -45,14 +45,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -72,6 +73,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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
@@ -45,14 +45,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -72,6 +73,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

buildroot-external/configs/ova_defconfig

@@ -20,9 +20,9 @@ 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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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_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)/kernel/device-support-pcie.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
@@ -58,6 +58,7 @@ 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
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
@@ -69,10 +70,10 @@ BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
@@ -90,6 +91,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e9b8fd92399bd707bde31e3464472c1b06f5e2a0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
@@ -45,6 +45,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
@@ -54,9 +55,9 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -75,6 +76,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e9b8fd92399bd707bde31e3464472c1b06f5e2a0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
@@ -47,6 +47,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
@@ -56,9 +57,9 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -77,6 +78,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e9b8fd92399bd707bde31e3464472c1b06f5e2a0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
@@ -48,6 +48,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
@@ -57,9 +58,9 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -78,6 +79,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e9b8fd92399bd707bde31e3464472c1b06f5e2a0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
@@ -48,6 +48,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
@@ -57,9 +58,9 @@ BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_NVME=y
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -78,6 +79,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e3376fb94fda798d2a322e9c70789286132a1a9f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
@@ -48,6 +48,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
@@ -56,9 +57,9 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -77,6 +78,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

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="6.1.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.39"
 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"
@@ -47,14 +47,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -73,6 +74,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y

buildroot-external/configs/yellow_defconfig

@@ -15,17 +15,18 @@ 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/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/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/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="$(call github,raspberrypi,linux,e3376fb94fda798d2a322e9c70789286132a1a9f)/linux-e3376fb94fda798d2a322e9c70789286132a1a9f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-yellow"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
@@ -48,18 +49,20 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
 BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
+# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_INPUT_EVENT_DAEMON=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_NVME=y
-BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_CIFS_UTILS=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
@@ -78,6 +81,9 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_CLI=y
+BR2_PACKAGE_NFS_UTILS=y
+# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set
+BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_IPTABLES_NFTABLES=y
 BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y
 BR2_PACKAGE_WIRELESS_REGDB=y
@@ -133,6 +139,7 @@ BR2_PACKAGE_OS_AGENT_BOARD="Yellow"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
+BR2_PACKAGE_RPI_RF_MOD_DTS_YELLOW=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
 BR2_PACKAGE_V4L2LOOPBACK=y

buildroot-external/kernel/device-support-pcie.config

@@ -0,0 +1,25 @@
+CONFIG_IGB=y
+CONFIG_IGC=m
+
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1C=m
+CONFIG_ATL1E=m
+CONFIG_ALX=m
+
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNXT=m
+
+CONFIG_BROADCOM_PHY=m
+
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+CONFIG_DWMAC_INTEL=m
+CONFIG_STMMAC_PCI=m
+

buildroot-external/kernel/hassos.config

@@ -11,10 +11,11 @@ CONFIG_ZRAM=y
 CONFIG_ZSWAP=y
 CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 
 CONFIG_LRU_GEN=y
-# CONFIG_LRU_GEN_ENABLED is not set
+CONFIG_LRU_GEN_ENABLED=y
 
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 
@@ -28,6 +29,11 @@ CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_BTRFS_FS=m
 
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_DM_VERITY=y
+
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 
@@ -60,6 +66,8 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_LEDS=y
 
 CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_REACHABILITY_PROBE=y
 CONFIG_IPV6_SIT=m
 
 CONFIG_IP_MROUTE=y
@@ -161,3 +169,11 @@ CONFIG_WIREGUARD=m
 
 CONFIG_HID=m
 CONFIG_HIDRAW=y
+CONFIG_UHID=y
+
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y

buildroot-external/meta

@@ -1,7 +1,7 @@
 VERSION_MAJOR=10
-VERSION_BUILD=0
+VERSION_BUILD=4
 
 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

buildroot-external/ota/rauc-hook

@@ -16,6 +16,9 @@ install_boot() {
     fi
     mount "${RAUC_IMAGE_NAME}" "${BOOT_NEW}"
 
+    # Avoid stale/old overlays
+    rm -f "${BOOT_MNT}"/overlays/* || true
+
     # Backup boot config
     cp -f "${BOOT_MNT}"/*.txt "${BOOT_TMP}/" || true
 

buildroot-external/package/generic_raw_uart/generic_raw_uart.hash

@@ -1,3 +1,3 @@
 # Locally computed
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  07a0de82e6bf25d35df3520beaea886644160bac4077c3ccb9bb615f5d266972  generic_raw_uart-b787f3d84b311bd3e07b0ca8f2aa63330030746e.tar.gz
+sha256  39937f044c491a23ffd6336c48fa01ae03172486466f4ff8c580b5f696a3a784  generic_raw_uart-908d18fd52963ef8bf54b12083650509ce116374.tar.gz

buildroot-external/package/generic_raw_uart/generic_raw_uart.mk

@@ -13,15 +13,11 @@
 #
 ################################################################################
 
-GENERIC_RAW_UART_VERSION = b787f3d84b311bd3e07b0ca8f2aa63330030746e
+GENERIC_RAW_UART_VERSION = 908d18fd52963ef8bf54b12083650509ce116374
 GENERIC_RAW_UART_SITE = $(call github,alexreinert,piVCCU,$(GENERIC_RAW_UART_VERSION))
 GENERIC_RAW_UART_LICENSE = GPL2
 GENERIC_RAW_UART_LICENSE_FILES = LICENSE
 GENERIC_RAW_UART_MODULE_SUBDIRS = kernel
 
-define GENERIC_RAW_UART_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_DISABLE_OPT,CONFIG_WERROR)
-endef
-
 $(eval $(kernel-module))
 $(eval $(generic-package))

buildroot-external/package/qemu-guest-agent/qemu-guest.service

@@ -1,9 +1,10 @@
 [Unit]
 Description=QEMU Guest Agent
-After=syslog.target network.target
 ConditionVirtualization=|kvm
 ConditionVirtualization=|qemu
 ConditionPathExists=!/dev/virtio-ports/org.linuxcontainers.lxd
+BindTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 
 [Service]
 ExecStart=/usr/libexec/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0

buildroot-external/package/rpi-rf-mod/Config.in

@@ -39,6 +39,11 @@ config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C2
 	help
 	  For the ODROID-C2
 
+config BR2_PACKAGE_RPI_RF_MOD_DTS_YELLOW
+	bool "HomeAssistant Yellow"
+	help
+	  For the HomeAssistant Yellow
+
 endchoice
 
 endif

buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash

@@ -1,2 +1,2 @@
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  df22bcebb72f1ce7dc01504e2a1d097dd09fed20a461b36c2dd273f6ba7f8c96  rpi-rf-mod-de15b40fe87116c14c810b25d3b5107091e8946b.tar.gz
+sha256  6298234c3bda2642018df25eaa936c2a041fe1573d0012bc7c4bdf0e4cfa5fba  rpi-rf-mod-e7af99eeb4b8c480d36d5bc771484fd6d85188d6.tar.gz

buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk

@@ -14,11 +14,11 @@
 #
 ################################################################################
 
-RPI_RF_MOD_VERSION = de15b40fe87116c14c810b25d3b5107091e8946b
+RPI_RF_MOD_VERSION = e7af99eeb4b8c480d36d5bc771484fd6d85188d6
 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
 RPI_RF_MOD_LICENSE_FILES = LICENSE
+RPI_RF_MOD_DEPENDENCIES = host-dtc
 
 ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_RPI),y)
   # RaspberryPi DTS file
@@ -36,6 +36,9 @@ else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_N2),y)
 else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C2),y)
   # ODROID-C2 DTS file
   RPI_RF_MOD_DTS_FILE = rpi-rf-mod-odroid-c2
+else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_YELLOW),y)
+  # HomeAssistant Yellow DTS file
+  RPI_RF_MOD_DTS_FILE = rpi-rf-mod-yellow
 endif
 
 define RPI_RF_MOD_BUILD_CMDS

buildroot-external/patches/linux/0001-Revert-Bluetooth-Rework-le_scan_restart-for-hci_sync.patch

@@ -0,0 +1,221 @@
+From 013a0ae9045de9e25b2f51ff56785e7fbce88626 Mon Sep 17 00:00:00 2001
+Message-ID: <013a0ae9045de9e25b2f51ff56785e7fbce88626.1686815046.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 15 Jun 2023 09:43:59 +0200
+Subject: [PATCH] Revert "Bluetooth: Rework le_scan_restart for hci_sync"
+
+This reverts commit 27d54b778ad1fb32c2c108cfe97e861c3909a46f.
+---
+ net/bluetooth/hci_request.c | 88 +++++++++++++++++++++++++++++++++++++
+ net/bluetooth/hci_sync.c    | 75 -------------------------------
+ 2 files changed, 88 insertions(+), 75 deletions(-)
+
+diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
+index f7e006a36382..43178a21ea7e 100644
+--- a/net/bluetooth/hci_request.c
++++ b/net/bluetooth/hci_request.c
+@@ -909,8 +909,95 @@ static void set_random_addr(struct hci_request *req, bdaddr_t *rpa)
+ 	hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, rpa);
+ }
+ 
++static int le_scan_restart(struct hci_request *req, unsigned long opt)
++{
++	struct hci_dev *hdev = req->hdev;
++
++	/* If controller is not scanning we are done. */
++	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
++		return 0;
++
++	if (hdev->scanning_paused) {
++		bt_dev_dbg(hdev, "Scanning is paused for suspend");
++		return 0;
++	}
++
++	hci_req_add_le_scan_disable(req, false);
++
++	if (use_ext_scan(hdev)) {
++		struct hci_cp_le_set_ext_scan_enable ext_enable_cp;
++
++		memset(&ext_enable_cp, 0, sizeof(ext_enable_cp));
++		ext_enable_cp.enable = LE_SCAN_ENABLE;
++		ext_enable_cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
++
++		hci_req_add(req, HCI_OP_LE_SET_EXT_SCAN_ENABLE,
++			    sizeof(ext_enable_cp), &ext_enable_cp);
++	} else {
++		struct hci_cp_le_set_scan_enable cp;
++
++		memset(&cp, 0, sizeof(cp));
++		cp.enable = LE_SCAN_ENABLE;
++		cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
++		hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
++	}
++
++	return 0;
++}
++
++static void le_scan_restart_work(struct work_struct *work)
++{
++	struct hci_dev *hdev = container_of(work, struct hci_dev,
++					    le_scan_restart.work);
++	unsigned long timeout, duration, scan_start, now;
++	u8 status;
++
++	bt_dev_dbg(hdev, "");
++
++	hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &status);
++	if (status) {
++		bt_dev_err(hdev, "failed to restart LE scan: status %d",
++			   status);
++		return;
++	}
++
++	hci_dev_lock(hdev);
++
++	if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) ||
++	    !hdev->discovery.scan_start)
++		goto unlock;
++
++	/* When the scan was started, hdev->le_scan_disable has been queued
++	 * after duration from scan_start. During scan restart this job
++	 * has been canceled, and we need to queue it again after proper
++	 * timeout, to make sure that scan does not run indefinitely.
++	 */
++	duration = hdev->discovery.scan_duration;
++	scan_start = hdev->discovery.scan_start;
++	now = jiffies;
++	if (now - scan_start <= duration) {
++		int elapsed;
++
++		if (now >= scan_start)
++			elapsed = now - scan_start;
++		else
++			elapsed = ULONG_MAX - scan_start + now;
++
++		timeout = duration - elapsed;
++	} else {
++		timeout = 0;
++	}
++
++	queue_delayed_work(hdev->req_workqueue,
++			   &hdev->le_scan_disable, timeout);
++
++unlock:
++	hci_dev_unlock(hdev);
++}
++
+ void hci_request_setup(struct hci_dev *hdev)
+ {
++	INIT_DELAYED_WORK(&hdev->le_scan_restart, le_scan_restart_work);
+ 	INIT_DELAYED_WORK(&hdev->interleave_scan, interleave_scan_work);
+ }
+ 
+@@ -919,4 +1006,5 @@ void hci_request_cancel_all(struct hci_dev *hdev)
+ 	__hci_cmd_sync_cancel(hdev, ENODEV);
+ 
+ 	cancel_interleave_scan(hdev);
++	cancel_delayed_work_sync(&hdev->le_scan_restart);
+ }
+diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
+index 3eec688a88a9..34f29d83b7ff 100644
+--- a/net/bluetooth/hci_sync.c
++++ b/net/bluetooth/hci_sync.c
+@@ -393,79 +393,6 @@ static void le_scan_disable(struct work_struct *work)
+ 	hci_dev_unlock(hdev);
+ }
+ 
+-static int hci_le_set_scan_enable_sync(struct hci_dev *hdev, u8 val,
+-				       u8 filter_dup);
+-static int hci_le_scan_restart_sync(struct hci_dev *hdev)
+-{
+-	/* If controller is not scanning we are done. */
+-	if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
+-		return 0;
+-
+-	if (hdev->scanning_paused) {
+-		bt_dev_dbg(hdev, "Scanning is paused for suspend");
+-		return 0;
+-	}
+-
+-	hci_le_set_scan_enable_sync(hdev, LE_SCAN_DISABLE, 0x00);
+-	return hci_le_set_scan_enable_sync(hdev, LE_SCAN_ENABLE,
+-					   LE_SCAN_FILTER_DUP_ENABLE);
+-}
+-
+-static int le_scan_restart_sync(struct hci_dev *hdev, void *data)
+-{
+-	return hci_le_scan_restart_sync(hdev);
+-}
+-
+-static void le_scan_restart(struct work_struct *work)
+-{
+-	struct hci_dev *hdev = container_of(work, struct hci_dev,
+-					    le_scan_restart.work);
+-	unsigned long timeout, duration, scan_start, now;
+-	int status;
+-
+-	bt_dev_dbg(hdev, "");
+-
+-	hci_dev_lock(hdev);
+-
+-	status = hci_cmd_sync_queue(hdev, le_scan_restart_sync, NULL, NULL);
+-	if (status) {
+-		bt_dev_err(hdev, "failed to restart LE scan: status %d",
+-			   status);
+-		goto unlock;
+-	}
+-
+-	if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) ||
+-	    !hdev->discovery.scan_start)
+-		goto unlock;
+-
+-	/* When the scan was started, hdev->le_scan_disable has been queued
+-	 * after duration from scan_start. During scan restart this job
+-	 * has been canceled, and we need to queue it again after proper
+-	 * timeout, to make sure that scan does not run indefinitely.
+-	 */
+-	duration = hdev->discovery.scan_duration;
+-	scan_start = hdev->discovery.scan_start;
+-	now = jiffies;
+-	if (now - scan_start <= duration) {
+-		int elapsed;
+-
+-		if (now >= scan_start)
+-			elapsed = now - scan_start;
+-		else
+-			elapsed = ULONG_MAX - scan_start + now;
+-
+-		timeout = duration - elapsed;
+-	} else {
+-		timeout = 0;
+-	}
+-
+-	queue_delayed_work(hdev->req_workqueue,
+-			   &hdev->le_scan_disable, timeout);
+-
+-unlock:
+-	hci_dev_unlock(hdev);
+-}
+-
+ static int reenable_adv_sync(struct hci_dev *hdev, void *data)
+ {
+ 	bt_dev_dbg(hdev, "");
+@@ -632,7 +559,6 @@ void hci_cmd_sync_init(struct hci_dev *hdev)
+ 	INIT_WORK(&hdev->cmd_sync_cancel_work, hci_cmd_sync_cancel_work);
+ 	INIT_WORK(&hdev->reenable_adv_work, reenable_adv);
+ 	INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable);
+-	INIT_DELAYED_WORK(&hdev->le_scan_restart, le_scan_restart);
+ 	INIT_DELAYED_WORK(&hdev->adv_instance_expire, adv_timeout_expire);
+ }
+ 
+@@ -4771,7 +4697,6 @@ int hci_dev_close_sync(struct hci_dev *hdev)
+ 	cancel_delayed_work(&hdev->power_off);
+ 	cancel_delayed_work(&hdev->ncmd_timer);
+ 	cancel_delayed_work(&hdev->le_scan_disable);
+-	cancel_delayed_work(&hdev->le_scan_restart);
+ 
+ 	hci_request_cancel_all(hdev);
+ 
+-- 
+2.41.0
+

buildroot-external/patches/linux/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch

@@ -0,0 +1,56 @@
+From b9182b02829b158d55acc53a0bcec1ed667b2668 Mon Sep 17 00:00:00 2001
+Message-Id: <b9182b02829b158d55acc53a0bcec1ed667b2668.1680000784.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 28 Mar 2023 12:02:10 +0200
+Subject: [PATCH] ipv6: add option to explicitly enable reachability test
+
+Systems which act as host as well as router might prefer the host
+behavior. Currently the kernel does not allow to use IPv6 forwarding
+globally and at the same time use route reachability probing.
+
+Add a compile time flag to enable route reachability probe in any
+case.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ net/ipv6/Kconfig | 9 +++++++++
+ net/ipv6/route.c | 3 ++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
+index 658bfed1df8b..5147fd4c93ff 100644
+--- a/net/ipv6/Kconfig
++++ b/net/ipv6/Kconfig
+@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD
+ 
+ 	  If unsure, say N.
+ 
++config IPV6_REACHABILITY_PROBE
++	bool "IPv6: Always use reachability probing (RFC 4191)"
++	help
++	  By default reachability probing is disabled on router devices (when
++	  IPv6 forwarding is enabled). This option explicitly enables
++	  reachability probing always.
++
++	  If unsure, say N.
++
+ config INET6_AH
+ 	tristate "IPv6: AH transformation"
+ 	select XFRM_AH
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index 0fdb03df2287..5e1e1f02f400 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -2210,7 +2210,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
+ 
+ 	strict |= flags & RT6_LOOKUP_F_IFACE;
+ 	strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
+-	if (net->ipv6.devconf_all->forwarding == 0)
++	if (net->ipv6.devconf_all->forwarding == 0 ||
++	    IS_ENABLED(IPV6_REACHABILITY_PROBE))
+ 		strict |= RT6_LOOKUP_F_REACHABLE;
+ 
+ 	rcu_read_lock();
+-- 
+2.40.0
+

buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch

@@ -0,0 +1,27 @@
+From a053500cf43a31ee82a6e0f3d644ea36f5c77ffb Mon Sep 17 00:00:00 2001
+Message-Id: <a053500cf43a31ee82a6e0f3d644ea36f5c77ffb.1679932288.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 27 Mar 2023 17:48:34 +0200
+Subject: [PATCH] ndisc: support multiple gateways for a single network
+
+---
+ src/core/ndisc/nm-ndisc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
+index 9a6038d406..67cdf5d99a 100644
+--- a/src/core/ndisc/nm-ndisc.c
++++ b/src/core/ndisc/nm-ndisc.c
+@@ -654,7 +654,8 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec
+         NMNDiscRoute *item = &g_array_index(rdata->routes, NMNDiscRoute, i);
+ 
+         if (IN6_ARE_ADDR_EQUAL(&item->network, &new_item->network)
+-            && item->plen == new_item->plen) {
++            && item->plen == new_item->plen
++            && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway)) {
+             if (new_item->expiry_msec <= now_msec) {
+                 g_array_remove_index(rdata->routes, i);
+                 return TRUE;
+-- 
+2.40.0
+

buildroot-external/rootfs-overlay/etc/systemd/journald.conf

@@ -1,3 +1,4 @@
 [Journal]
 Storage=auto
 Compress=yes
+SystemMaxUse=500M

buildroot-external/rootfs-overlay/etc/systemd/system/rpcbind.service.d/haos.conf

@@ -0,0 +1,2 @@
+[Unit]
+DefaultDependencies=yes

buildroot-external/rootfs-overlay/etc/systemd/system/systemd-time-wait-sync.service.d/network-online.conf

@@ -1,4 +1,5 @@
 [Unit]
+After=network-online.target
 Wants=network-online.target
 
 [Install]

buildroot-external/rootfs-overlay/etc/systemd/system/udisks2.service.d/haos.conf

@@ -1,5 +1,7 @@
 [Unit]
 DefaultDependencies=no
+Requires=dbus.socket systemd-journald.socket
+After=dbus.socket systemd-journald.socket
 
 [Service]
 Environment="DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket"

buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-agent.service.d/haos.conf

@@ -0,0 +1,2 @@
+[Unit]
+After=mnt-boot.mount

buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-mglru.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Configure multigenerational LRU
+ConditionPathExists=/sys/kernel/mm/lru_gen/enabled
+
+[Service]
+Type=oneshot
+
+ExecStart=/bin/sh -c "echo 1 > /sys/kernel/mm/lru_gen/min_ttl_ms"
+
+[Install]
+WantedBy=basic.target

buildroot-external/rootfs-overlay/usr/libexec/haos-swapfile

@@ -2,17 +2,20 @@
 set -e
 
 swapfile="/mnt/data/swapfile"
-swapsize="$(awk '/MemTotal/{ print $2 * 0.33 }' /proc/meminfo)"
+# Swap space in 4k blocks
+swapsize="$(awk '/MemTotal/{ print int($2 * 0.33 / 4) }' /proc/meminfo)"
 
 
-if [ ! -s "${swapfile}" ] || [ "$(stat "${swapfile}" -c '%s')" -lt $((swapsize * 1024)) ]; then
+if [ ! -s "${swapfile}" ] || [ "$(stat "${swapfile}" -c '%s')" -lt $((swapsize * 4096)) ]; then
 	# Check free space (in 4k blocks)
-	if [ "$(stat -f /mnt/data -c '%f')" -lt $((swapsize / 4)) ]; then
+	if [ "$(stat -f /mnt/data -c '%f')" -lt "${swapsize}" ]; then
 		echo "[WARNING] Not enough space to allocate swapfile"
 		exit 1
 	fi
 
-	dd if=/dev/zero of="${swapfile}" bs=1k count="${swapsize}"
+	echo "[INFO] Creating swapfile of size $((swapsize *4))k"
+	umask 0077
+	dd if=/dev/zero of="${swapfile}" bs=4k count="${swapsize}"
 fi
 
 if ! swaplabel "${swapfile}" > /dev/null 2>&1; then

buildroot-external/rootfs-overlay/usr/sbin/hassos-cli

@@ -19,7 +19,19 @@ docker container exec \
     -ti hassio_cli \
     /usr/bin/cli.sh
 
-# Jump to root login shell
+case $? in
-if [ $? -eq 10 ]; then
+  10)
+    # Jump to root login shell (login command)
     exec /bin/ash -l
-fi
+    ;;
+  143)
+    # 143 graceful termination (SIGTERM). Most likely a proper shutdown.
+    # Just sleep for a while until actual systemd shutdown gets invoked.
+    echo ""
+    echo "Home Assistant CLI has been terminated."
+    sleep 30
+    ;;
+  *)
+    echo "HA CLI failed with error code: $?"
+    ;;
+esac

buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor

@@ -95,7 +95,7 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
         -v /run/supervisor:/run/os:rw \
         -v /run/udev:/run/udev:ro \
         -v /etc/machine-id:/etc/machine-id:ro \
-        -v ${SUPERVISOR_DATA}:/data:rw \
+        -v ${SUPERVISOR_DATA}:/data:rw,slave \
         -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
         -e SUPERVISOR_NAME=hassio_supervisor \
         -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \