Add driver for Creative Sound Blastr X-Fi PCI cards (#4331)

Add snd-ctxfi driver as module to generic PCI device support fragment.

Fixes #4141

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
-name: Bug Report Form
+name: Report an issue with Home Assistant Operating System
 description: Report an issue related to the Home Assistant Operating System.
-labels: bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -9,7 +9,7 @@ contact_links:
     about: Our developer documentation has its own issue tracker. Please report issues with the website there.
 
   - name: Request a feature for the Operating System
-    url: https://community.home-assistant.io/c/feature-requests
+    url: https://github.com/orgs/home-assistant/discussions
     about: Request an new feature for the Operating System.
 
   - name: I have a question or need support

.github/actions/bump-rpi-imager-version/action.yml

@@ -83,6 +83,7 @@ runs:
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi3-64" "RPi 3"
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi4-64" "RPi 4/400"
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi5-64" "RPi 5"
+        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "yellow" "Yellow"
 
     - shell: bash
       env:

.github/actions/haos-builder-command/action.yml

@@ -0,0 +1,22 @@
+name: "Run command in HAOS build container"
+inputs:
+  image:
+    description: "HAOS builder image to use"
+    required: true
+  command:
+    description: "Command to run in the container"
+    required: true
+runs:
+  using: 'composite'
+  steps:
+  - name: "Run command in HAOS build container"
+    shell: bash
+    run: |
+      docker run --rm --privileged \
+        -e BUILDER_UID="$(id -u)" \
+        -e BUILDER_GID="$(id -g)" \
+        -v "${GITHUB_WORKSPACE}:/build" \
+        -v "/mnt/cache:/cache" \
+        -v "/mnt/output:/build/output" \
+        ${{ inputs.image }} \
+        ${{ inputs.command }}

.github/workflows/artifacts-index.yaml

@@ -31,7 +31,7 @@ on:
         required: true
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.13"
 
 jobs:
   build-index:
@@ -39,17 +39,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: Setup Python version ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Install AWS CLI
-        run: pip install awscli
+        run: pip install 'awscli<1.37.0'
 
       - name: Create build index
         env:

.github/workflows/build.yaml

@@ -16,9 +16,24 @@ on:
         required: true
         type: boolean
         default: true
+      run_tests:
+        description: 'Run tests after build'
+        required: true
+        type: boolean
+        default: true
+      hassio_channel:
+        description: 'Release channel to use (default: stable for GH releases, dev otherwise)'
+        type: choice
+        required: true
+        default: default
+        options:
+          - default
+          - stable
+          - beta
+          - dev
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.13"
 
 jobs:
   prepare:
@@ -33,13 +48,14 @@ jobs:
       version_main: ${{ steps.version.outputs.version_main }}
       version_full: ${{ steps.version.outputs.version_full }}
       channel: ${{ steps.channel.outputs.channel }}
+      hassio_channel_option: ${{ steps.channel.outputs.hassio_channel_option }}
       matrix: ${{ steps.generate_matrix.outputs.result }}
       build_container_image: ghcr.io/${{ github.repository_owner }}/haos-builder@${{ steps.build_haos_builder.outputs.digest }}
       publish_build: ${{ steps.check_publish.outputs.publish_build }}
       self_signed_cert: ${{ steps.generate_signing_key.outputs.self_signed_cert }}
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -66,7 +82,7 @@ jobs:
           PUBLISH_BUILD: ${{ steps.check_publish.outputs.publish_build }}
         run: |
           version_dev="dev$(date --utc +'%Y%m%d')"
-          if [ "${{ env.PUBLISH_BUILD }}" != "true" ]; then
+          if [ "${{ env.PUBLISH_BUILD }}" != "true" ] || [ "${{ github.ref }}" != "refs/heads/dev" ]; then
             version_dev="dev$(date +%s)"
           fi
           echo "Development version \"${version_dev}\""
@@ -114,8 +130,24 @@ jobs:
             echo "channel=dev" >> "$GITHUB_OUTPUT"
           fi
 
+          if [[ "${{ inputs.hassio_channel }}" == "default" ]]; then
+            if [[ "${{ github.event_name }}" == "release" ]]; then
+              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
+            else
+              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            if [[ "${{ inputs.hassio_channel }}" == "stable" ]]; then
+              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
+            elif [[ "${{ inputs.hassio_channel }}" == "beta" ]]; then
+              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_BETA" >> "$GITHUB_OUTPUT"
+            elif [[ "${{ inputs.hassio_channel }}" == "dev" ]]; then
+              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
+            fi
+          fi
+
       - name: Create build matrix
-        uses: actions/github-script@v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         id: generate_matrix
         with:
           script: |
@@ -125,26 +157,35 @@ jobs:
             }
 
             const boardFilter = "${{ github.event.inputs.boards }}"
+            const runTests = "${{ github.event.inputs.run_tests }}" === "true"
+
             if (boardFilter == "") {
               console.log("Run full build for all boards")
               return { "board": boards }
             } else {
               console.log("Run partial build")
               const boardSet = new Set(boardFilter.split(","))
+
+              // if tests are enabled, we need to ensure the OVA board is included
+              if (runTests && !boardSet.has("ova")) {
+                console.log("Adding OVA board for integration tests")
+                boardSet.add("ova")
+              }
+
               const buildBoards = boards.filter(b => boardSet.has(b.id))
               return { "board": buildBoards }
             }
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v6.10.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         id: build_haos_builder
         with:
           context: .
@@ -166,7 +207,7 @@ jobs:
           echo "self_signed_cert=true" >> $GITHUB_OUTPUT
 
       - name: Create signing key
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: steps.generate_signing_key.outcome == 'success'
         with:
           name: signing-key
@@ -186,20 +227,20 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: true
           persist-credentials: false
 
       - name: Setup Python version ${{ env.PYTHON_VERSION }}
         if: ${{ github.event_name != 'release' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Install AWS CLI
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
-        run: pip install awscli
+        run: pip install 'awscli<1.37.0'
 
       - name: Set version suffix
         if: ${{ github.event_name != 'release' }}
@@ -219,7 +260,7 @@ jobs:
 
       - name: Get self-signed certificate from the prepare job
         if: ${{ needs.prepare.outputs.self_signed_cert == 'true' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: signing-key
 
@@ -240,33 +281,37 @@ jobs:
           df -h
 
       - name: "Restore cache: object files"
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: /mnt/cache/cc
           key: haos-cc-${{ matrix.board.id }}
 
+      - name: Generate build config
+        uses: "./.github/actions/haos-builder-command"
+        with:
+          image: ${{ needs.prepare.outputs.build_container_image }}
+          command: make ${{ matrix.board.defconfig }}_defconfig
+
+      - name: Override release channel
+        if: ${{ needs.prepare.outputs.hassio_channel_option != 'BR2_PACKAGE_HASSIO_CHANNEL_STABLE' }}
+        uses: "./.github/actions/haos-builder-command"
+        with:
+          image: ${{ needs.prepare.outputs.build_container_image }}
+          command: |
+            bash -c 'echo "${{ needs.prepare.outputs.hassio_channel_option }}=y" >> /build/output/.config && make olddefconfig'
+
       - name: Build
-        run: |
+        uses: "./.github/actions/haos-builder-command"
-          BUILDER_UID="$(id -u)"
+        with:
-          BUILDER_GID="$(id -g)"
+          image: ${{ needs.prepare.outputs.build_container_image }}
-          docker run --rm --privileged \
+          command: make
-            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
-            -v "${GITHUB_WORKSPACE}:/build" \
-            -v "/mnt/cache:/cache" \
-            -v "/mnt/output:/build/output" \
-            ${{ needs.prepare.outputs.build_container_image }} \
-            make BUILDDIR=/build ${{ matrix.board.defconfig }}
 
       - name: Check Linux config
-        run: |
+        uses: "./.github/actions/haos-builder-command"
-          docker run --rm --privileged \
+        with:
-            -e BUILDER_UID="$(id -u)" -e BUILDER_GID="$(id -g)" \
+          image: ${{ needs.prepare.outputs.build_container_image }}
-            -v "${GITHUB_WORKSPACE}:/build" \
+          command: |
-            -v "/mnt/cache:/cache" \
+            make BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=/build/" linux-check-dotconfig
-            -v "/mnt/output:/build/output" \
-            ${{ needs.prepare.outputs.build_container_image }} \
-            make -C buildroot O="/build/output" BR2_EXTERNAL="/build/buildroot-external" \
-            BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=/build/" linux-check-dotconfig
 
       - name: Upload artifacts
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
@@ -284,7 +329,7 @@ jobs:
 
       - name: Upload release assets
         if: ${{ github.event_name == 'release' }}
-        uses: shogo82148/actions-upload-release-asset@v1
+        uses: shogo82148/actions-upload-release-asset@59cbc563d11314e48122193f8fe5cdda62ea6cf9 # v1.9.1
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: output/images/haos_*
@@ -299,7 +344,7 @@ jobs:
 
       - name: "Save cache: object files"
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: /mnt/cache/cc
           key: haos-cc-${{ matrix.board.id }}-${{ github.run_id }}
@@ -307,6 +352,18 @@ jobs:
       - name: Generate build summary
         run: |
           echo "# ${{ matrix.board.id }} build summary" >> $GITHUB_STEP_SUMMARY
+          echo "## Built-in OS components" >> $GITHUB_STEP_SUMMARY
+          echo "Release channel: ${{ inputs.hassio_channel }} (${{ needs.prepare.outputs.hassio_channel_option }})" >> $GITHUB_STEP_SUMMARY
+          echo "| Container | Version |" >> $GITHUB_STEP_SUMMARY
+          echo "|:-|:-|" >> $GITHUB_STEP_SUMMARY
+          supervisor_version=$(jq -r ".supervisor" output/build/hassio-*/version.json)
+          landingpage_version=$(curl -fsSL https://api.github.com/repos/home-assistant/landingpage/releases/latest | jq -r '.tag_name')
+          echo "| supervisor | [${supervisor_version}](https://github.com/home-assistant/supervisor/releases/tag/${supervisor_version}) |" >> $GITHUB_STEP_SUMMARY
+          echo "| landingpage | [${landingpage_version}](https://github.com/home-assistant/landingpage/releases/tag/${landingpage_version}) |" >> $GITHUB_STEP_SUMMARY
+          for plugin in dns audio cli multicast observer; do
+            version=$(jq -r ".${plugin}" output/build/hassio-*/version.json)
+            echo "| plugin-${plugin} | [${version}](https://github.com/home-assistant/plugin-${plugin}/releases/tag/${version}) |" >> $GITHUB_STEP_SUMMARY
+          done
           echo "## Artifacts" >> $GITHUB_STEP_SUMMARY
           echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
           echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
@@ -321,7 +378,7 @@ jobs:
           done
 
       - name: Upload OS image artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id != 'ova' }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
@@ -329,7 +386,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
 
       - name: Upload RAUC bundle artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
@@ -337,7 +394,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
 
       - name: Upload Open Virtualization Format (OVA) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
@@ -345,7 +402,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
 
       - name: Upload QEMU disk image artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         # Create artifact for ova every time - it's used by the called tests workflow
         if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
         with:
@@ -354,7 +411,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
 
       - name: Upload VMware Virtual Machine Disk (VMDK) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
@@ -362,7 +419,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
 
       - name: Upload VirtualBox Virtual Disk Image (VDI) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
@@ -370,7 +427,7 @@ jobs:
             output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
 
       - name: Upload Virtual Hard Disk v2 (VHDX) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
@@ -379,6 +436,7 @@ jobs:
 
   test:
     name: Test OS image
+    if: ${{ github.event_name == 'release' || inputs.run_tests == true }}
     needs: [ build, prepare ]
     uses: ./.github/workflows/test.yaml
     with:
@@ -401,14 +459,14 @@ jobs:
 
   bump_version:
     name: Bump ${{ needs.prepare.outputs.channel }} channel version
-    if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' }}
+    if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' && (needs.prepare.outputs.channel != 'dev' || github.ref == 'refs/heads/dev') }}
     environment: ${{ needs.prepare.outputs.channel }}
     needs: [ build, prepare ]
     runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         persist-credentials: false
 

.github/workflows/label-actions.yml

@@ -14,4 +14,4 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/label-actions@v4.0.1
+      - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # v4.0.1

.github/workflows/lock.yml

@@ -0,0 +1,25 @@
+name: Lock
+
+on:
+  schedule:
+    - cron: "45 5 * * *"
+
+permissions:
+  discussions: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  lock:
+    if: github.repository_owner == 'home-assistant'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: "30"
+          exclude-issue-created-before: "2025-01-01T00:00:00Z"
+          issue-lock-reason: ""
+          pr-inactive-days: "7"
+          exclude-pr-created-before: "2025-01-01T00:00:00Z"
+          pr-lock-reason: ""

.github/workflows/pr-checks.yml

@@ -15,17 +15,17 @@ jobs:
           python3-flake8
 
     - name: Check out code
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         submodules: true
 
     - name: Check Dockerfile
-      uses: brpaz/hadolint-action@v1.5.0
+      uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
       with:
         dockerfile: Dockerfile
 
     - name: Check shell scripts
-      uses: ludeeus/action-shellcheck@2.0.0
+      uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0
       with:
         ignore_paths: buildroot
 

.github/workflows/release-drafter.yml

@@ -13,6 +13,6 @@ jobs:
       pull-requests: read  # for release-drafter/release-drafter to read PR content and labels
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

@@ -19,7 +19,7 @@ jobs:
       # - No PRs marked as no-stale or pinned
       # - No issues marked as no-stale, help-wanted or pinned
       - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v9.0.0
+        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

.github/workflows/test.yaml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -42,7 +42,7 @@ jobs:
           sudo apt install -y qemu-system-x86 ovmf
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: 3.12
 
@@ -57,7 +57,7 @@ jobs:
 
       - name: Get OS image artifact
         if: ${{ inputs.use-artifact }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: haos_ova-${{ inputs.version }}.qcow2.xz
 
@@ -74,10 +74,10 @@ jobs:
 
       - name: Run tests
         run: |
-          ./tests/run_tests.sh
+          ./tests/run_tests.sh --durations=0 --durations-min=5.0
 
       - name: Archive logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
           name: logs
@@ -85,7 +85,7 @@ jobs:
             tests/lg_logs/**
 
       - name: Archive JUnit reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
           name: junit_reports
@@ -93,7 +93,7 @@ jobs:
             tests/junit_reports/*.xml
 
       - name: Publish test report
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
         if: always()
         with:
           report_paths: 'tests/junit_reports/*.xml'

Dockerfile

@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
+        automake \
         bash \
         bc \
         binutils \
@@ -30,12 +31,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         file \
         git \
         graphviz \
+        help2man \
         jq \
         make \
         ncurses-dev \
         openssh-client \
         patch \
         perl \
+        pigz \
         python3 \
         python3-matplotlib \
         python-is-python3 \
@@ -43,6 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         rsync \
         skopeo \
         sudo \
+        texinfo \
         unzip \
         vim \
         wget \

Documentation/README.md

@@ -1,9 +1,9 @@
 # Documentation
 
-## Contents
+Documentation for the Home Assistant Operating System is available at [developers.home-assistant.io/docs/operating-system/][docs].
+If you want to contribute to this documentation, please refer to the [home-assistant/developers.home-assistant][docs-repo] repository.
 
-- [Configuration](./configuration.md) - how users can configure HAOS
+For the list of Linux kernel versions used currently in this branch of Home Assistant Operating System, see [kernel.md](./kernel.md).
-- [Network](./network.md) - approach to networking
+
-- [Bluetooth](./bluetooth.md) - approach to bluetooth
+[docs]: https://developers.home-assistant.io/docs/operating-system/
-- [Kernel](./kernel.md) - kernel versions
+[docs-repo]: https://github.com/home-assistant/developers.home-assistant/
-- [Boards](./boards/README.md) - board specific documentation

Documentation/bluetooth.md

@@ -1,12 +0,0 @@
-# Bluetooth
-
-We support `bluetoothctl` on the host. Later we want to support Bluetooth through the UI.
-All pairs and settings are persistent over reboots and updates.
-
-If you want to setup Bluetooth on the host, use the `bluetoothctl` utility.
-
-## Scan devices
-
-```
-[bluetooth]# scan on
-```

Documentation/boards/README.md

@@ -1,62 +0,0 @@
-# Boards
-
-## Overview
-
-The following boards/devices are supported:
-
-- Nabu Casa
-  - [Home Assistant Green](https://www.home-assistant.io/green/)
-  - [Home Assistant Yellow](https://www.home-assistant.io/yellow/) (based custom carrier board and powered by a Raspberry Pi 4 Compute Module)
-  - [Home Assistant Blue](https://www.home-assistant.io/blue/) (based on ODROID-N2+)
-- Raspberry Pi
-  - Pi 5 ([4 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-8gb) model) 64-bit
-  - Pi 4 Model B ([1 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-1gb), [2 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-2gb), [4 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-8gb) model) 32-bit or 64-bit (recommended)
-  - [Pi 3 Model B](https://www.raspberrypi.com/products/raspberry-pi-3-model-b/) and [B+](https://www.raspberrypi.com/products/raspberry-pi-3-model-b-plus/) 32-bit or 64-bit (recommended)
-  - [Pi 2](https://www.raspberrypi.com/products/raspberry-pi-2-model-b/) (not recommended)
-- Hardkernel
-  - [ODROID-C2](https://www.hardkernel.com/shop/odroid-c2/) (discontinued)
-  - [ODROID-C4](https://www.hardkernel.com/shop/odroid-c4/)
-  - [ODROID-M1](https://www.hardkernel.com/shop/odroid-m1/)
-  - ODROID-M1S [4 GB](https://www.hardkernel.com/shop/odroid-m1s-with-4gbyte-ram/) or [8 GB](https://www.hardkernel.com/shop/odroid-m1s-with-8gbyte-ram/)
-  - [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2/) (discontinued)
-  - ODROID-N2+ [2 GB](https://www.hardkernel.com/shop/odroid-n2-with-2gbyte-ram-2/) or [4 GB](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/)
-  - [ODROID-XU4](https://www.hardkernel.com/shop/odroid-xu4-special-price/)
-- Asus
-  - [Tinker Board](https://tinker-board.asus.com/product/tinker-board.html)
-- Generic x86-64 (UEFI, not suited for virtualization)
-  - [Intel NUC5CPYH](https://www.intel.com/content/www/us/en/products/sku/85254/intel-nuc-kit-nuc5cpyh/specifications.html)
-  - [Intel NUC6CAYH](https://www.intel.com/content/www/us/en/products/sku/95062/intel-nuc-kit-nuc6cayh/specifications.html)
-  - [Intel NUC10I3FNK2](https://www.intel.com/content/www/us/en/products/sku/195503/intel-nuc-10-performance-kit-nuc10i3fnk/specifications.html)
-  - [Gigabyte GB-BPCE-3455](https://www.gigabyte.com/Mini-PcBarebone/GB-BPCE-3455-rev-10/sp#sp)
-  - Computers supporting x86-64 architecture and UEFI boot should generally work
-- Virtual appliance (x86_64/UEFI):
-  - VMDK
-  - OVA ?
-  - VHDX ?
-  - VDI ?
-  - QCOW2 ?
-
-Notes:
-  - see ? above: are these currently supported? see ova documentation which explains issues with previous OVA distribution)
-
-## Board specifics
-
-|Board|Build|Config|Docs|
-|-----|----|------|----|
-|Green         |`make green`         |[green](../../buildroot-external/configs/green_defconfig)|-|
-|Yellow        |`make yellow`        |[yellow](../../buildroot-external/configs/yellow_defconfig)|-|
-|Pi5 64-bit    |`make rpi5_64`       |[rpi5_64](../../buildroot-external/configs/rpi5_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi4B 64-bit   |`make rpi4_64`       |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi4B 32-bit   |`make rpi4`          |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 64-bit   |`make rpi3_64`       |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 32-bit   |`make rpi3`          |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi2           |`make rpi2`          |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
-|ODROID-C2     |`make odroid_c2`     |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-C4     |`make odroid_c4`     |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-M1     |`make odroid_m1`     |[odroid_m1](../../buildroot-external/configs/odroid_m1_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-M1S    |`make odroid_m1s`    |[odroid_m1s](../../buildroot-external/configs/odroid_m1s_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-N2/N2+ |`make odroid_n2`     |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-XU4    |`make odroid_xu4`    |[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
-|Tinker Board  |`make tinker`        |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
-|Generic x86-64|`make generic_x86_64`|[generic_x86_64](../../buildroot-external/configs/generic_x86_64_defconfig)|[generic-x86-64](./generic-x86-64/)|
-|OVA           |`make ova`           |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|

Documentation/boards/asus/README.md

@@ -1,31 +0,0 @@
-# Tinker Board
-
-## Supported Hardware
-
-| Device         | Release Date  | Support | Config   |
-|----------------|---------------|---------|----------|
-| Tinker RK3288  | April 2017    | yes     | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
-| Tinker S RK3288| January 2018  | yes     | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
-| Tinker Edge T  | November 2019 | no?     |          |
-| Tinker Edge R  | November 2019 | no?     |          |
-
-## eMMC
-
-eMMC support is provided with the same image. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB. Refer to the Tinkerboard documentation how-to flash using Micro-USB and UMS.
-
-The Home Assistant OS provided U-Boot does support UMS as well,
-however manual intervention is necessary:
-
- 1. Set the jumper between Micro-USB and HDMI the maskrom mode
- 2. Insert SD card and connect the board via Micro-USB to your PC
- 3. Continusly press Ctrl+C to interrupt boot
- 4. Set the jumper back to the park position
- 5. Start UMS using:
-```
-ums 0 mmc 0
-```
- 6. A mass storage device should appear. Flash Home Assistant OS to it.
-
-## Serial console
-
-To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.

Documentation/boards/generic-aarch64/README.md

@@ -1,36 +0,0 @@
-# Generic aarch64
-
-## Supported Hardware
-
-This board configuration aims to support most aarch64 systems with UEFI boot
-Hardware it has been tested with is listed below.
-
-## Tested Hardware
-
-| Device                | Release Date | Support | Config      |
-|-----------------------|--------------|---------|-------------|
-| QEMU                  | QEMU         | yes     | [generic_aarch64](../../../buildroot-external/configs/generic_aarch64_defconfig) |
-
-
-## Requirements
-
-- aarch64 support
-- UEFI boot
-
-## Wifi
-
-WiFi is untested.
-
-## Bluetooth
-
-Bluetooth is untested.
-
-## Installation
-
-Make sure secure boot is disabled in the UEFI BIOS settings.
-
-Currently there is no shiny installation method. Checklist:
-- Boot PC to live environment using PXE or USB
-- Copy or download the Home Assistant OS image into your live environment
-- unxz the image and dd to the local hard disk
-- Reboot

Documentation/boards/generic-x86-64/README.md

@@ -1,62 +0,0 @@
-# Generic x86-64
-
-## Supported Hardware
-
-This board configuration aims to support most x86-64 systems with UEFI boot. The
-main aim is to support Intel NUC mini PCs and similar systems. Hardware it has
-been tested with is listed below.
-
-## Tested Hardware
-
-| Device                | Release Date | Support | Config      |
-|-----------------------|--------------|---------|-------------|
-| Intel NUC5CPYH        | Q3 2015      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Intel NUC6CAYH        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Intel NUC6CAYS        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Intel NUC7i3DNHE	| Q3 2017      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Intel NUC10i3FNK2     | Q4 2019      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Gigabyte GB-BPCE-3455 | 2017         | yes*    | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-
-\* needs 'nomodeset' in cmdline.txt if you want a console
-
-
-## Requirements
-
-- x86-64 support
-- UEFI boot
-- SATA/AHCI or eMMC storage
-- Supported NIC:
-  - Intel Gigabit NIC (e1000, igb - via Linux mainline)
-  - Intel PCIe Gigabit NIC (e1000e - via out-of-tree module in *buildroot-external/package/intel-e1000e*)
-  - Realtek Gigabit NIC (r8169)
-  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
-
-## Wifi
-
-The following cards are supported:
-
-- Intel Wireless 3160
-- Intel Wireless 7260
-- Intel Wireless 7265
-- Intel Wireless-AC 3165
-- Intel Wireless-AC 3168
-- Intel Wireless-AC 8260
-- Intel Wireless-AC 8265
-- Intel Wireless-AC 9260
-- Intel Wireless-AC 9461
-- Intel Wireless-AC 9462
-- Intel Wireless-AC 9560
-
-## Bluetooth
-
-Bluetooth integrated in Intel Wireless cards working OK, other options untested.
-
-## Installation
-
-Make sure secure boot is disabled in the UEFI BIOS settings.
-
-Currently there is no shiny installation method. Checklist:
-- Boot PC to live environment using PXE or USB
-- Copy or download the Home Assistant OS image into your live environment
-- unxz the image and dd to the local hard disk
-- Reboot

Documentation/boards/hardkernel/README.md

@@ -1,28 +0,0 @@
-# ODROID
-
-## Supported Hardware
-
-| Device         | Release Date  | Support      | Config    |
-|----------------|---------------|--------------|-----------|
-| ODROID-C2      | 2016          | yes          | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
-| ODROID-C4      | 2020          | yes          | [odroid_c4](../../../buildroot-external/configs/odroid_c4_defconfig) |
-| ODROID-M1      | 2022          | yes          | [odroid_m1](../../../buildroot-external/configs/odroid_m1_defconfig) |
-| ODROID-M1S     | 2023          | yes          | [odroid_m1s](../../../buildroot-external/configs/odroid_m1s_defconfig)|
-| ODROID-N2      | 2019          | yes          | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
-| ODROID-XU4     | 2015          | yes          | [odroid_xu4](../../../buildroot-external/configs/odroid_xu4_defconfig)|
-
-See separate documentation for each board.
-
-## Connectivity devices
-
-### Wi-Fi
-
-The following devices have been tested on Home Assistant OS 5.8:
-
-- [Bluetooth Module 2](https://www.hardkernel.com/shop/bluetooth-module-2/)
-- [WiFi Module 3](https://www.hardkernel.com/shop/wifi-module-3/)
-
-The [WiFi Module 5A](https://www.hardkernel.com/shop/wifi-module-5a/) is not
-recommended as there is no upstream driver support available. The driver
-currently compatible with recent Linux kernel version seems to have issues
-connecting to 5GHz networks.

Documentation/boards/hardkernel/odroid-c2.md

@@ -1,22 +0,0 @@
-# ODROID-C2
-
-## eMMC
-
-eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
-
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
-eg. `console=ttyAML0,115200n8 console=tty0`
-
-## USB
-
-A long-standing kernel bug currently results in some odd behavior. To use the USB, a device must be plugged into one of the USB ports at hard boot. If all devices are removed from the USB ports, the USB will cease to function until a reboot.
-
-### OTG
-
-The OTG USB is untested.
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-c2/hardware/expansion_connectors).

Documentation/boards/hardkernel/odroid-c4.md

@@ -1,16 +0,0 @@
-# ODROID-C4
-
-## Experimental
-
-ODROID-C4 support is based heavily on the Odroid-C2 and N2 configurations. Given the similarity of the SoCs, as well as the comparable level of support in the Linux kernel, the C4 should hopefully present few surprises. However, Home Assistant support should be regarded as experimental.
-
-Please also refer to the documentation pages for the [ODROID-C2](./odroid-c2.md) and [Odroid-N2](./odroid-n2.md), as some of that information may apply to the C4 as well.
-
-Common C4 issues that have been specifically tested and appear to be working:
-- boot from SD
-- boot from eMMC
-- MAC address obtained from eFuse
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-c4/hardware/expansion_connectors).

Documentation/boards/hardkernel/odroid-m1.md

@@ -1,50 +0,0 @@
-# ODROID-M1
-
-Home Assistant OS 10 and newer support the ODROID-M1 board.
-
-## SD-card
-
-SD-card boot is supported via on-board bootloader (SPL) or recovery button.
-
-## eMMC
-
-eMMC boot via on-board bootloader requires a newer version of Petitboot
-(spiboot 20230328 or later). To install the latest version download the SPI boot image
-from [linuxfactory.or.kr][1] as follows:
-
-1. Download `spiupdate_odroidm1_20240415.img.xz`
-2. Use balenaEtcher or another tool to flash the updater onto an SD card
-3. Download `spiboot-20240109.img`
-4. Rename the `spiboot-20240109.img` file to`spiboot.img`.
-5. Paste the `spiboot.img` file onto the FAT partition of that same SD card.
-6. Plug-in that SD card to your ODROID-M1. Petitboot will update itself, you can verify the progress on the HDMI output.
-7. If you see the version 20240109 in the top left corner, the installation was successful.\
-   If you see any other version there, the installation failed.
-
-Once Petitboot is updated you can flash Home Assistant OS directly onto an eMMC.
-
-## NVMe
-
-Booting directly from NVMe is not supported. The NVMe card can be used as a data disk.
-
-## Technical notes on boot flow
-
-The Home Assistant OS image is bootable by the SoC directly. This means that no help
-from the Hardkernel provided and pre-installed bootloader Petitboot is necessary.
-However, the ODROID-M1 automatically boots from internal SPI. To boot
-directly off the SD-card or eMMC you need to press the recovery button.
-
-The SPI flashed U-Boot SPL tries searches for an U-Boot binary on the SD-card
-(and from eMMC with Petitboot 20230328 and later). This mechanism allows you to
-boot the Home Assistant OS U-Boot without pressing the recovery button.
-
-## Console
-
-By default, console access is available on the serial header (CON1) and on HDMI.
-The serial console's baudrate is 1500000 by default.
-
-The systemd startup messages will only appear on the serial console by default.
-To show the messages on the HDMI console instead, add the console manually
-to the `cmdline.txt` file on the boot partition (e.g. `console=tty0`).
-
-[1]: http://ppa.linuxfactory.or.kr/images/petitboot/odroidm1/

Documentation/boards/hardkernel/odroid-m1s.md

@@ -1,58 +0,0 @@
-# ODROID-M1S
-
-Home Assistant OS 12 and newer support the ODROID-M1S board.
-
-## SD-card
-
-ODROID-M1S can boot HAOS directly from an SD card, as it has higher priority than the system on the eMMC. Simply flash the image to the SD card using your favorite tool and insert it to the micro SD slot on the board. This works even when the eMMC is wiped, or when it contains the factory-default U-Boot SPL loader, which is still able to load U-Boot provided in the HAOS image. In the second case, however, if the SD card fails to probe (e.g. due to a hardware failure), the system on the eMMC may be booted instead of HAOS.
-
-## eMMC
-
-HAOS can be installed directly to the eMMC using a special boot image, to do that:
-
-1. Download the _UMS Utility_ image: [`ODROID-M1S_EMMC2UMS.img`][1]. The _UMS Utility_ is a special image that switches ODROID-M1S to USB Mass Storage device.
-2. Use balenaEtcher or another tool to flash the _UMS utility_ onto an SD card.
-3. Plug-in that SD card to your ODROID-M1S and boot it. Connect your PC to the Micro USB OTG port.
-4. The eMMC will show as a drive on your PC and you can directly flash the HAOS image with balenaEther.
-
-Installing HAOS replaces the firmware and SPL on the eMMC with the mainline version provided by HAOS. As a result, it is not possible to use the SD card with the EMMC2UMS image anymore, because the mainline SPL is not compatible with U-Boot in the EMMC2UMS image at this time (February 2024). This does not pose any problem for standard use, just makes it more complicated in case you want to return to the Hardkernel-provided OS.
-
-A reliable way of reflashing the eMMC in this case is to use HAOS booted from an SD card. To do that, insert the SD card with HAOS to the micro SD slot and plug the board in. Once the device boots to the HA CLI, enter `login` to enter the root shell and use `curl` to download an image and `dd` it to the eMMC block device:
-
-```sh
-curl https://dn.odroid.com/RK3566/ODROID-M1S/Installer/ODROID-M1S_EMMC2UMS.img | dd of=/dev/mmcblk0
-```
-
-This way the device will start in the UMS mode on the next boot with the SD card removed. Alternatively you can use the [Hardkernel installer image][2] directly instead of the EMMC2UMS image.
-
-## NVMe
-
-Booting directly from NVMe is not supported. The NVMe card can be used as a data disk.
-
-## Technical notes on boot flow
-
-The Home Assistant OS image is bootable by the SoC directly. Refer to the [boot sequence documentation][3] for the details on what part of the boot is executed from the eMMC and what from the SD card. The steps documented above should however cover all scenarios that a standard user may encounter during usage.
-
-## Console
-
-By default, console access is available on the serial header (UART) and on HDMI.
-The serial console's baudrate is 1500000 by default.
-
-The systemd startup messages will only appear on the serial console by default.
-To show the messages on the HDMI console instead, add the console manually
-to the `cmdline.txt` file on the boot partition (e.g. `console=tty0`).
-
-## GPIO
-
-Odroid-M1S introduces a new 14pin expansion header. Refer to [the ODROID wiki][4].
-At this point not all functionality is supported by the upstream kernel used by Home Assistant OS.  
-Supported modules include:
-- UPS
-- Internal USB
-- Mini IO board (partial support)
-
-
-[1]: https://dn.odroid.com/RK3566/ODROID-M1S/Installer/ODROID-M1S_EMMC2UMS.img
-[2]: https://wiki.odroid.com/odroid-m1s/getting_started/os_installation_guide#user_installer
-[3]: https://wiki.odroid.com/odroid-m1s/board_support/boot_sequence
-[4]: https://wiki.odroid.com/odroid-m1s/hardware/expansion_connectors

Documentation/boards/hardkernel/odroid-n2.md

@@ -1,18 +0,0 @@
-# ODROID-N2
-
-## eMMC
-
-eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
-
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
-eg. `console=ttyAML0,115200n8 console=tty0`
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-n2/hardware/expansion_connectors).
-At this point not all functionality is supported by the upstream kernel used
-by Home Assistant OS.
-
-The GPIO on pin 11 is used as a low active power button input.

Documentation/boards/hardkernel/odroid-xu4.md

@@ -1,29 +0,0 @@
-# ODROID-XU4
-
-## eMMC
-
-The ODROID XU4 uses the eMMC boot partition to boot from. Typically eMMC readers can't write to this eMMC boot partition. There are a couple of possibilities:
-
-1. **Working** e.g. the eMMC already had a working image before flashing HassOS:
-   - It will be booting to U-Boot (but no further).
-     - If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
-     - If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
-   - Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
-   - Reboot with eMMC (don't forget to flip the boot switch to eMMC)
-2. **Not Working** e.g. a clean/wiped/corruped eMMC boot partition:
-   - You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
-   - Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..
-
-If you are getting permissions issues when using the dd command, try disabling RO:
-`echo 0 > /sys/block/mmcblk0boot0/force_ro`
-to re-enable after running dd:
-`echo 1 > /sys/block/mmcblk0boot0/force_ro`
-
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter.
-eg. `console=tty1 console=ttySAC2,115200`
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-xu4/hardware/expansion_connectors).

Documentation/boards/ova/README.md

@@ -1,22 +0,0 @@
-# Virtual Machine
-
-## Supported Hypervisors
-
-| Hypervisor          | Vendor    | Support         | Config             |
-|---------------------|-----------|-----------------|--------------------|
-| HyperV              | Microsoft | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
-| VirtualBox          | Oracle    | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
-| VMware              | VMware    | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
-
-Currently we only publish a VMDK virtual disk due to issues with our previous OVA distribution. We are investigating our options to bring back the OVA distribution, however, the VMDK works for the hypervisors listed above.
-
-## Requirements
-
-Using this VMDK in a virtual machine requires the following:
-
-- Operating system: Other 4.x or later Linux (64-bit)
-- Enabled support for UEFI boot
-- SATA disk controller
-- Minimal of 1GB RAM
-- At least 2x vCPU
-- An assigned network

Documentation/boards/raspberrypi/README.md

@@ -1,50 +0,0 @@
-# Raspberry PI
-
-## Supported Hardware
-
-| Device              | Release Date  | Support         | Config             |
-|---------------------|---------------|-----------------|--------------------|
-| Raspberry Pi 2 B    |2015           | not recommended | [rpi2](../../../buildroot-external/configs/rpi2_defconfig)             |
-| Raspberry Pi 3 B/B+ |2016/2018      | yes             | [rpi3](../../../buildroot-external/configs/rpi3_defconfig) / [rpi3_64](../../../buildroot-external/configs/rpi3_64_defconfig) |
-| Raspberry Pi 4 B    |2019           | yes             | [rpi4](../../../buildroot-external/configs/rpi4_defconfig) / [rpi4_64](../../../buildroot-external/configs/rpi4_64_defconfig) |
-| Raspberry Pi 5      |2023           | yes (beta)      | [rpi5_64](../../../buildroot-external/configs/rpi5_64_defconfig) |
-
-## Serial console
-
-For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
-
-## I2C
-
-Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
-
-rpi-i2c.conf:
-```
-i2c-dev
-i2c-bcm2708
-```
-
-## USB Boot
-
-USB mass storage boot is available on Raspberry Pi 4 (64-bit only), 3B, 3B+, 3A+, and 2B v1.2.
-
-For Raspberry 3B, 3A+ and 2B v1.2, to enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
-
-For Raspberry 4
-
-* Make sure to update the bootloader to a stable release supporting USB mass storage boot (see [bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot)). 
-* If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
-* If install still fails, then your SSD likely needs quirks enabled to work correctly (see [Finding the VID and PID of your USB SSD](https://www.raspberrypi.org/forums/viewtopic.php?t=245931)). Once you find your adapter's ID, add the quirks parameter in `cmdline.txt`. 
-
-For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
-
-### Caveats
-
-* All bootable SD cards must be removed.
-* Boot time can be significantly longer with USB. This is due to the boot process first attempting to boot from SD card, failing, and resorting to USB.
-* Many USB drives simply do not work for boot. This is likely due to minimal driver support in uboot and will not be fixed. If you can't get it to boot on one drive, try a different brand/model. SanDisk Cruzer drives seem to have a higher rate of issues.
-
-## Tweaks
-
-If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
-
-[config]: ../../configuration.md#automatic

Documentation/configuration.md

@@ -1,63 +0,0 @@
-# Configuration
-
-## Automatic
-
-You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
-Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG` (in all capitals). Alternative you can create a `CONFIG` folder inside the `boot` partition. Use the following directory structure within the USB drive:
-
-```text
-network/
-modules/
-modprobe/
-udev/
-authorized_keys
-timesyncd.conf
-hassos-xy.raucb
-```
-
-- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
-- The `modules` folder is for modules-load configuration files.
-- The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
-- The `udev` folder is for udev rules files.
-- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant].
-- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
-- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
-
-Text files that are on USB stick must have Unix (LF) end of line characters. If you create USB stick on Windows machine, be sure to use Notepad++, Visual Studio Code or any other editor, that supports different line endings. In Notepad++ LF EOL can be enabled with setting `Edit -> EOL Conversion -> Unix (LF)`.
-
-You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later using `ha os import` from the CLI or by calling `systemctl restart hassos-config` on the OS shell. *The USB Stick just needs to be inserted to the device during this setup process and can be removed afterwards.*
-
-## Local
-
-### Bootargs
-
-You can edit or create a `cmdline.txt` in your boot partition. That will be read from the bootloader.
-
-### Kernel-Module
-
-The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. You can add the modules configuration files in `/etc/modprobe.d` that is also persistent.
-
-### Udev rules
-
-The udev rules folder `/etc/udev/rules.d` is persistent and you can add your configuration files there.
-
-### Network
-
-You can manual add, edit or remove connections configurations from `/etc/NetworkManager/system-connections`.
-
-### NTP
-
-You can manual edit the systemd timesync file on `/etc/systemd/timesyncd.conf`.
-
-Our default NTP configuration look like:
-
-```
-[Time]
-NTP=time.cloudflare.com
-FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
-```
-
-[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
-[network.md]: network.md
-[hassos-release]: https://github.com/home-assistant/hassos/releases/
-[debug-homeassistant]: https://developers.home-assistant.io/docs/operating-system/debugging

Documentation/kernel.md

@@ -3,22 +3,22 @@
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.6.63 |
+| Open Virtual Appliance | 6.12.50 |
-| Raspberry Pi | 6.6.51 |
+| Raspberry Pi | 6.12.47 |
-| Raspberry Pi 0-W | 6.6.51 |
+| Raspberry Pi 0-W | 6.12.47 |
-| Raspberry Pi 2 | 6.6.51 |
+| Raspberry Pi 2 | 6.12.47 |
-| Raspberry Pi 3 | 6.6.51 |
+| Raspberry Pi 3 | 6.12.47 |
-| Raspberry Pi 4 | 6.6.51 |
+| Raspberry Pi 4 | 6.12.47 |
-| Raspberry Pi 5 | 6.6.51 |
+| Raspberry Pi 5 | 6.12.47 |
-| Home Assistant Yellow | 6.6.51 |
+| Home Assistant Yellow | 6.12.47 |
-| Home Assistant Green | 6.6.63 |
+| Home Assistant Green | 6.12.50 |
-| Tinker Board | 6.6.63 |
+| Tinker Board | 6.12.50 |
-| ODROID-C2 | 6.6.63 |
+| ODROID-C2 | 6.12.50 |
-| ODROID-C4 | 6.6.63 |
+| ODROID-C4 | 6.12.50 |
-| ODROID-M1 | 6.6.63 |
+| ODROID-M1 | 6.12.50 |
-| ODROID-M1S | 6.6.63 |
+| ODROID-M1S | 6.12.50 |
-| ODROID-N2 | 6.6.63 |
+| ODROID-N2 | 6.12.50 |
-| ODROID-XU4 | 6.6.63 |
+| ODROID-XU4 | 6.12.50 |
-| Generic aarch64 | 6.6.63 |
+| Generic aarch64 | 6.12.50 |
-| Generic x86-64 | 6.6.63 |
+| Generic x86-64 | 6.12.50 |
-| Khadas VIM3 | 6.6.63 |
+| Khadas VIM3 | 6.12.50 |

Documentation/network.md

@@ -1,193 +0,0 @@
-# Network
-
-Home Assistant Operating System uses NetworkManager to control the host network.
-
-## Configure network
-
-By default the device will be in DHCP state.
-
-Basic network settings can be set through the Supervisor frontend in the System
-tab. Advanced configurations such as VLAN are also available through the
-`ha network` CLI command.
-
-To restore the default configuration the `ha network` CLI command can be used as
-well:
-
-```
-ha network update default --ipv4-method auto
-```
-
-If more advanced network settings are required network connection files can be
-placed on a USB drive and imported to the host as described in
-[Configuration][configuration-usb].
-
-## Manual Network Configuration
-
-If the frontend or `ha network` CLI cannot meet your use case, it is still
-possible to configure the underlying NetworkManager manually.
-
-You can read the [NetworkManager manual][nm-manual] or find many configuration
-examples across the internet. Note that changes to `NetworkManager.conf` are
-not supported currently, only connection keyfiles are supported. Keep in mind
-that the system is read-only. If you don't want the IP address to change on
-every boot, you should modify the UUID property to a generic [UUID4][uuid].
-Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a
-file called `my-network` and add the appropriate contents below:
-
-**NOTE: Please make sure to save this file with UNIX line endings (LF, and not Windows' default CRLF endings). You can do this using Notepad these days!**
-
-### Default
-
-A preinstalled connection profile for wired network is active by default:
-
-```ini
-[connection]
-id=Home Assistant OS default
-uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
-type=802-3-ethernet
-llmnr=2
-mdns=2
-
-[ipv4]
-method=auto
-
-[ipv6]
-addr-gen-mode=stable-privacy
-method=auto
-```
-
-### Wired connection to the LAN
-
-```ini
-[connection]
-id=my-network
-uuid=d55162b4-6152-4310-9312-8f4c54d86afa
-type=802-3-ethernet
-llmnr=2
-mdns=2
-
-[ipv4]
-method=auto
-
-[ipv6]
-addr-gen-mode=stable-privacy
-method=auto
-```
-
-### Wireless LAN WPA/PSK
-
-```ini
-[connection]
-id=my-network
-uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
-type=802-11-wireless
-
-[802-11-wireless]
-mode=infrastructure
-ssid=MY_SSID
-# Uncomment below if your SSID is not broadcasted
-#hidden=true
-
-[802-11-wireless-security]
-auth-alg=open
-key-mgmt=wpa-psk
-psk=MY_WLAN_SECRET_KEY
-
-[ipv4]
-method=auto
-
-[ipv6]
-addr-gen-mode=stable-privacy
-method=auto
-```
-
-### Static IP
-
-Replace the following configuration:
-
-```ini
-[ipv4]
-method=manual
-address=192.168.1.111/24;192.168.1.1
-dns=8.8.8.8;8.8.4.4;
-```
-
-For `address`, the value before the semicolon is the IP address and subnet prefix bitlength. The second value (after the semicolon) is the IP address of the local gateway.
-
-## Tips
-
-### Reset network
-
-If you want to reset the network configuration back to the default connection
-profile using DHCP, use the following commands on the host console:
-
-```bash
-# rm -r /mnt/overlay/etc/NetworkManager/system-connections
-# reboot
-```
-
-Home Assistant OS will recreate the default connection profile during boot.
-
-### Enabling Wi-Fi
-
-Wi-Fi is discouraged for reliability reasons. However, if you still prefer to use Wi-Fi, you can us the `ha network` command to set up Wi-Fi (example for a Raspberry Pi 4, check `ha network info` to check if your board supports Wi-Fi and the name of the Wi-Fi device):
-
-```bash
-ha network update wlan0 --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid "MY-SSID" --wifi-psk MY_PASS
-````
-
-### Powersave
-
-If you have trouble with powersave then apply the following changes:
-
-```ini
-[wifi]
-# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
-powersave=0
-```
-
-## Using `nmcli` to set a static IPv4 address
-
-Log into the the Home Assistant OS base system via a console:
-
-```bash
-Welcome to Home Assistant
-homeassistant login:
-```
-
-- Login as `root` (no password needed). At the `ha >` prompt, type `login` (as instructed).
-
-From there you use the `nmcli` configuration tool.
-
-- `# nmcli con show` will list the "Home Assistant OS default" connection in use.
-- `# nmcli con show "Home Assistant OS default"` will list all the properties of the connection.
-
-To start editing the configuration setting for "Home Assistant OS default":
-
-```bash
-# nmcli con edit "Home Assistant OS default"
-```
-
-To add your static IP address (select 'yes' for manual method);
-
-```bash
-nmcli> set ipv4.addresses 192.168.100.10/24
-Do you also want to set 'ipv4.method' to 'manual'? [yes]:
-```
-
-In addition, it's recommended to set the DNS server and the local gateway. For most home routers the DNS server will have the same IP address as the router itself. If you are using Pi-Hole or a third-party DNS system then you can set the DNS server to that.
-
-```bash
-nmcli> set ipv4.dns 192.168.100.1
-nmcli> set ipv4.gateway 192.168.100.1
-```
-
-`nmcli> print ipv4` will show you the IPv4 properties of this connection. With `nmcli> save` you will save the changes afterwards.
-
-If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
-
-Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.
-
-[nm-manual]: https://networkmanager.dev/docs/api/1.40/manpages.html
-[configuration-usb]: configuration.md
-[uuid]: https://www.uuidgenerator.net/version4

Makefile

@@ -14,37 +14,54 @@ else
 override O := $(BUILDDIR)/$(O)
 endif
 
-.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all
+################################################################################
 
-.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
+SILENT := $(findstring s,$(word 1, $(MAKEFLAGS)))
 
-all: $(TARGETS)
+define print
+	$(if $(SILENT),,$(info $1))
+endef
 
-savedefconfig:
+COLOR_STEP := $(shell tput smso 2>/dev/null)
-	@echo "config $*"
+COLOR_WARN := $(shell (tput setab 3; tput setaf 0) 2>/dev/null)
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "savedefconfig"
+TERM_RESET := $(shell tput sgr0 2>/dev/null)
+
+################################################################################
+
+.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) default
+
+.PHONY: $(TARGETS) $(TARGETS_CONFIG) default buildroot-help help
+
+# fallback target when target undefined here is given
+.DEFAULT:
+	$(call print,$(COLOR_STEP)=== Falling back to Buildroot target '$@' ===$(TERM_RESET))
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$@"
+
+# default target when no target is given - must be first in Makefile
+default:
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
 
 $(TARGETS_CONFIG): %-config:
-	@echo "config $*"
+	@if [ -f $(O)/.config ] && ! grep -q 'BR2_DEFCONFIG="$(DEFCONFIG_DIR)/$*_defconfig"' $(O)/.config; then \
+		echo "$(COLOR_WARN)WARNING: Output directory '$(O)' already contains files for another target!$(TERM_RESET)"; \
+		echo "         Before running build for a different target, run 'make distclean' first."; \
+		echo ""; \
+		bash -c 'read -t 10 -p "Waiting 10s, press enter to continue or Ctrl-C to abort..."' || true; \
+	fi
+	$(call print,$(COLOR_STEP)=== Using $*_defconfig ===$(TERM_RESET))
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
 
 $(TARGETS): %: %-config
-	@echo "build $@"
+	$(call print,$(COLOR_STEP)=== Building $@ ===$(TERM_RESET))
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
 
-	# Do not clean when building for one target
+buildroot-help:
-ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) help
-	@echo "clean $@"
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean
-endif
-	@echo "finished $@"
-
-clean:
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean
 
 help:
-	@echo "Supported targets: $(TARGETS)"
 	@echo "Run 'make <target>' to build a target image."
-	@echo "Run 'make all' to build all target images."
-	@echo "Run 'make clean' to clean the build output."
 	@echo "Run 'make <target>-config' to configure buildroot for a target."
+	@echo ""
+	@echo "Supported targets: $(TARGETS)"
+	@echo ""
+	@echo "Unknown Makefile targets fall back to Buildroot make - for details run 'make buildroot-help'"

README.md

@@ -16,14 +16,10 @@ Home Assistant Operating System uses Docker as its container engine. By default
 
 ## Supported hardware
 
-- Nabu Casa
+The list of supported hardware is defined by [ADR-0015](https://github.com/home-assistant/architecture/blob/master/adr/0015-home-assistant-os.md).
-- Raspberry Pi
+Every new hardware addition must meet at least requirements defined in [ADR-0017](https://github.com/home-assistant/architecture/blob/master/adr/0017-hardware-screening-os.md) and pass through an architecture design proposal.
-- Hardkernel ODROID
-- Asus Tinker Board
-- Generic x86-64 (e.g. Intel NUC)
-- Virtual appliances
 
-See the full list and specific models [here](./Documentation/boards/README.md)
+For documentation explaining details of the individual supported boards, see [Board support](https://developers.home-assistant.io/docs/operating-system/boards/overview) section of the Home Assistant Developer Docs.
 
 ## Getting Started
 

buildroot-external/Config.in

@@ -3,6 +3,7 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/gasket/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo8-firmware/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo-pci/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"
@@ -16,4 +17,5 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/vcgencmd/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"

buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh

@@ -20,9 +20,11 @@ function hassos_pre_image() {
 
 function hassos_post_image() {
     convert_disk_image_virtual vmdk
+    convert_disk_image_virtual vdi
     convert_disk_image_virtual qcow2
 
     convert_disk_image_zip vmdk
+    convert_disk_image_zip vdi
     convert_disk_image_xz qcow2
 
     convert_disk_image_xz

buildroot-external/board/arm-uefi/generic-aarch64/kernel.config

@@ -57,3 +57,28 @@ CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y
 
 CONFIG_I6300ESB_WDT=y
+
+# GPIO support
+CONFIG_GPIO_ZYNQ=y
+CONFIG_GPIO_PCA9570=y
+
+# PHY drivers
+CONFIG_PHY_XILINX_ZYNQMP=y
+
+# USB support
+CONFIG_USB_ONBOARD_DEV=y
+CONFIG_USB_ONBOARD_DEV_USB5744=y
+
+# i2c support
+CONFIG_I2C_CADENCE=y
+
+# 1-wire
+CONFIG_W1_MASTER_AMD_AXI=m
+CONFIG_W1_SLAVE_THERM=m
+
+# IIO
+CONFIG_XILINX_AMS=m
+
+# Audio drivers
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_GENERIC=m

buildroot-external/board/asus/tinker/kernel.config

@@ -71,7 +71,6 @@ CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
 CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
 CONFIG_ZBUD=y
-CONFIG_Z3FOLD=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KSM=y
 CONFIG_CMA=y
@@ -217,7 +216,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_BPF=m
@@ -394,9 +392,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
 CONFIG_6LOWPAN=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=m
@@ -452,7 +447,6 @@ CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
@@ -649,9 +643,6 @@ CONFIG_ATH10K_USB=m
 CONFIG_WCN36XX=m
 CONFIG_AT76C50X_USB=m
 CONFIG_BRCMFMAC=m
-CONFIG_HOSTAP=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 # CONFIG_WLAN_VENDOR_MARVELL is not set
 CONFIG_MT7601U=m
 # CONFIG_WLAN_VENDOR_MICROCHIP is not set
@@ -669,9 +660,7 @@ CONFIG_RTL8192CU=m
 CONFIG_RTL8XXXU=m
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
-CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_NET_FAILOVER=m
 CONFIG_INPUT_MATRIXKMAP=y
 CONFIG_INPUT_JOYDEV=y
@@ -1497,7 +1486,6 @@ CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
 CONFIG_FSCACHE=y
 CONFIG_FSCACHE_STATS=y
-CONFIG_CACHEFILES=y
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
@@ -1505,7 +1493,6 @@ CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ECRYPT_FS=m
@@ -1529,7 +1516,6 @@ CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
@@ -1573,7 +1559,6 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_LRW=m

buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch

@@ -1,4 +1,4 @@
-From b4d676729c5bee4b9adb85362f6f2e32f833b6c2 Mon Sep 17 00:00:00 2001
+From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 17 Feb 2021 19:55:41 +0100
 Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
@@ -10,10 +10,10 @@ This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
  1 file changed, 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index cb9cdaddffd4..51f1273d6beb 100644
+index 3f1d640afafae..becf3abd8367f 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -378,8 +378,6 @@ uart0: serial@ff180000 {
+@@ -387,8 +387,6 @@ uart0: serial@ff180000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
  		clock-names = "baudclk", "apb_pclk";
@@ -22,7 +22,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart0_xfer>;
  		status = "disabled";
-@@ -393,8 +391,6 @@ uart1: serial@ff190000 {
+@@ -402,8 +400,6 @@ uart1: serial@ff190000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
  		clock-names = "baudclk", "apb_pclk";
@@ -31,7 +31,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart1_xfer>;
  		status = "disabled";
-@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 {
+@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
  		clock-names = "baudclk", "apb_pclk";
@@ -40,7 +40,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart3_xfer>;
  		status = "disabled";
-@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 {
+@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
  		clock-names = "baudclk", "apb_pclk";

buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch

@@ -1,4 +1,4 @@
-From 02c7d9bb23f497993d52f5a41341ed955e6a2745 Mon Sep 17 00:00:00 2001
+From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:15:14 +0100
 Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
@@ -18,7 +18,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 19 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 09618bb7d872..30430d2e64b9 100644
+index 09618bb7d872c..30430d2e64b93 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -483,6 +483,25 @@ &sdio0 {

buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch

@@ -1,4 +1,4 @@
-From bf7869033cf3caa50912cbdfa548428a6571c104 Mon Sep 17 00:00:00 2001
+From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 4 Sep 2020 21:57:55 +0200
 Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
@@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 30430d2e64b9..395afc2b2283 100644
+index 30430d2e64b93..395afc2b2283c 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -342,10 +342,18 @@ regulator-state-mem {

buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch

@@ -1,4 +1,4 @@
-From a0ef6a86e96920a9cf703d8c65d0126494037d37 Mon Sep 17 00:00:00 2001
+From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Thu, 19 Oct 2017 21:24:47 +0200
 Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
@@ -14,10 +14,10 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index 51f1273d6beb..d8663928bfe2 100644
+index becf3abd8367f..e78fa883b9841 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -311,7 +311,7 @@ spi2: spi@ff130000 {
+@@ -320,7 +320,7 @@ spi2: spi@ff130000 {
  		dma-names = "tx", "rx";
  		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
  		pinctrl-names = "default";

buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch

@@ -1,4 +1,4 @@
-From e828e0fc2be98e5ad20c93981681505fc97b063b Mon Sep 17 00:00:00 2001
+From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 20:16:05 +0100
 Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
@@ -11,7 +11,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 395afc2b2283..c7e79e594720 100644
+index 395afc2b2283c..c7e79e5947206 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 {

buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch

@@ -1,4 +1,4 @@
-From ad1ffd6be5f54a0871e3c303602548687dfe0ffc Mon Sep 17 00:00:00 2001
+From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Sun, 7 Jan 2018 01:52:44 +0100
 Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
@@ -21,7 +21,7 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
  1 file changed, 66 insertions(+)
 
 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
-index b07190ba4b7a..0badaa1b404e 100644
+index f96260fd143b4..fa779ce8fb661 100644
 --- a/drivers/mmc/host/dw_mmc-rockchip.c
 +++ b/drivers/mmc/host/dw_mmc-rockchip.c
 @@ -12,6 +12,11 @@
@@ -36,7 +36,7 @@ index b07190ba4b7a..0badaa1b404e 100644
  #include "dw_mmc.h"
  #include "dw_mmc-pltfm.h"
  
-@@ -340,6 +345,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
+@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
  };
  MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
  
@@ -103,7 +103,7 @@ index b07190ba4b7a..0badaa1b404e 100644
  static int dw_mci_rockchip_probe(struct platform_device *pdev)
  {
  	const struct dw_mci_drv_data *drv_data;
-@@ -367,6 +432,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
+@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
  	}
  
  	pm_runtime_put_autosuspend(&pdev->dev);

buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch

@@ -1,4 +1,4 @@
-From 4e6c3d013c847f199664a3075934f5ca52d8cba4 Mon Sep 17 00:00:00 2001
+From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 10 May 2022 22:57:26 +0200
 Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 26 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index c7e79e594720..5d261fae6e72 100644
+index c7e79e5947206..5d261fae6e72a 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -386,6 +386,20 @@ bl_en: bl-en {

buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch

@@ -1,4 +1,4 @@
-From f597ec583c262ed4c3264ddf661e22b503fb8a11 Mon Sep 17 00:00:00 2001
+From eb29ab60a69353f355b3af58b06fff1a89d17992 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Wed, 10 Jan 2024 16:29:59 +0100
 Subject: [PATCH] usb-audio: add ASUS TinkerBoard's ALC4040
@@ -12,10 +12,10 @@ Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
  1 file changed, 8 insertions(+)
 
 diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 1b2edc0fd2e9..3069ac5b6759 100644
+index 9c411b82a218d..672136e25c81d 100644
 --- a/sound/usb/card.c
 +++ b/sound/usb/card.c
-@@ -521,6 +521,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
+@@ -533,6 +533,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
  	}
  
  	strim(card->shortname);

buildroot-external/board/asus/tinker/patches/uboot/0001-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch

@@ -1,31 +1,30 @@
-From defc964eaa9f4ccc9cd1568ade4e4d81f35b9e07 Mon Sep 17 00:00:00 2001
+From 78bd1a46cfc585773719963ce8e0a380e9676a93 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
 Subject: [PATCH] pmic: enable LDO2 vcc33_mipi at bootup
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- board/rockchip/tinker_rk3288/tinker-rk3288.c | 37 ++++++++++++++++++++
+ board/rockchip/tinker_rk3288/tinker-rk3288.c | 36 ++++++++++++++++++++
- 1 file changed, 37 insertions(+)
+ 1 file changed, 36 insertions(+)
 
 diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-index f85209c649..6fa1bb0c66 100644
+index e966e9f201a..2944d8c084f 100644
 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
 +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-@@ -13,6 +13,7 @@
+@@ -9,6 +9,7 @@
+ #include <init.h>
+ #include <net.h>
  #include <netdev.h>
- #include <asm/arch-rockchip/bootrom.h>
- #include <asm/io.h>
 +#include <power/regulator.h>
  
  static int get_ethaddr_from_eeprom(u8 *addr)
  {
-@@ -48,3 +49,39 @@ int mmc_get_env_dev(void)
+@@ -34,3 +35,38 @@ int rk3288_board_late_init(void)
  
- 	return 1;
+ 	return 0;
  }
 +
-+
 +#ifdef CONFIG_DM_PMIC
 +static int rockchip_set_regulator_on(const char *name, uint uv)
 +{
@@ -60,6 +59,3 @@ index f85209c649..6fa1bb0c66 100644
 +	return 0;
 +}
 +#endif
--- 
-2.43.0
-

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

@@ -228,7 +228,6 @@ CONFIG_PCIE_KIRIN=y
 # CONFIG_PCI_MESON is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_EFI_CAPSULE_LOADER=y
@@ -286,8 +285,6 @@ CONFIG_HNS3=y
 CONFIG_HNS3_HCLGE=y
 CONFIG_HNS3_ENET=y
 CONFIG_E1000E=y
-CONFIG_IGB=y
-CONFIG_IGBVF=y
 CONFIG_MVMDIO=y
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
@@ -381,7 +378,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MESON=y
 CONFIG_I2C_RK3X=y
@@ -409,7 +405,6 @@ CONFIG_W1=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_GPIO=m
-CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -541,7 +536,6 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
-CONFIG_DRM_LEGACY=y
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_EFI=y
@@ -684,7 +678,6 @@ CONFIG_ARM_SMMU_V3=y
 CONFIG_REMOTEPROC=y
 CONFIG_RPMSG_QCOM_GLINK_RPM=y
 CONFIG_MESON_CANVAS=y
-CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y

buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-odroid-m1-Disable-eMMC-DDR52-mode-enable-HS200.patch

@@ -1,46 +0,0 @@
-From 023bc5bd23d3239494bca81d807d3c093f78c131 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Thu, 8 Aug 2024 17:52:47 +0200
-Subject: [PATCH] odroid-m1: Disable eMMC DDR52 mode, enable HS200
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Disable DDR52 mode on odroid-m1 to fix eMMC writes. Also enable HS200,
-as it's supposed to work more reliably than slower modes.
-
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
-Upstream: https://patchwork.ozlabs.org/project/uboot/cover/20240204205312.2342868-1-jonas@kwiboo.se/
----
- arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 3 ---
- configs/odroid-m1-rk3568_defconfig        | 2 ++
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
-index 0fc360b06d..f9d34d3b77 100644
---- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
-+++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
-@@ -14,10 +14,7 @@
- 
- &sdhci {
- 	cap-mmc-highspeed;
--	mmc-ddr-1_8v;
- 	mmc-hs200-1_8v;
--	mmc-hs400-1_8v;
--	mmc-hs400-enhanced-strobe;
- 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
- };
- 
-diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig
-index 96b4e9ecda..517ac0575d 100644
---- a/configs/odroid-m1-rk3568_defconfig
-+++ b/configs/odroid-m1-rk3568_defconfig
-@@ -72,6 +72,8 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MISC=y
- CONFIG_SUPPORT_EMMC_RPMB=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_SPL_MMC_HS200_SUPPORT=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y

buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush

@@ -1,15 +1,15 @@
-part start mmc ${devnum} hassos-bootstate mmc_env
+part start ${devtype} ${devnum} hassos-bootstate mmc_env
-mmc dev ${devnum}
+${devtype} dev ${devnum}
 
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
+    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x40; \
     env import -c ${ramdisk_addr_r} 0x8000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"
+    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x40;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -26,34 +26,34 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${M
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
 setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
-part number mmc ${devnum} hassos-boot boot_partnum
+part number ${devtype} ${devnum} hassos-boot boot_partnum
 
 # Load environment from haos-config.txt
-if test -e mmc ${devnum}:${boot_partnum} haos-config.txt; then
+if test -e ${devtype} ${devnum}:${boot_partnum} haos-config.txt; then
-  fatload mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
+  fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
   env import -t ${ramdisk_addr_r} ${filesize}
 fi
 
 # Load extraargs
-fileenv mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
+fileenv ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
 setenv fdtfile rk3568-odroid-m1.dtb
 echo "Loading standard device tree ${fdtfile}"
-fatload mmc ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
+fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
 fdt addr ${fdt_addr_r}
 
 # load dt overlays
 fdt resize 65536
 for overlay_file in ${overlays}; do
-  if fatload mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
+  if fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
     echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
     fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
   fi
 done
 if test "${overlay_error}" = "true"; then
   echo "Error applying DT overlays, restoring original DT"
-  fatload mmc ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
+  fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
 fi
 
 setenv bootargs
@@ -64,8 +64,8 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      part number mmc ${devnum} hassos-kernel0 kernel_partnum
+      part number ${devtype} ${devnum} hassos-kernel0 kernel_partnum
-      if load mmc ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
       fi
     fi
@@ -73,8 +73,8 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      part number mmc ${devnum} hassos-kernel1 kernel_partnum
+      part number ${devtype} ${devnum} hassos-kernel1 kernel_partnum
-      if load mmc ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
       fi
     fi

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Enable-Rockchip-TRNG-on-ODROID-M1.patch

@@ -0,0 +1,32 @@
+From 60b24f8c30181ef60964ce186c2a6d05b85f3be1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Fri, 31 Jan 2025 16:13:48 +0100
+Subject: [PATCH] arm64: dts: rockchip: Enable Rockchip TRNG on ODROID-M1S
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+HAOS with 6.6 kernel had the RNG disbled because of a downstream patch. Now the
+rk356x.dtsi has it's enabled only in rk3568.dtsi. We want it enabled also for
+RK3566 on ODROID-M1S.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+index 33bc5249d729b..a0d912b5ce4aa 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+@@ -551,6 +551,10 @@ &pmu_io_domains {
+ 	status = "okay";
+ };
+ 
++&rng {
++	status = "okay";
++};
++
+ &saradc {
+ 	vref-supply = <&vcca_1v8>;
+ 	status = "okay";

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Import-Hardkernel-ODROID-M1S-boar.patch

@@ -1,896 +0,0 @@
-From 83dadbe0a615f6fc7550dec98dee938647050990 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sun, 28 Jan 2024 18:52:26 +1100
-Subject: [PATCH] arm64: dts: rockchip: Import Hardkernel ODROID-M1S board
-
-Odroid-m1s is in the process of being upstreamed.
-For now sync dts for Odroid-m1s:
-https://github.com/tobetter/linux/blob/ae33b445578884c70d7bfc5d6d519de4db815ccd/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
----
- arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3566-odroid-m1s.dts   | 861 ++++++++++++++++++
- 2 files changed, 862 insertions(+)
- create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 8c15593c0ca4..362359684ed0 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353p.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-new file mode 100644
-index 000000000000..1cad9217c374
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -0,0 +1,861 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2023 Hardkernel Co., Ltd.
-+ *
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/leds/common.h>
-+#include <dt-bindings/pinctrl/rockchip.h>
-+#include <dt-bindings/soc/rockchip,vop2.h>
-+
-+#include "rk3566.dtsi"
-+
-+/ {
-+	model = "Hardkernel ODROID-M1S";
-+	compatible = "rockchip,rk3566-odroid-m1", "rockchip,rk3566";
-+
-+	aliases {
-+		ethernet1 = &gmac1;
-+		i2c0 = &i2c3;
-+		i2c3 = &i2c0;
-+		mmc0 = &sdhci;
-+		mmc1 = &sdmmc0;
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+	};
-+
-+	chosen: chosen {
-+		stdout-path = "serial2:1500000n8";
-+	};
-+
-+	hdmi-con {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	gmac1_clkin: external-gmac1-clock {
-+		compatible = "fixed-clock";
-+		clock-frequency = <125000000>;
-+		clock-output-names = "gmac1_clkin";
-+		#clock-cells = <0>;
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		status = "okay";
-+
-+		red_led: red {
-+			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "default-on";
-+			function = LED_FUNCTION_POWER;
-+			color = <LED_COLOR_ID_RED>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&led_power_en>;
-+		};
-+		blue_led: blue {
-+			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
-+			function = LED_FUNCTION_HEARTBEAT;
-+			color = <LED_COLOR_ID_BLUE>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&led_work_en>;
-+		};
-+	};
-+
-+	pcie20_3v3: pcie20-3v3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pcie20_3v3_en>;
-+		regulator-name = "pcie20_3v3";
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	rk809-sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "ODROID-M1-FRONT";
-+		simple-audio-card,mclk-fs = <256>;
-+		status = "okay";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s1_8ch>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&rk809>;
-+		};
-+	};
-+
-+	vcc3v3_sys: vcc3v3-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v_dcin: vcc5v-dcin {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-5v";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+	};
-+
-+	vcc5v0_sys: vcc5v0-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v_dcin>;
-+	};
-+
-+	vcc5v0_host: vcc5v0-host-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_host_en>;
-+		regulator-name = "vcc5v0_host";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_usb_otg: vcc5v0-otg-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_otg_en>;
-+		regulator-name = "vcc5v0_usb_otg";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_usb_host: vcc5v0-usb3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_host_en>;
-+		regulator-name = "vcc5v0_usb_host";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&combphy1 {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&combphy2 {
-+	status = "okay";
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu1 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu2 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu3 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&display_subsystem {
-+    status = "okay";
-+};
-+
-+&gmac1 {
-+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
-+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
-+	clock_in_out = "input";
-+	phy-supply = <&vcc_3v3>;
-+	phy-mode = "rgmii";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&gmac1m1_miim
-+		     &gmac1m1_tx_bus2
-+		     &gmac1m1_rx_bus2
-+		     &gmac1m1_rgmii_clk
-+		     &gmac1m1_rgmii_bus
-+		     &gmac1m1_clkinout>;
-+	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-+	snps,reset-active-low;
-+	/* Reset time is 20ms, 100ms for rtl8211f */
-+	snps,reset-delays-us = <0 20000 100000>;
-+	tx_delay = <0x4f>;
-+	rx_delay = <0x2d>;
-+	phy-handle = <&rgmii_phy1>;
-+	status = "okay";
-+};
-+
-+&gpio0 {
-+	gpio-line-names =
-+		/* GPIO0_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO0_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO0_B0-B3 */
-+		"", "", "", "PIN_28",
-+		/* GPIO0_B4-B7 */
-+		"PIN_27", "PIN_33", "PIN_7", "",
-+
-+		/* GPIO0_C0-C3 */
-+		"PIN_11", "PIN_13", "PIN_15", "",
-+		/* GPIO0_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO0_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO0_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio1 {
-+	gpio-line-names =
-+		/* GPIO1_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO1_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_B0-B3 */
-+		"", "", "", "",
-+		/* GPIO1_B4-B7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_C0-C3 */
-+		"", "", "", "",
-+		/* GPIO1_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO1_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio2 {
-+	gpio-line-names =
-+		/* GPIO2_A0-A3 */
-+		"", "", "", "PIN_10",
-+		/* GPIO2_A4-A7 */
-+		"PIN_8", "PINN_35", "PIN_36", "PIN_12",
-+
-+		/* GPIO2_B0-B3 */
-+		"PIN_22", "PIN_26", "PIN_32", "",
-+		/* GPIO2_B4-B7 */
-+		"", "PIN_16", "PIN_18", "PIN_31",
-+
-+		/* GPIO2_C0-C3 */
-+		"PIN_29", "", "", "",
-+		/* GPIO2_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO2_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO2_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio3 {
-+	gpio-line-names =
-+		/* GPIO3_A0-A3 */
-+		"", "PIN_24", "", "",
-+		/* GPIO3_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO3_B0-B3 */
-+		"", "", "", "EXTPIN_13",
-+		/* GPIO3_B4-B7 */
-+		"EXTPIN_14", "PIN_5", "PIN_3", "",
-+
-+		/* GPIO3_C0-C3 */
-+		"", "PIN_19", "PIN_21", "PIN_23",
-+		/* GPIO3_C4-C7 */
-+		"EXTPIN_11", "EXTPIN_12", "", "",
-+
-+		/* GPIO3_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO3_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio4 {
-+	gpio-line-names =
-+		/* GPIO4_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO4_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_B0-B3 */
-+		"", "", "", "",
-+		/* GPIO4_B4-B7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_C0-C3 */
-+		"", "", "", "",
-+		/* GPIO4_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO4_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	avdd-0v9-supply = <&vdda0v9_image>;
-+	avdd-1v8-supply = <&vcca1v8_image>;
-+	status = "okay";
-+};
-+
-+&hdmi_in {
-+	hdmi_in_vp0: endpoint {
-+		remote-endpoint = <&vp0_out_hdmi>;
-+	};
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&hdmi_sound {
-+	simple-audio-card,name = "ODROID-M1-HDMI";
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+	vdd_cpu: tcs4525@1c {
-+		compatible = "tcs,tcs452x";
-+		reg = <0x1c>;
-+		vin-supply = <&vcc5v0_sys>;
-+		regulator-compatible = "fan53555-reg";
-+		regulator-name = "vdd_cpu";
-+		regulator-min-microvolt = <712500>;
-+		regulator-max-microvolt = <1390000>;
-+		regulator-init-microvolt = <900000>;
-+		regulator-ramp-delay = <2300>;
-+		fcs,suspend-voltage-selector = <1>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+
-+	rk809: pmic@20 {
-+		compatible = "rockchip,rk809";
-+		reg = <0x20>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
-+		assigned-clocks = <&cru I2S1_MCLKOUT_TX>;
-+		assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
-+		#clock-cells = <1>;
-+		clock-names = "mclk";
-+		clocks = <&cru I2S1_MCLKOUT_TX>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-+		rockchip,system-power-controller;
-+		#sound-dai-cells = <0>;
-+		vcc1-supply = <&vcc3v3_sys>;
-+		vcc2-supply = <&vcc3v3_sys>;
-+		vcc3-supply = <&vcc3v3_sys>;
-+		vcc4-supply = <&vcc3v3_sys>;
-+		vcc5-supply = <&vcc3v3_sys>;
-+		vcc6-supply = <&vcc3v3_sys>;
-+		vcc7-supply = <&vcc3v3_sys>;
-+		vcc8-supply = <&vcc3v3_sys>;
-+		vcc9-supply = <&vcc3v3_sys>;
-+		wakeup-source;
-+
-+		regulators {
-+			vdd_logic: DCDC_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_logic";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_gpu: DCDC_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_gpu";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_ddr: DCDC_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vcc_ddr";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vdd_npu: DCDC_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_npu";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_image: LDO_REG1 {
-+				regulator-boot-on;
-+				regulator-always-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda0v9_image";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda_0v9: LDO_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda_0v9";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_pmu: LDO_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda0v9_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <900000>;
-+				};
-+			};
-+
-+			vccio_acodec: LDO_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3000000>;
-+				regulator-max-microvolt = <3000000>;
-+				regulator-name = "vccio_acodec";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vccio_sd: LDO_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vccio_sd";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_pmu: LDO_REG6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc3v3_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vcca_1v8: LDO_REG7 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca_1v8";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcca1v8_ddr: LDO_REG8 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca1v8_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcca1v8_image: LDO_REG9 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca1v8_image";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_1v8: DCDC_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_1v8";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_3v3: SWITCH_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_3v3";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_sd: SWITCH_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc3v3_sd";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&i2c2 {
-+	status = "disabled";
-+
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c2m1_xfer>;
-+
-+	clock-frequency = <400000>;
-+};
-+
-+&i2c3 {
-+	status = "disabled";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c3m1_xfer>;
-+};
-+
-+&i2s0_8ch {
-+	status = "okay";
-+};
-+
-+&i2s1_8ch {
-+	status = "okay";
-+	rockchip,clk-trcm = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s1m0_sclktx
-+		     &i2s1m0_lrcktx
-+		     &i2s1m0_sdi0
-+		     &i2s1m0_sdo0>;
-+};
-+
-+&mdio1 {
-+	rgmii_phy1: phy@0 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x0>;
-+	};
-+};
-+
-+&pcie2x1 {
-+	reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&pcie20_3v3>;
-+	pinctrl-0 = <&pcie20m2_pins>;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	gmac1 {
-+		gmac1m1_miim: gmac1m1-miim {
-+			rockchip,pins =
-+				/* gmac1_mdcm1 */
-+				<4 RK_PB6 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_mdiom1 */
-+				<4 RK_PB7 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_clkinout: gmac1m1-clkinout {
-+			rockchip,pins =
-+				/* gmac1_mclkinoutm1 */
-+				<4 RK_PC1 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rx_bus2: gmac1m1-rx-bus2 {
-+			rockchip,pins =
-+				/* gmac1_rxd0m1 */
-+				<4 RK_PA7 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxd1m1 */
-+				<4 RK_PB0 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxdvcrsm1 */
-+				<4 RK_PB1 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_tx_bus2: gmac1m1-tx-bus2 {
-+			rockchip,pins =
-+				/* gmac1_txd0m1 */
-+				<4 RK_PA4 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd1m1 */
-+				<4 RK_PA5 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txenm1 */
-+				<4 RK_PA6 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rgmii_clk: gmac1m1-rgmii-clk {
-+			rockchip,pins =
-+				/* gmac1_rxclkm1 */
-+				<4 RK_PA3 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txclkm1 */
-+				<4 RK_PA0 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rgmii_bus: gmac1m1-rgmii-bus {
-+			rockchip,pins =
-+				/* gmac1_rxd2m1 */
-+				<4 RK_PA1 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxd3m1 */
-+				<4 RK_PA2 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd2m1 */
-+				<3 RK_PD6 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd3m1 */
-+				<3 RK_PD7 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+	};
-+
-+	leds {
-+		led_power_en: led_power_en {
-+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+		led_work_en: led_work_en {
-+			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pcie {
-+		pcie20_3v3_en: pcie20-3v3-en {
-+			rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pmic {
-+		pmic_int: pmic_int {
-+			rockchip,pins =
-+				<0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	usb {
-+		vcc5v0_host_en: vcc5v0-host-en {
-+			rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		vcc5v0_usb_otg_en: vcc5v0-otg-en {
-+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		vcc5v0_usb_host_en: vcc5v0-usb3-en {
-+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&pmu_io_domains {
-+	pmuio1-supply = <&vcc3v3_pmu>;
-+	pmuio2-supply = <&vcc3v3_pmu>;
-+	vccio1-supply = <&vccio_acodec>;
-+	vccio2-supply = <&vcc_1v8>;
-+	vccio3-supply = <&vccio_sd>;
-+	vccio4-supply = <&vcc_3v3>;
-+	vccio5-supply = <&vcc_3v3>;
-+	vccio6-supply = <&vcc_3v3>;
-+	vccio7-supply = <&vcc_3v3>;
-+	status = "okay";
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+	pinctrl-0 = <&pwm1m1_pins>;
-+};
-+
-+&saradc {
-+	vref-supply = <&vcca_1v8>;
-+	status = "okay";
-+};
-+
-+&sdhci {
-+	bus-width = <8>;
-+	max-frequency = <200000000>;
-+	non-removable;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe &emmc_rstnout>;
-+	vmmc-supply = <&vcc_3v3>;
-+	vqmmc-supply = <&vcc_1v8>;
-+	status = "okay";
-+};
-+
-+&sdmmc0 {
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-+	disable-wp;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
-+	sd-uhs-sdr104;
-+	vmmc-supply = <&vcc3v3_sys>;
-+	vqmmc-supply = <&vccio_sd>;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	dma-names = "tx", "rx";
-+	/* uart1 uart1-with-ctsrts */
-+	pinctrl-0 = <&uart1m1_xfer>;
-+	pinctrl-1 = <&uart1m1_xfer &uart1m1_ctsn &uart1m1_rtsn>;
-+	status = "disabled";
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host0_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host0_xhci {
-+	dr_mode = "otg";
-+	status = "okay";
-+};
-+
-+&usb_host1_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host1_xhci {
-+	status = "okay";
-+};
-+
-+&usb2phy0 {
-+	status = "okay";
-+};
-+
-+&usb2phy0_host {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy0_otg {
-+	vbus-supply = <&vcc5v0_usb_otg>;
-+	status = "okay";
-+};
-+
-+&usb2phy1 {
-+	status = "okay";
-+};
-+
-+&usb2phy1_host {
-+	phy-supply = <&vcc5v0_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy1_otg {
-+	phy-supply = <&vcc5v0_host>;
-+	status = "okay";
-+};
-+
-+&vop {
-+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
-+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
-+	status = "okay";
-+};
-+
-+&vop_mmu {
-+	status = "okay";
-+};
-+
-+&vp0 {
-+	vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
-+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
-+		remote-endpoint = <&hdmi_in_vp0>;
-+	};
-+};
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0002-arm64-dts-clean-up-as-required-for-mainline-linux.patch

@@ -1,335 +0,0 @@
-From eb02261dd6c88a7fcf3c28e59a7976905815fa6b Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sun, 28 Jan 2024 18:55:57 +1100
-Subject: [PATCH] arm64: dts: clean up as required for mainline linux
-
----
- .../boot/dts/rockchip/rk3566-odroid-m1s.dts   | 212 +++---------------
- 1 file changed, 27 insertions(+), 185 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index 1cad9217c374..cbf2495901d7 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -18,12 +18,8 @@ / {
- 
- 	aliases {
- 		ethernet1 = &gmac1;
--		i2c0 = &i2c3;
--		i2c3 = &i2c0;
- 		mmc0 = &sdhci;
- 		mmc1 = &sdmmc0;
--		serial0 = &uart1;
--		serial1 = &uart0;
- 	};
- 
- 	chosen: chosen {
-@@ -52,7 +48,7 @@ leds {
- 		compatible = "gpio-leds";
- 		status = "okay";
- 
--		red_led: red {
-+		red_led: led-0 {
- 			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
- 			linux,default-trigger = "default-on";
- 			function = LED_FUNCTION_POWER;
-@@ -60,7 +56,7 @@ red_led: red {
- 			pinctrl-names = "default";
- 			pinctrl-0 = <&led_power_en>;
- 		};
--		blue_led: blue {
-+		blue_led: led-1 {
- 			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
- 			linux,default-trigger = "heartbeat";
- 			function = LED_FUNCTION_HEARTBEAT;
-@@ -97,6 +93,25 @@ simple-audio-card,codec {
- 		};
- 	};
- 
-+	spdif_dit: spdif-dit {
-+		compatible = "linux,spdif-dit";
-+		#sound-dai-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	spdif_sound: spdif-sound {
-+		compatible = "simple-audio-card";
-+		status = "disabled";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&spdif>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&spdif_dit>;
-+		};
-+	};
-+
- 	vcc3v3_sys: vcc3v3-sys {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc3v3_sys";
-@@ -164,7 +179,6 @@ vcc5v0_usb_host: vcc5v0-usb3-regulator {
- };
- 
- &combphy1 {
--	phy-supply = <&vcc5v0_usb_host>;
- 	status = "okay";
- };
- 
-@@ -215,121 +229,6 @@ &gmac1m1_rgmii_bus
- 	status = "okay";
- };
- 
--&gpio0 {
--	gpio-line-names =
--		/* GPIO0_A0-A3 */
--		"", "", "", "",
--		/* GPIO0_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO0_B0-B3 */
--		"", "", "", "PIN_28",
--		/* GPIO0_B4-B7 */
--		"PIN_27", "PIN_33", "PIN_7", "",
--
--		/* GPIO0_C0-C3 */
--		"PIN_11", "PIN_13", "PIN_15", "",
--		/* GPIO0_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO0_D0-D3 */
--		"", "", "", "",
--		/* GPIO0_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio1 {
--	gpio-line-names =
--		/* GPIO1_A0-A3 */
--		"", "", "", "",
--		/* GPIO1_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO1_B0-B3 */
--		"", "", "", "",
--		/* GPIO1_B4-B7 */
--		"", "", "", "",
--
--		/* GPIO1_C0-C3 */
--		"", "", "", "",
--		/* GPIO1_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO1_D0-D3 */
--		"", "", "", "",
--		/* GPIO1_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio2 {
--	gpio-line-names =
--		/* GPIO2_A0-A3 */
--		"", "", "", "PIN_10",
--		/* GPIO2_A4-A7 */
--		"PIN_8", "PINN_35", "PIN_36", "PIN_12",
--
--		/* GPIO2_B0-B3 */
--		"PIN_22", "PIN_26", "PIN_32", "",
--		/* GPIO2_B4-B7 */
--		"", "PIN_16", "PIN_18", "PIN_31",
--
--		/* GPIO2_C0-C3 */
--		"PIN_29", "", "", "",
--		/* GPIO2_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO2_D0-D3 */
--		"", "", "", "",
--		/* GPIO2_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio3 {
--	gpio-line-names =
--		/* GPIO3_A0-A3 */
--		"", "PIN_24", "", "",
--		/* GPIO3_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO3_B0-B3 */
--		"", "", "", "EXTPIN_13",
--		/* GPIO3_B4-B7 */
--		"EXTPIN_14", "PIN_5", "PIN_3", "",
--
--		/* GPIO3_C0-C3 */
--		"", "PIN_19", "PIN_21", "PIN_23",
--		/* GPIO3_C4-C7 */
--		"EXTPIN_11", "EXTPIN_12", "", "",
--
--		/* GPIO3_D0-D3 */
--		"", "", "", "",
--		/* GPIO3_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio4 {
--	gpio-line-names =
--		/* GPIO4_A0-A3 */
--		"", "", "", "",
--		/* GPIO4_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO4_B0-B3 */
--		"", "", "", "",
--		/* GPIO4_B4-B7 */
--		"", "", "", "",
--
--		/* GPIO4_C0-C3 */
--		"", "", "", "",
--		/* GPIO4_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO4_D0-D3 */
--		"", "", "", "",
--		/* GPIO4_D4-D7 */
--		"", "", "", "";
--};
--
- &gpu {
- 	mali-supply = <&vdd_gpu>;
- 	status = "okay";
-@@ -368,7 +267,6 @@ vdd_cpu: tcs4525@1c {
- 		regulator-name = "vdd_cpu";
- 		regulator-min-microvolt = <712500>;
- 		regulator-max-microvolt = <1390000>;
--		regulator-init-microvolt = <900000>;
- 		regulator-ramp-delay = <2300>;
- 		fcs,suspend-voltage-selector = <1>;
- 		regulator-boot-on;
-@@ -409,7 +307,6 @@ vdd_logic: DCDC_REG1 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_logic";
-@@ -423,7 +320,6 @@ vdd_gpu: DCDC_REG2 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_gpu";
-@@ -447,7 +343,6 @@ vdd_npu: DCDC_REG4 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_npu";
-@@ -587,6 +482,9 @@ regulator-state-mem {
- 				};
- 			};
- 		};
-+		codec {
-+			rockchip,mic-in-differential;
-+		};
- 	};
- };
- 
-@@ -611,7 +509,7 @@ &i2s0_8ch {
- 
- &i2s1_8ch {
- 	status = "okay";
--	rockchip,clk-trcm = <1>;
-+	rockchip,trcm-sync-tx-only;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&i2s1m0_sclktx
- 		     &i2s1m0_lrcktx
-@@ -620,7 +518,7 @@ &i2s1m0_sdi0
- };
- 
- &mdio1 {
--	rgmii_phy1: phy@0 {
-+	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
- 	};
-@@ -634,62 +532,6 @@ &pcie2x1 {
- };
- 
- &pinctrl {
--	gmac1 {
--		gmac1m1_miim: gmac1m1-miim {
--			rockchip,pins =
--				/* gmac1_mdcm1 */
--				<4 RK_PB6 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_mdiom1 */
--				<4 RK_PB7 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_clkinout: gmac1m1-clkinout {
--			rockchip,pins =
--				/* gmac1_mclkinoutm1 */
--				<4 RK_PC1 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rx_bus2: gmac1m1-rx-bus2 {
--			rockchip,pins =
--				/* gmac1_rxd0m1 */
--				<4 RK_PA7 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxd1m1 */
--				<4 RK_PB0 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxdvcrsm1 */
--				<4 RK_PB1 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_tx_bus2: gmac1m1-tx-bus2 {
--			rockchip,pins =
--				/* gmac1_txd0m1 */
--				<4 RK_PA4 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd1m1 */
--				<4 RK_PA5 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txenm1 */
--				<4 RK_PA6 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rgmii_clk: gmac1m1-rgmii-clk {
--			rockchip,pins =
--				/* gmac1_rxclkm1 */
--				<4 RK_PA3 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txclkm1 */
--				<4 RK_PA0 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rgmii_bus: gmac1m1-rgmii-bus {
--			rockchip,pins =
--				/* gmac1_rxd2m1 */
--				<4 RK_PA1 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxd3m1 */
--				<4 RK_PA2 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd2m1 */
--				<3 RK_PD6 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd3m1 */
--				<3 RK_PD7 3 &pcfg_pull_none_drv_level_15>;
--		};
--	};
--
- 	leds {
- 		led_power_en: led_power_en {
- 			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-@@ -825,7 +667,7 @@ &usb2phy0_host {
- };
- 
- &usb2phy0_otg {
--	vbus-supply = <&vcc5v0_usb_otg>;
-+	phy-supply = <&vcc5v0_usb_otg>;
- 	status = "okay";
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0003-arm64-dts-fix-vdd_cpu-regulator-for-mainline.patch

@@ -1,43 +0,0 @@
-From 641ec8e05726d42c8ec7fa3bda1d8a64f126b475 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Fri, 12 Jan 2024 22:32:56 +1100
-Subject: [PATCH] arm64: dts: fix vdd_cpu regulator for mainline
-
----
- .../arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index cbf2495901d7..a5d9216b544b 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -259,18 +259,19 @@ &hdmi_sound {
- 
- &i2c0 {
- 	status = "okay";
--	vdd_cpu: tcs4525@1c {
--		compatible = "tcs,tcs452x";
-+
-+	vdd_cpu: regulator@1c {
-+		compatible = "tcs,tcs4525";
- 		reg = <0x1c>;
--		vin-supply = <&vcc5v0_sys>;
--		regulator-compatible = "fan53555-reg";
-+		fcs,suspend-voltage-selector = <1>;
- 		regulator-name = "vdd_cpu";
-+		regulator-always-on;
-+		regulator-boot-on;
- 		regulator-min-microvolt = <712500>;
- 		regulator-max-microvolt = <1390000>;
- 		regulator-ramp-delay = <2300>;
--		fcs,suspend-voltage-selector = <1>;
--		regulator-boot-on;
--		regulator-always-on;
-+		vin-supply = <&vcc3v3_sys>;
-+
- 		regulator-state-mem {
- 			regulator-off-in-suspend;
- 		};
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0005-Remove-deprecated-snps-reset-properties.patch

@@ -1,51 +0,0 @@
-From b4d16cd88ec2701dcb15b9519a79288ea5d2bfec Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 23:40:16 +1100
-Subject: [PATCH] Remove deprecated snps,reset properties
-
----
- arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index b8adfd7024f9..e755d00b1d4f 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -192,8 +192,9 @@ &gmac1 {
- 	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
- 	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
- 	clock_in_out = "input";
--	phy-supply = <&vcc_3v3>;
-+	phy-handle = <&rgmii_phy1>;
- 	phy-mode = "rgmii";
-+	phy-supply = <&vcc_3v3>;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac1m1_miim
- 		     &gmac1m1_tx_bus2
-@@ -201,13 +202,8 @@ &gmac1m1_rx_bus2
- 		     &gmac1m1_rgmii_clk
- 		     &gmac1m1_rgmii_bus
- 		     &gmac1m1_clkinout>;
--	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
--	snps,reset-active-low;
--	/* Reset time is 20ms, 100ms for rtl8211f */
--	snps,reset-delays-us = <0 20000 100000>;
- 	tx_delay = <0x4f>;
- 	rx_delay = <0x2d>;
--	phy-handle = <&rgmii_phy1>;
- 	status = "okay";
- };
- 
-@@ -504,6 +500,9 @@ &mdio1 {
- 	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- 	};
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0002-Apply-fixes-for-mainline-u-boot.patch

@@ -1,48 +0,0 @@
-From ed61d0b5f18bf333ff7f35fc8546dd58d227b12f Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 18:38:49 +1100
-Subject: [PATCH] Apply fixes for mainline u-boot
-
----
- arch/arm/dts/rk3566-odroid-m1s.dts  | 6 +-----
- configs/odroid-m1s-rk3566_defconfig | 1 -
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s.dts b/arch/arm/dts/rk3566-odroid-m1s.dts
-index 73e29d80c7..2dba07ba19 100644
---- a/arch/arm/dts/rk3566-odroid-m1s.dts
-+++ b/arch/arm/dts/rk3566-odroid-m1s.dts
-@@ -17,12 +17,8 @@
- 
- 	aliases {
- 		ethernet0 = &gmac1;
--		i2c0 = &i2c3;
--		i2c3 = &i2c0;
- 		mmc0 = &sdhci;
- 		mmc1 = &sdmmc0;
--		serial0 = &uart1;
--		serial1 = &uart0;
- 	};
- 
- 	chosen {
-@@ -578,7 +574,7 @@
- 	disable-wp;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
--	sd-uhs-sdr50;
-+	sd-uhs-sdr104;
- 	vmmc-supply = <&vcc3v3_sd>;
- 	vqmmc-supply = <&vccio_sd>;
- 	status = "okay";
-diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
-index d70a10dc08..61b6962063 100644
---- a/configs/odroid-m1s-rk3566_defconfig
-+++ b/configs/odroid-m1s-rk3566_defconfig
-@@ -106,4 +106,3 @@ CONFIG_USB_DWC3=y
- CONFIG_USB_DWC3_GENERIC=y
- CONFIG_FS_CRAMFS=y
- CONFIG_ERRNO_STR=y
--CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x0800
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0003-Improve-reliability-of-eMMC.patch

@@ -1,44 +0,0 @@
-From 2a1d8f586799e4166e802babcce18c9980aa1f44 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Thu, 1 Feb 2024 17:50:46 +1100
-Subject: [PATCH] Improve reliability of eMMC
-
-Cherry-picked from:
-20240126232615.6826-2-jonas@kwiboo.se
----
- arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi | 4 ----
- configs/odroid-m1s-rk3566_defconfig        | 2 ++
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-index 33a1d142b8..04d0cd17ef 100644
---- a/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-+++ b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-@@ -14,11 +14,7 @@
- 
- &sdhci {
- 	cap-mmc-highspeed;
--	mmc-ddr-1_8v;
- 	mmc-hs200-1_8v;
--	mmc-hs400-1_8v;
--	mmc-hs400-enhanced-strobe;
--	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
- };
- 
- &uart2 {
-diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
-index 61b6962063..7920ef224d 100644
---- a/configs/odroid-m1s-rk3566_defconfig
-+++ b/configs/odroid-m1s-rk3566_defconfig
-@@ -70,6 +70,8 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MISC=y
- CONFIG_SUPPORT_EMMC_RPMB=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_SPL_MMC_HS200_SUPPORT=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0004-Fix-ethernet-properties.patch

@@ -1,52 +0,0 @@
-From 65a304151817626157e7be4e7e1581cdddca2a02 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 23:42:47 +1100
-Subject: [PATCH] Fix ethernet properties
-
----
- arch/arm/dts/rk3566-odroid-m1s.dts | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s.dts b/arch/arm/dts/rk3566-odroid-m1s.dts
-index 2dba07ba19..73b545109d 100644
---- a/arch/arm/dts/rk3566-odroid-m1s.dts
-+++ b/arch/arm/dts/rk3566-odroid-m1s.dts
-@@ -197,10 +197,9 @@
- };
- 
- &gmac1 {
--	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
--	assigned-clock-rates = <0>, <125000000>;
--	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
--	clock_in_out = "output";
-+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
-+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
-+	clock_in_out = "input";
- 	phy-handle = <&rgmii_phy1>;
- 	phy-mode = "rgmii";
- 	phy-supply = <&vcc3v3_sys>;
-@@ -211,10 +210,9 @@
- 		     &gmac1m1_rgmii_clk
- 		     &gmac1m1_rgmii_bus
- 		     &gmac1m1_clkinout>;
--	status = "okay";
--
- 	tx_delay = <0x4f>;
- 	rx_delay = <0x2d>;
-+	status = "okay";
- };
- 
- &gpu {
-@@ -496,6 +494,9 @@
- 	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- 	};
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch

@@ -1,8 +1,11 @@
-From c51639443d3c90127a77f1534e39dd01fac1577f Mon Sep 17 00:00:00 2001
+From d4ec3799c0773b3a6d3d90f4b16eec1f50e4b032 Mon Sep 17 00:00:00 2001
 From: memeka <mihailescu2m@gmail.com>
 Date: Fri, 18 Jan 2019 14:36:21 +1030
 Subject: [PATCH] ODROID-XU4: regulator: s2mps11: add ethernet power reset in
  shutdown function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Ethernet device cannot be detected on warm boot sometimes. This patch is
 to add the power reset routines for ethernet device using PMIC. Then
@@ -11,15 +14,17 @@ ethernet device can be reset hardware-wise.
 Change-Id: Iffbe2966da7e4679f63b91ab79241167391792df
 Signed-off-by: Brian Kim <brian.kim@hardkernel.com>
 Signed-off-by: Marian Mihailescu <mihailescu2m@gmail.com>
+[Updated patch for Linux 6.11+ after scoped memory allocation refactor]
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
- drivers/regulator/s2mps11.c | 55 +++++++++++++++++++++++++++++++++++++
+ drivers/regulator/s2mps11.c | 56 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
+ 1 file changed, 56 insertions(+)
 
 diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
-index 570b61420f3a..286b606660a4 100644
+index 7dcf92af8f15e..f08f6f494fe0b 100644
 --- a/drivers/regulator/s2mps11.c
 +++ b/drivers/regulator/s2mps11.c
-@@ -1117,6 +1117,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
+@@ -1118,6 +1118,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
  	regulator_desc_s2mpu02_buck7(7),
  };
  
@@ -77,7 +82,7 @@ index 570b61420f3a..286b606660a4 100644
  static int s2mps11_pmic_probe(struct platform_device *pdev)
  {
  	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
-@@ -1219,6 +1270,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
+@@ -1219,6 +1270,11 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
  		}
  	}
  
@@ -85,6 +90,7 @@ index 570b61420f3a..286b606660a4 100644
 +	s2mps11_pmic_ethonoff(pdev, false);
 +	mdelay(10);
 +	s2mps11_pmic_ethonoff(pdev, true);
- out:
++
- 	kfree(rdata);
+ 	return 0;
+ }
  

buildroot-external/board/hardkernel/patches-meson/uboot/0001-HACK-mmc-meson-gx-limit-f_max-to-24-MHz-on-the-first.patch

@@ -1,4 +1,4 @@
-From 024796cbf752d2e210341ae8609792803641eb92 Mon Sep 17 00:00:00 2001
+From f63ef87b9a9bf9997aa4017f8380567b20a1810c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Thu, 7 Nov 2024 12:39:02 +0100
 Subject: [PATCH] HACK: mmc: meson-gx: limit f_max to 24 MHz on the first try
@@ -25,10 +25,10 @@ Signed-off-by: Jan Čermák <sairon@sairon.cz>
  3 files changed, 15 insertions(+)
 
 diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
-index fcf4f03d1e..715dce3522 100644
+index 5852b24c6d2..0e0265de359 100644
 --- a/drivers/mmc/meson_gx_mmc.c
 +++ b/drivers/mmc/meson_gx_mmc.c
-@@ -283,6 +283,8 @@ static int meson_mmc_probe(struct udevice *dev)
+@@ -282,6 +282,8 @@ static int meson_mmc_probe(struct udevice *dev)
  	cfg->b_max = 511; /* max 512 - 1 blocks */
  	cfg->name = dev->name;
  
@@ -38,10 +38,10 @@ index fcf4f03d1e..715dce3522 100644
  	upriv->mmc = mmc;
  
 diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
-index d96db7a0f8..c8dc676612 100644
+index 799586891af..85b6210f220 100644
 --- a/drivers/mmc/mmc.c
 +++ b/drivers/mmc/mmc.c
-@@ -1652,6 +1652,10 @@ int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
+@@ -1694,6 +1694,10 @@ int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
  			clock = mmc->cfg->f_min;
  	}
  
@@ -52,7 +52,7 @@ index d96db7a0f8..c8dc676612 100644
  	mmc->clock = clock;
  	mmc->clk_disable = disable;
  
-@@ -2647,6 +2651,13 @@ static int mmc_startup(struct mmc *mmc)
+@@ -2701,6 +2705,13 @@ static int mmc_startup(struct mmc *mmc)
  		if (err)
  			return err;
  		err = mmc_select_mode_and_width(mmc, mmc->card_caps);
@@ -67,13 +67,13 @@ index d96db7a0f8..c8dc676612 100644
  #endif
  	if (err)
 diff --git a/include/mmc.h b/include/mmc.h
-index 1022db3ffa..0ea48c6fd9 100644
+index e4b960b7294..5ad40cf2ed1 100644
 --- a/include/mmc.h
 +++ b/include/mmc.h
-@@ -739,6 +739,8 @@ struct mmc {
+@@ -760,6 +760,8 @@ struct mmc {
- 	u8 hs400_tuning;
- 
  	enum bus_mode user_speed_mode; /* input speed mode from user */
+ 
+ 	CONFIG_IS_ENABLED(CYCLIC, (struct cyclic_info cyclic));
 +
 +	bool meson_gx_f_max_hack;
  };

buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch

@@ -1,4 +1,4 @@
-From e780a5f405a02e3102c471415f7b0ad73a5cc036 Mon Sep 17 00:00:00 2001
+From 8286ad3b1e761138e3c574160a5e1a2d6ed06084 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:20:48 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: add power button support
@@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index 9e12a34b2840..c27eae6488ce 100644
+index 09d959aefb184..6be653ac77fac 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -38,6 +38,17 @@ fan: gpio-fan {

buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch

@@ -1,4 +1,4 @@
-From cff7ba94733d9103487d87a6474e2ab026bd718c Mon Sep 17 00:00:00 2001
+From 6835f658a2c21d38730c1280587cf3768a82ad60 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:38:54 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: add GPIO fan support
@@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index c27eae6488ce..db8a2dfaf0b3 100644
+index 6be653ac77fac..10dd23a3b44bc 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -49,6 +49,17 @@ power-button {

buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch

@@ -1,4 +1,4 @@
-From 8d781fc504780a3aa8ef751724e3749c2bfda7a9 Mon Sep 17 00:00:00 2001
+From 297031995dabde203581d555e9ddd91a50d155dc Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 15:53:55 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device
@@ -17,7 +17,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 38 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index db8a2dfaf0b3..843e66332369 100644
+index 10dd23a3b44bc..13624c6522abc 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -245,6 +245,44 @@ &clkc_audio {

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch

@@ -1,4 +1,4 @@
-From 01ac730fa92a030690a7701c9b8781bc4ef7bcae Mon Sep 17 00:00:00 2001
+From 742764eb039d8d96aa43afeb62a89b122073bb98 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Fri, 27 Mar 2020 17:05:22 +0900
 Subject: [PATCH] arm64: dts: meson: add uart_A node
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 7 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index 843e66332369..61caadd679e2 100644
+index 13624c6522abc..6a1330b40cf4d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -12,6 +12,7 @@

buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch

@@ -1,4 +1,4 @@
-From f5676219e12b48a0f591e911797304fae05ca78c Mon Sep 17 00:00:00 2001
+From bb0da00e7b89510fb66c7a8a1acf16d9f58a45fe Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 29 Apr 2021 21:32:43 +0200
 Subject: [PATCH] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
@@ -13,11 +13,11 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index 91c9769fda20..ececc6b17639 100644
+index 3bca8023638d4..45f6dada0edee 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -248,6 +248,12 @@ usb-hub-hog {
+@@ -264,6 +264,12 @@ &gpio {
- 	};
+ 		"PIN_36"; /* GPIOX_19 */
  };
  
 +&i2c2 {

buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch

@@ -1,4 +1,4 @@
-From 1c9c3ca476adf09884295e9f8298288ea497e5ac Mon Sep 17 00:00:00 2001
+From 37b8576e97c3a130160bd5908220c67b2258a443 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:51:50 +0100
 Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node
@@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
-index 1db2327bbd13..e67869fbb460 100644
+index 7b0e9817a615d..a41fc1cfdeead 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 @@ -10,8 +10,9 @@
@@ -22,7 +22,7 @@ index 1db2327bbd13..e67869fbb460 100644
  	};
  
  	chosen {
-@@ -449,6 +450,12 @@ &tohdmitx {
+@@ -453,6 +454,12 @@ &tohdmitx {
  	status = "okay";
  };
  

buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch

@@ -1,4 +1,4 @@
-From 9cd343da01d9b69ad33444105208949775c909b4 Mon Sep 17 00:00:00 2001
+From 837c71af687b26385467b5c1e58208de325f6d26 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:53:32 +0100
 Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node
@@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node
  1 file changed, 53 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
-index e67869fbb460..90d2eea7fe24 100644
+index a41fc1cfdeead..ceb8a182820fd 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 @@ -11,6 +11,8 @@
@@ -20,7 +20,7 @@ index e67869fbb460..90d2eea7fe24 100644
  		serial0 = &uart_AO;
  		serial1 = &uart_A;
  	};
-@@ -386,6 +388,57 @@ &ir {
+@@ -390,6 +392,57 @@ &ir {
  	pinctrl-names = "default";
  };
  

buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch

@@ -1,4 +1,4 @@
-From 299d45dd82df026c0164e170d476b56eada4aa77 Mon Sep 17 00:00:00 2001
+From 94625c724799c8082ab0f195e1799f88b352203d Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Feb 2023 20:15:07 +0100
 Subject: [PATCH] arm64: dts: amlogic: add uartA/uartC to ODROID-C2
@@ -9,7 +9,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index e6d2de7c45a9..c6a38d890db5 100644
+index 959bd8d77a82e..557ad0cf8f975 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 @@ -17,6 +17,8 @@ / {
@@ -21,7 +21,7 @@ index e6d2de7c45a9..c6a38d890db5 100644
  		ethernet0 = &ethmac;
  	};
  
-@@ -383,6 +385,18 @@ &uart_AO {
+@@ -387,6 +389,18 @@ &uart_AO {
  	pinctrl-names = "default";
  };
  

buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch

@@ -1,4 +1,4 @@
-From 61a378b42a2f61589cc62ff85334dd607014cb6d Mon Sep 17 00:00:00 2001
+From 2ee967384a0062b0de6a4259a9d9c839e11b1120 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Feb 2023 20:16:29 +0100
 Subject: [PATCH] arm64: dts: amlogic: meson-gx: add missing pins for I2C A/B
@@ -9,10 +9,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-index 12ef6e81c8bd..90ae81493de2 100644
+index ed00e67e6923a..460a21a4f551a 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-@@ -333,6 +333,8 @@ &hwrng {
+@@ -339,6 +339,8 @@ &hwrng {
  
  &i2c_A {
  	clocks = <&clkc CLKID_I2C>;
@@ -21,7 +21,7 @@ index 12ef6e81c8bd..90ae81493de2 100644
  };
  
  &i2c_AO {
-@@ -341,6 +343,8 @@ &i2c_AO {
+@@ -347,6 +349,8 @@ &i2c_AO {
  
  &i2c_B {
  	clocks = <&clkc CLKID_I2C>;

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

@@ -209,8 +209,6 @@ CONFIG_HNS3=y
 CONFIG_HNS3_HCLGE=y
 CONFIG_HNS3_ENET=y
 CONFIG_E1000E=y
-CONFIG_IGB=y
-CONFIG_IGBVF=y
 CONFIG_MVMDIO=y
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
@@ -296,7 +294,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MESON=y
 CONFIG_I2C_RK3X=y
@@ -332,7 +329,6 @@ CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_MAX77620=y
-CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_SYSCON_REBOOT_MODE=y
@@ -546,7 +542,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_EDAC=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=m
@@ -587,7 +582,6 @@ CONFIG_HWSPINLOCK=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_REMOTEPROC=y
-CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_EXTCON_USB_GPIO=y

buildroot-external/board/khadas/vim3/uboot-boot.ush

@@ -1,17 +1,17 @@
 
 ###########################################
 
-part start mmc ${devnum} 9 mmc_env
+part start ${devtype} ${devnum} 9 mmc_env
-mmc dev ${devnum}
+${devtype} dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
+    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x10; \
     env import -c ${ramdisk_addr_r} 0x2000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
+    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x10;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -29,31 +29,31 @@ setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
-if test -e mmc ${devnum}:1 haos-config.txt; then
+if test -e ${devtype} ${devnum}:1 haos-config.txt; then
-  fatload mmc ${devnum}:1 ${ramdisk_addr_r} haos-config.txt
+  fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} haos-config.txt
   env import -t ${ramdisk_addr_r} ${filesize}
 fi
 
 # Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
+fileenv ${devtype} ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
 setenv fdtfile "meson-g12b-s922x-khadas-vim3.dtb"
 echo "Loading standard device tree ${fdtfile}"
-fatload mmc ${devnum}:1 ${fdt_addr_r} ${fdtfile}
+fatload ${devtype} ${devnum}:1 ${fdt_addr_r} ${fdtfile}
 fdt addr ${fdt_addr_r}
 
 # load dt overlays
 fdt resize 65536
 for overlay_file in ${overlays}; do
-  if fatload mmc ${devnum}:1 ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
+  if fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
     echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
     fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
   fi
 done
 if test "${overlay_error}" = "true"; then
   echo "Error applying DT overlays, restoring original DT"
-  fatload mmc ${devnum}:1 ${fdt_addr_r} ${fdtfile}
+  fatload ${devtype} ${devnum}:1 ${fdt_addr_r} ${fdtfile}
 fi
 
 # logical volumes get numbered after physical ones.
@@ -74,7 +74,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      if load mmc ${devnum}:5 ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:5 ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
       fi
     fi
@@ -82,7 +82,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      if load mmc ${devnum}:7 ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:7 ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
       fi
     fi

buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch

@@ -1,4 +1,4 @@
-From 9b1367f47f2e790f155d4aab39878233eedf7b22 Mon Sep 17 00:00:00 2001
+From 015fa4136338919a43c1c6e47e8c07679cefbaa2 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Thu, 6 Jul 2023 10:05:04 +0000
 Subject: [PATCH] arm64: dts: rockchip: Add NabuCasa Green board
@@ -8,30 +8,32 @@ Content-Transfer-Encoding: 8bit
 
 [Replaced custom rk860x driver with upstream fan53555]
 Signed-off-by: Jan Čermák <sairon@sairon.cz>
+[Enabled Rockchip RNG from rk356x.dtsi]
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
  arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3566-ha-green.dts     | 684 ++++++++++++++++++
+ .../boot/dts/rockchip/rk3566-ha-green.dts     | 688 ++++++++++++++++++
- 2 files changed, 685 insertions(+)
+ 2 files changed, 689 insertions(+)
  create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 
 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index e7728007fd1b..475becd793ac 100644
+index 09423070c9928..1f5a9d690648f 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
+@@ -83,6 +83,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-ha-green.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v1.1.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v2.1.dtb
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 new file mode 100644
-index 000000000000..b5e4a67b3fc7
+index 0000000000000..d6a86cc57b65e
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -0,0 +1,684 @@
+@@ -0,0 +1,688 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2023 Seeed Co., Ltd.
@@ -559,6 +561,10 @@ index 000000000000..b5e4a67b3fc7
 +	status = "okay";
 +};
 +
++&rng {
++	status = "okay";
++};
++
 +&saradc {
 +	vref-supply = <&vcca_1v8>;
 +	status = "okay";

buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch

@@ -1,4 +1,4 @@
-From be773999495258994d1df04448a4de43d58db9c4 Mon Sep 17 00:00:00 2001
+From 8bd12039ef70b3b78a588da61f6680cee40b65cf Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Wed, 12 Jul 2023 02:33:03 +0000
 Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s
@@ -9,10 +9,10 @@ Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s
  2 files changed, 6 insertions(+)
 
 diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
-index a577f950c632..418a4506c99e 100644
+index 39ab114ea669d..c7a639b25231f 100644
 --- a/drivers/mfd/rk8xx-core.c
 +++ b/drivers/mfd/rk8xx-core.c
-@@ -232,6 +232,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = {
+@@ -263,6 +263,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = {
  	{RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
  	{RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
  					   RK817_HOTDIE_105 | RK817_TSD_140},
@@ -21,10 +21,10 @@ index a577f950c632..418a4506c99e 100644
  
  static const struct rk808_reg_data rk818_pre_init_reg[] = {
 diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
-index 78e167a92483..0bd7031966d6 100644
+index 69cbea78b430b..2a9563caa3e24 100644
 --- a/include/linux/mfd/rk808.h
 +++ b/include/linux/mfd/rk808.h
-@@ -1052,6 +1052,11 @@ enum rk809_reg_id {
+@@ -1195,6 +1195,11 @@ enum rk809_reg_id {
  #define RK817_ON_SOURCE_REG		0xf5
  #define RK817_OFF_SOURCE_REG		0xf6
  

buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch

@@ -1,4 +1,4 @@
-From 41026603d639007895de1f48437813f78edb62ea Mon Sep 17 00:00:00 2001
+From c0430945cd4a6a5b4072662b44cb6a44d3f7ecc2 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Sat, 15 Jul 2023 08:28:16 +0000
 Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions
@@ -8,10 +8,10 @@ Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions
  1 file changed, 2 insertions(+), 29 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index b5e4a67b3fc7..debb9459a5aa 100644
+index d6a86cc57b65e..6336fe758819f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -565,36 +565,9 @@ &sfc {
+@@ -569,36 +569,9 @@ &sfc {
  	flash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;

buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch

@@ -1,4 +1,4 @@
-From 0c8b1453993f15715836123bfc7c164e568913f2 Mon Sep 17 00:00:00 2001
+From c3f803f835db301e586127b061bd473fb61ec13a Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 19 Jul 2023 10:08:06 +0200
 Subject: [PATCH] Input: rk805-pwrkey: reverse polarity of pwrkey
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c
-index 76873aa005b4..139419033c84 100644
+index 76873aa005b41..139419033c84a 100644
 --- a/drivers/input/misc/rk805-pwrkey.c
 +++ b/drivers/input/misc/rk805-pwrkey.c
 @@ -19,7 +19,7 @@ static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr)

buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch

@@ -1,4 +1,4 @@
-From 858d26179ee3a06fc7ebadf2c49dc337a7a98485 Mon Sep 17 00:00:00 2001
+From 3d75827d0318c792d4d7a68d7d7076deee3e7ad3 Mon Sep 17 00:00:00 2001
 From: zhangcy <chengyu.zhang@seeed.cc>
 Date: Mon, 14 Aug 2023 01:27:34 +0000
 Subject: [PATCH] green: emmc use HS200 mode
@@ -8,10 +8,10 @@ Subject: [PATCH] green: emmc use HS200 mode
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index debb9459a5aa..e4b1e80641b9 100644
+index 6336fe758819f..61083a9885a78 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -532,6 +532,7 @@ &saradc {
+@@ -536,6 +536,7 @@ &saradc {
  
  &sdhci {
  	bus-width = <8>;

buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch

@@ -1,4 +1,4 @@
-From 6b926b041e939655d3a88202bde32f4901459a65 Mon Sep 17 00:00:00 2001
+From 6219da5138cdcdd0186187e8591010bbda5dc8a9 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 4 Sep 2023 22:36:10 +0200
 Subject: [PATCH] arch: arm64: dts: green: Improve LED representation
@@ -9,7 +9,7 @@ Fix color and use labels/node names according to the LEDs functionality.
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index e4b1e80641b9..1d0db11db3e0 100644
+index 61083a9885a78..df260be4211d9 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 @@ -48,16 +48,18 @@ hdmi_con_in: endpoint {

buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch

@@ -1,33 +1,35 @@
-From 501ac314ef709d6ecac3047310d5e48a473df638 Mon Sep 17 00:00:00 2001
+From 99fdcac59b4c993dcac1869e8372dc895ffa0ae5 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Thu, 6 Jul 2023 10:06:35 +0000
 Subject: [PATCH] arch: arm: dts: Add NabuCasa Green board
 
 ---
- arch/arm/dts/Makefile                    |   1 +
+ arch/arm/dts/Makefile                    |   3 +
  arch/arm/dts/rk3566-ha-green-u-boot.dtsi |  28 +
  arch/arm/dts/rk3566-ha-green.dts         | 685 +++++++++++++++++++++++
  configs/green_defconfig                  |  74 +++
- 4 files changed, 788 insertions(+)
+ 4 files changed, 790 insertions(+)
  create mode 100644 arch/arm/dts/rk3566-ha-green-u-boot.dtsi
  create mode 100644 arch/arm/dts/rk3566-ha-green.dts
  create mode 100644 configs/green_defconfig
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 9d28a485be..f78839f9cc 100644
+index 6ad59aeed5f..92c6fa54caa 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -172,6 +172,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+@@ -87,6 +87,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
+ 	rk3368-geekbox.dtb \
+ 	rk3368-px5-evb.dtb \
+ 
++dtb-$(CONFIG_ROCKCHIP_RK3568) += \
++	rk3566-ha-green.dtb
++
+ dtb-$(CONFIG_ARCH_S5P4418) += \
+ 	s5p4418-nanopi2.dtb
  
- dtb-$(CONFIG_ROCKCHIP_RK3568) += \
- 	rk3566-anbernic-rgxx3.dtb \
-+	rk3566-ha-green.dtb \
- 	rk3566-quartz64-a.dtb \
- 	rk3566-quartz64-b.dtb \
- 	rk3566-radxa-cm3-io.dtb \
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 new file mode 100644
-index 0000000000..83fa66d591
+index 00000000000..83fa66d591e
 --- /dev/null
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -0,0 +1,28 @@
@@ -61,7 +63,7 @@ index 0000000000..83fa66d591
 +};
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
 new file mode 100644
-index 0000000000..15d2b73433
+index 00000000000..15d2b734338
 --- /dev/null
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -0,0 +1,685 @@
@@ -752,7 +754,7 @@ index 0000000000..15d2b73433
 +};
 diff --git a/configs/green_defconfig b/configs/green_defconfig
 new file mode 100644
-index 0000000000..0617d308aa
+index 00000000000..0617d308aa2
 --- /dev/null
 +++ b/configs/green_defconfig
 @@ -0,0 +1,74 @@
@@ -830,6 +832,3 @@ index 0000000000..0617d308aa
 +CONFIG_SYSRESET=y
 +# CONFIG_BINMAN_FDT is not set
 +CONFIG_ERRNO_STR=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch

@@ -1,4 +1,4 @@
-From 6441bdb22a25649ff8fd69aa8f8a7285d9c37266 Mon Sep 17 00:00:00 2001
+From 634b3b17d96b6def645b15b379fbe617620e6665 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Fri, 14 Jul 2023 14:13:39 +0000
 Subject: [PATCH] configs: green: Support USB boot
@@ -8,7 +8,7 @@ Subject: [PATCH] configs: green: Support USB boot
  1 file changed, 36 insertions(+), 16 deletions(-)
 
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 0617d308aa..14960b67d2 100644
+index 0617d308aa2..14960b67d26 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -6,48 +6,54 @@ CONFIG_TEXT_BASE=0x00a00000
@@ -112,6 +112,3 @@ index 0617d308aa..14960b67d2 100644
 +CONFIG_USB_OHCI_GENERIC=y
 +CONFIG_USB_DWC3=y
  CONFIG_ERRNO_STR=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch

@@ -1,4 +1,4 @@
-From d8b8b614d19dbb3fa004677a2c2e50b685a80192 Mon Sep 17 00:00:00 2001
+From 80fc442a51ecab7b822145561421e3adff899bc9 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Fri, 14 Jul 2023 14:14:10 +0000
 Subject: [PATCH] arch: arm: dts: rk3566: green: boot order
@@ -9,7 +9,7 @@ Subject: [PATCH] arch: arm: dts: rk3566: green: boot order
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 83fa66d591..7f2ed298ce 100644
+index 83fa66d591e..7f2ed298ce3 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -9,7 +9,7 @@
@@ -33,7 +33,7 @@ index 83fa66d591..7f2ed298ce 100644
  	clock-frequency = <24000000>;
  	bootph-all;
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index 15d2b73433..bf0f81c3a1 100644
+index 15d2b734338..bf0f81c3a15 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -563,7 +563,7 @@
@@ -45,6 +45,3 @@ index 15d2b73433..bf0f81c3a1 100644
  		compatible = "jedec,spi-nor";
  		reg = <0>;
  		spi-max-frequency = <100000000>;
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch

@@ -1,4 +1,4 @@
-From e14d7d56b293ba01c5b73a4b3483795d78c75172 Mon Sep 17 00:00:00 2001
+From 107a4b9bf7d335de4a6dc7e6097a1f38fdab38c7 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Sat, 15 Jul 2023 08:46:09 +0000
 Subject: [PATCH] arch: arm: dts: green: spi nor uboot
@@ -10,7 +10,7 @@ Subject: [PATCH] arch: arm: dts: green: spi nor uboot
  3 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 7f2ed298ce..fa98078fce 100644
+index 7f2ed298ce3..fa98078fce2 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -13,15 +13,96 @@
@@ -123,7 +123,7 @@ index 7f2ed298ce..fa98078fce 100644
 +};
 \ No newline at end of file
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index bf0f81c3a1..ea9d358099 100644
+index bf0f81c3a15..ea9d358099b 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -566,8 +566,8 @@
@@ -138,7 +138,7 @@ index bf0f81c3a1..ea9d358099 100644
  
  		partitions {
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 14960b67d2..5f94c06279 100644
+index 14960b67d26..5f94c062798 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -68,6 +68,8 @@ CONFIG_MMC_SDHCI_SDMA=y
@@ -150,6 +150,3 @@ index 14960b67d2..5f94c06279 100644
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch

@@ -1,4 +1,4 @@
-From acec57c77e10230fc32820046301cb2a59c431d4 Mon Sep 17 00:00:00 2001
+From c1b3736623b9a6e5d027ca202dbc53b7eb7e4662 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 17 Aug 2023 17:38:13 +0200
 Subject: [PATCH] board: green: add Green board to read board specific EEPROM
@@ -12,17 +12,17 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  arch/arm/mach-rockchip/rk3568/Kconfig |  7 +++
  board/nabucasa/ha-green/Kconfig       | 15 +++++++
  board/nabucasa/ha-green/Makefile      |  3 ++
- board/nabucasa/ha-green/ha-green.c    | 65 +++++++++++++++++++++++++++
+ board/nabucasa/ha-green/ha-green.c    | 64 +++++++++++++++++++++++++++
  configs/green_defconfig               |  3 ++
  include/configs/ha-green.h            | 11 +++++
- 7 files changed, 111 insertions(+)
+ 7 files changed, 110 insertions(+)
  create mode 100644 board/nabucasa/ha-green/Kconfig
  create mode 100644 board/nabucasa/ha-green/Makefile
  create mode 100644 board/nabucasa/ha-green/ha-green.c
  create mode 100644 include/configs/ha-green.h
 
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index ea9d358099..91afadf0e6 100644
+index ea9d358099b..91afadf0e65 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -449,6 +449,13 @@
@@ -40,7 +40,7 @@ index ea9d358099..91afadf0e6 100644
  
  &i2s0_8ch {
 diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
-index baa51349f4..42652dec03 100644
+index ce327ed6f9e..5f675b11491 100644
 --- a/arch/arm/mach-rockchip/rk3568/Kconfig
 +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
 @@ -17,6 +17,12 @@ config TARGET_ANBERNIC_RGXX3_RK3566
@@ -56,17 +56,17 @@ index baa51349f4..42652dec03 100644
  config TARGET_ODROID_M1_RK3568
  	bool "ODROID-M1"
  	help
-@@ -44,6 +50,7 @@ config SYS_MALLOC_F_LEN
+@@ -81,6 +87,7 @@ source "board/rockchip/evb_rk3568/Kconfig"
- source "board/rockchip/evb_rk3568/Kconfig"
  source "board/anbernic/rgxx3_rk3566/Kconfig"
  source "board/hardkernel/odroid_m1/Kconfig"
+ source "board/hardkernel/odroid_m1s/Kconfig"
 +source "board/nabucasa/ha-green/Kconfig"
  source "board/pine64/quartz64_rk3566/Kconfig"
- 
+ source "board/powkiddy/x55/Kconfig"
- endif
+ source "board/qnap/ts433/Kconfig"
 diff --git a/board/nabucasa/ha-green/Kconfig b/board/nabucasa/ha-green/Kconfig
 new file mode 100644
-index 0000000000..863afd4363
+index 00000000000..863afd43632
 --- /dev/null
 +++ b/board/nabucasa/ha-green/Kconfig
 @@ -0,0 +1,15 @@
@@ -87,7 +87,7 @@ index 0000000000..863afd4363
 +endif
 diff --git a/board/nabucasa/ha-green/Makefile b/board/nabucasa/ha-green/Makefile
 new file mode 100644
-index 0000000000..bf711fe8c4
+index 00000000000..bf711fe8c44
 --- /dev/null
 +++ b/board/nabucasa/ha-green/Makefile
 @@ -0,0 +1,3 @@
@@ -96,10 +96,10 @@ index 0000000000..bf711fe8c4
 +obj-y    += ha-green.o
 diff --git a/board/nabucasa/ha-green/ha-green.c b/board/nabucasa/ha-green/ha-green.c
 new file mode 100644
-index 0000000000..b9a0c32441
+index 00000000000..3f0ede747bc
 --- /dev/null
 +++ b/board/nabucasa/ha-green/ha-green.c
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,64 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright 2023 Nabu Casa, Inc.
@@ -109,7 +109,6 @@ index 0000000000..b9a0c32441
 +#include <errno.h>
 +#include <dm/device.h>
 +#include <dm/uclass.h>
-+#include <common.h>
 +#include <dm.h>
 +#include <eeprom.h>
 +#include <env.h>
@@ -166,7 +165,7 @@ index 0000000000..b9a0c32441
 +	return 0;
 +}
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 5f94c06279..a97391f295 100644
+index 5f94c062798..a97391f2954 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -16,6 +16,7 @@ CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
@@ -188,7 +187,7 @@ index 5f94c06279..a97391f295 100644
  CONFIG_MMC_DW_ROCKCHIP=y
 diff --git a/include/configs/ha-green.h b/include/configs/ha-green.h
 new file mode 100644
-index 0000000000..e42d9c8e8c
+index 00000000000..e42d9c8e8c9
 --- /dev/null
 +++ b/include/configs/ha-green.h
 @@ -0,0 +1,11 @@
@@ -203,6 +202,3 @@ index 0000000000..e42d9c8e8c
 +#include <configs/rk3568_common.h>
 +
 +#endif
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch

@@ -1,4 +1,4 @@
-From 51f1bdec59b8f62ac00a37e97a7bb8ebfc9f61d7 Mon Sep 17 00:00:00 2001
+From 6ae9e30259812a3cbc8d4990a5acfe459053a225 Mon Sep 17 00:00:00 2001
 From: syan <syan.cham@gmail.com>
 Date: Mon, 31 Jul 2023 09:39:55 +0000
 Subject: [PATCH] green: spl loader uboot order: sd-emmc-spi_nor
@@ -8,7 +8,7 @@ Subject: [PATCH] green: spl loader uboot order: sd-emmc-spi_nor
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index fa98078fce..48d7b61513 100644
+index fa98078fce2..48d7b615137 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -9,7 +9,7 @@
@@ -20,6 +20,3 @@ index fa98078fce..48d7b61513 100644
  	};
  };
  
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0007-green-Fix-SPI-Flash-alias.patch

@@ -1,4 +1,4 @@
-From 0142d1a99d2aa4a6dad7181dcd74958b2ee0fe31 Mon Sep 17 00:00:00 2001
+From b6c7fc08198300d8620f9896db468e0e50e8838a Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 17 Aug 2023 17:51:07 +0200
 Subject: [PATCH] green: Fix SPI Flash alias
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index a97391f295..71c9257d7d 100644
+index a97391f2954..71c9257d7d4 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -55,6 +55,7 @@ CONFIG_CMD_REGULATOR=y
@@ -38,6 +38,3 @@ index a97391f295..71c9257d7d 100644
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0008-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch

@@ -1,4 +1,4 @@
-From 846df62342a4904a91aace66e9204ae3ed4ca0af Mon Sep 17 00:00:00 2001
+From 71ad7d9b73ff14283e61fbb1d3d214982f8c9967 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 18 Aug 2023 10:06:24 +0200
 Subject: [PATCH] arch: arm: dts: green: drop SPI NOR flash partitions
@@ -8,7 +8,7 @@ Subject: [PATCH] arch: arm: dts: green: drop SPI NOR flash partitions
  1 file changed, 27 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index 91afadf0e6..68d836911e 100644
+index 91afadf0e65..68d836911ec 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -576,33 +576,6 @@
@@ -45,6 +45,3 @@ index 91afadf0e6..68d836911e 100644
  	};
  };
  
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch

@@ -1,4 +1,4 @@
-From 331826e0c52d6bdd65d862e06834f23b3a750276 Mon Sep 17 00:00:00 2001
+From bda29ba9030c8ad9aa245d68033a83106de4f633 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Wed, 12 Jun 2024 15:20:46 +0200
 Subject: [PATCH] green: Do not use eMMC DDR52 mode, enable HS200
@@ -22,7 +22,7 @@ Signed-off-by: Jan Čermák <sairon@sairon.cz>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 48d7b61513..8dc1585aac 100644
+index 48d7b615137..8dc1585aacd 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -71,10 +71,7 @@
@@ -44,7 +44,7 @@ index 48d7b61513..8dc1585aac 100644
 \ No newline at end of file
 +};
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 71c9257d7d..7b5a705686 100644
+index 71c9257d7d4..7b5a7056868 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -65,6 +65,8 @@ CONFIG_MISC=y

buildroot-external/board/nabucasa/green/patches/uboot/0010-arch-arm64-dts-green-Improve-LED-representation.patch

@@ -1,4 +1,4 @@
-From d3fb1ec2364b20025d71e2263514a71208cfb61e Mon Sep 17 00:00:00 2001
+From 2bdc5718a00ce5cb9c1fa27c8a1ff6893b016455 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Tue, 13 Aug 2024 17:51:29 +0200
 Subject: [PATCH] arch: arm64: dts: green: Improve LED representation
@@ -15,7 +15,7 @@ Co-authored-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index 68d836911e..c3adc59904 100644
+index 68d836911ec..c3adc599049 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -48,16 +48,18 @@

buildroot-external/board/nabucasa/green/patches/uboot/0011-configs-green-fix-bss-and-stack-address-and-disable-.patch

@@ -0,0 +1,93 @@
+From a05b87fa8cd6716a07514c64d8816272418d74e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Fri, 14 Feb 2025 18:09:29 +0100
+Subject: [PATCH] configs: green: fix bss and stack address and disable
+ OF_UPSTREAM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some addresses defined in Green defconfig are wrong after upstream
+changes [1] for Rockchip platform present since U-Boot 2024.04+. Remove
+them to apply upstream changes and disable OF_UPSTREAM, as we don't have
+upstream device tree for Green. Also refresh the defconfig
+
+[1] https://lore.kernel.org/u-boot/20240302191629.322562-1-jonas@kwiboo.se/
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ configs/green_defconfig | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+
+diff --git a/configs/green_defconfig b/configs/green_defconfig
+index 7b5a7056868..1f61c172f01 100644
+--- a/configs/green_defconfig
++++ b/configs/green_defconfig
+@@ -2,27 +2,20 @@ CONFIG_ARM=y
+ CONFIG_SKIP_LOWLEVEL_INIT=y
+ CONFIG_COUNTER_FREQUENCY=24000000
+ CONFIG_ARCH_ROCKCHIP=y
+-CONFIG_TEXT_BASE=0x00a00000
+-CONFIG_SPL_LIBCOMMON_SUPPORT=y
+-CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_NR_DRAM_BANKS=2
+-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
+ CONFIG_SF_DEFAULT_SPEED=24000000
+ CONFIG_SF_DEFAULT_MODE=0x2000
+ CONFIG_DEFAULT_DEVICE_TREE="rk3566-ha-green"
+ CONFIG_ROCKCHIP_RK3568=y
+-CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
+ CONFIG_ROCKCHIP_SPI_IMAGE=y
+ CONFIG_SPL_SERIAL=y
+-CONFIG_SPL_STACK_R_ADDR=0x600000
+ CONFIG_TARGET_NABU_CASA_HA_GREEN_RK3566=y
+-CONFIG_SPL_STACK=0x400000
++CONFIG_SYS_LOAD_ADDR=0xc00800
++CONFIG_SF_DEFAULT_BUS=4
+ CONFIG_DEBUG_UART_BASE=0xFE660000
+ CONFIG_DEBUG_UART_CLOCK=24000000
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI=y
+-CONFIG_SYS_LOAD_ADDR=0xc00800
+ CONFIG_DEBUG_UART=y
+ CONFIG_FIT=y
+ CONFIG_FIT_VERBOSE=y
+@@ -34,12 +27,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-ha-green.dtb"
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ CONFIG_SPL_MAX_SIZE=0x40000
+ CONFIG_SPL_PAD_TO=0x7f8000
+-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+-CONFIG_SPL_BSS_START_ADDR=0x4000000
+-CONFIG_SPL_BSS_MAX_SIZE=0x4000
+ # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+-# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+-CONFIG_SPL_STACK_R=y
+ CONFIG_SPL_SPI_LOAD=y
+ CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
+ CONFIG_SPL_ATF=y
+@@ -54,6 +42,7 @@ CONFIG_CMD_REGULATOR=y
+ # CONFIG_SPL_DOS_PARTITION is not set
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_LIVE=y
++# CONFIG_OF_UPSTREAM is not set
+ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_SPL_REGMAP=y
+@@ -63,16 +52,12 @@ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
+ CONFIG_MISC=y
+ CONFIG_I2C_EEPROM=y
+-CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+ CONFIG_SUPPORT_EMMC_RPMB=y
+-CONFIG_MMC_HS200_SUPPORT=y
+-CONFIG_SPL_MMC_HS200_SUPPORT=y
+ CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_ROCKCHIP=y
+ CONFIG_MMC_SDHCI=y
+ CONFIG_MMC_SDHCI_SDMA=y
+ CONFIG_MMC_SDHCI_ROCKCHIP=y
+-CONFIG_SF_DEFAULT_BUS=4
+ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+ CONFIG_SPI_FLASH_GIGADEVICE=y
+ CONFIG_SPI_FLASH_MACRONIX=y

buildroot-external/board/pc/generic-x86-64/erofs-compress-hints.txt

@@ -0,0 +1,3 @@
+# assumed -zlz4hc,12:lzma,9 for optimal compression
+16384   1 usr/lib/firmware/
+16384   1 usr/lib/modules/

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

@@ -55,24 +55,12 @@ CONFIG_SND_HDA_I915=y
 CONFIG_SND_SOC=m
 
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_CATPT=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-CONFIG_SND_SOC_INTEL_CML_H=m
-CONFIG_SND_SOC_INTEL_CML_LP=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_AVS=m
 CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
 CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
@@ -160,7 +148,6 @@ CONFIG_EDAC_IGEN6=m
 
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=y
 CONFIG_I2C_TINY_USB=m
@@ -175,3 +162,9 @@ CONFIG_BMP280=m
 
 # Required for some PCIe devices such as ath12k
 CONFIG_IRQ_REMAP=y
+
+# Pin control support
+CONFIG_PINCTRL_CANNONLAKE=m
+
+# Network devices
+CONFIG_MARVELL_PHY=m

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

@@ -21,6 +21,8 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMWARE_VMCI=y
 CONFIG_VMWARE_BALLOON=y
 CONFIG_VMWARE_PVSCSI=y
+# VMWare has optional ES1371 sound card emulation
+CONFIG_SND_ENS1371=m
 
 # These options are for LXD Guest Support
 CONFIG_NET_9P=m
@@ -88,6 +90,8 @@ CONFIG_FB_EFI=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 
+CONFIG_DRM_I915=m
+
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
@@ -112,6 +116,7 @@ CONFIG_PCI_HYPERV=m
 CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y
 
+CONFIG_CHELSIO_T4VF=m
 CONFIG_IGBVF=m
 CONFIG_IXGBEVF=m
 CONFIG_I40EVF=m
@@ -125,7 +130,6 @@ CONFIG_I6300ESB_WDT=y
 
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=y
 CONFIG_I2C_TINY_USB=m

buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch

@@ -1,94 +0,0 @@
-From 5712a20822709d1cd744a435eba5d9c8ef91a834 Mon Sep 17 00:00:00 2001
-From: Zachary Michaels <mikezackles@gmail.com>
-Date: Thu, 7 Jan 2021 08:13:11 -0800
-Subject: [PATCH] iwlwifi: Make missed beacon timeout configurable
-
-Makes the beacon timeout a module parameter, allowing the original default (16
-missed beacons) to be kept while also enabling users that experience problems to
-increase the timeout.
-
-See https://bugzilla.kernel.org/show_bug.cgi?id=203709
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/net/wireless/intel/iwlwifi/iwl-drv.c       | 4 ++++
- drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 ++
- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  | 3 ++-
- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       | 1 -
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-index fb5e254757e7..2db7032ea269 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-@@ -1866,6 +1866,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
- 	.power_level = IWL_POWER_INDEX_1,
- 	.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
- 	.enable_ini = ENABLE_INI,
-+	.beacon_timeout = 16,
- 	/* the rest are 0 by default */
- };
- IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
-@@ -1982,6 +1983,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, uint, 0444);
- MODULE_PARM_DESC(enable_ini,
- 		 "0:disable, 1-15:FW_DBG_PRESET Values, 16:enabled without preset value defined,"
- 		 "Debug INI TLV FW debug infrastructure (default: 16)");
-+module_param_named(beacon_timeout, iwlwifi_mod_params.beacon_timeout, uint, 0644);
-+MODULE_PARM_DESC(beacon_timeout,
-+		 "Number of missed beacons before disconnecting (default: 16)");
- 
- /*
-  * set bt_coex_active to true, uCode will do kill/defer
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-index 1cf26ab4f488..ba50b7d21744 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-@@ -63,6 +63,7 @@ enum iwl_uapsd_disable {
-  * @remove_when_gone: remove an inaccessible device from the PCIe bus.
-  * @enable_ini: enable new FW debug infratructure (INI TLVs)
-  * @disable_11be: disable EHT capabilities, default = false.
-+ * @beacon_timeout: number of missed beacons before disconnect, default = 16
-  */
- struct iwl_mod_params {
- 	int swcrypto;
-@@ -86,6 +87,7 @@ struct iwl_mod_params {
- 	bool remove_when_gone;
- 	u32 enable_ini;
- 	bool disable_11be;
-+	u32 beacon_timeout;
- };
- 
- static inline bool iwl_enable_rx_ampdu(void)
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-index 9c97691e6038..56c0f98d12b5 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-@@ -8,6 +8,7 @@
- #include <linux/crc32.h>
- #include <net/mac80211.h>
- #include "iwl-io.h"
-+#include "iwl-modparams.h"
- #include "iwl-prph.h"
- #include "fw-api.h"
- #include "mvm.h"
-@@ -1614,7 +1615,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
- 	 * TODO: the threshold should be adjusted based on latency conditions,
- 	 * and/or in case of a CS flow on one of the other AP vifs.
- 	 */
--	if (rx_missed_bcon > IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG)
-+	if (rx_missed_bcon > iwlwifi_mod_params.beacon_timeout)
- 		iwl_mvm_connection_loss(mvm, vif, "missed beacons");
- 	else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD)
- 		ieee80211_beacon_loss(vif);
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-index 218f3bc31104..4f112ecdf704 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-@@ -41,7 +41,6 @@
- /* RSSI offset for WkP */
- #define IWL_RSSI_OFFSET 50
- #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8
--#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16
- 
- /* A TimeUnit is 1024 microsecond */
- #define MSEC_TO_TU(_msec)	(_msec*1000/1024)

buildroot-external/board/raspberrypi/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u,152d:a583:u
+dwc_otg.lpm_enable=0 console=tty0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u,152d:a583:u,152d:a578:u

buildroot-external/board/raspberrypi/config.txt

@@ -71,6 +71,10 @@ kernel=u-boot.bin
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
 
+[pi3]
+# Added to fix #3965
+initial_turbo=0
+
 [pi4]
 # Enable DRM VC4 V3D driver on top of the dispmanx display stack
 dtoverlay=vc4-fkms-v3d

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

@@ -19,12 +19,9 @@ function hassos_pre_image() {
     else
         cp "${BOARD_DIR}/../cmdline.txt" "${BOOT_DATA}/cmdline.txt"
     fi
-    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/" 2>/dev/null || true
+    if ls "${BINARIES_DIR}"/*.dtbo >/dev/null 2>&1; then
-
+        mkdir -p "${BOOT_DATA}/overlays"
-    # EEPROM update for Raspberry Pi 4/Compute Module 4
+        cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
-    if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
     fi
 
     # Enable 64bit support

buildroot-external/board/raspberrypi/kernel.config

@@ -7,3 +7,18 @@ CONFIG_LOCALVERSION="-haos-raspi"
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=y
+
+# make sure all network drivers are built-in
+# RPi 3B USB LAN drivers - 3B uses SMSC95XX, 3B+ uses LAN78XX
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_LAN78XX=y
+CONFIG_USB_NET_SMSC95XX=y
+# RPi 4 uses bcmgenet driver and BCM54213PE PHY
+CONFIG_BCMGENET=y
+CONFIG_BROADCOM_PHY=y
+# RPi 5 uses Cadence driver and BCM54213PE PHY (above)
+CONFIG_MACB=y
+
+# do not use RPi in-tree driver, use one from BR package instead
+# CONFIG_MEDIA_PCI_HAILO is not set

buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch

@@ -1,4 +1,4 @@
-From e2f2644f306f44e65bb8082bac3c26cb5e699664 Mon Sep 17 00:00:00 2001
+From cc54354a5cd983d27ba3e800cfdf2d8cf70b812f Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 2 Jun 2020 21:20:08 +0000
 Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot
@@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
-index 4a379a14966d8..30f6ccdcef178 100644
+index bb137d8da1a82..cd03157437780 100644
 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
 @@ -128,7 +128,7 @@ rng@7e104000 {
@@ -56,7 +56,7 @@ index 4a379a14966d8..30f6ccdcef178 100644
  			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
 diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
-index 2ca8a2505a4db..6f91c85677d89 100644
+index 562c4e9d08cc0..d10e441b0df53 100644
 --- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
 @@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1-ctsrts-gpio42 {

buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch

@@ -1,4 +1,4 @@
-From 8b7bfad7fda35949975f359c7e207bc57bc765db Mon Sep 17 00:00:00 2001
+From 1c96ac8457c0131f256fe8208946dae548f28d67 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Mon, 15 Apr 2024 14:07:34 +0200
 Subject: [PATCH] USB: storage: Increase maximum length of the quirks string
@@ -16,12 +16,12 @@ Signed-off-by: Jan Čermák <sairon@sairon.cz>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
-index 7b36a3334fb34..9691e6b9fe5aa 100644
+index d36f3b6992bbd..f976f074350bc 100644
 --- a/drivers/usb/storage/usb.c
 +++ b/drivers/usb/storage/usb.c
-@@ -71,7 +71,7 @@ static unsigned int delay_use = 1;
+@@ -165,7 +165,7 @@ static const struct kernel_param_ops delay_use_ops = {
- module_param(delay_use, uint, S_IRUGO | S_IWUSR);
+ module_param_cb(delay_use, &delay_use_ops, &delay_use, 0644);
- MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
+ MODULE_PARM_DESC(delay_use, "time to delay before using a new device");
  
 -static char quirks[128];
 +static char quirks[256];