Bump OS to release version 12.0

With recent change of Azure VM type, the disk layout has changed and
the build of ova target fails with insufficient space. Since there
is now plenty of space on /mnt partition, we can use that, just like
we've been using it for cache for now.

Ref: https://github.com/easimon/maximize-build-space/issues/39#issuecomment-1935591779

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -38,8 +38,10 @@ body:
         - rpi3-64 (Raspberry Pi 3 64-bit OS)
         - rpi4  (Raspberry Pi 4/400 32-bit OS)
         - rpi4-64  (Raspberry Pi 4/400 64-bit OS)
+        - rpi5-64  (Raspberry Pi 5 64-bit OS)
         - tinker (ASUS Tinker Board/Tinker Board S)
         - yellow (Home Assistant Yellow)
+        - green (Home Assistant Green)
       description: >
         Can be found in [Settings -> System -> Repairs -> System Information](https://my.home-assistant.io/redirect/system_health/). It is listed as the `Board` value.
 
@@ -79,10 +81,10 @@ body:
     attributes:
       label: Anything in the Supervisor logs that might be useful for us?
       description: >
-        Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/)
-        then choose `Supervisor` in the top right.
+        Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
+        then choose `Supervisor` in the top right. Alternatively enter `ha supervisor logs` in the Home Assistant CLI.
 
-        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/supervisor_logs/)
+        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
       render: txt
   - type: textarea
     validations:
@@ -90,8 +92,8 @@ body:
     attributes:
       label: Anything in the Host logs that might be useful for us?
       description: >
-        Host Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/)
-        then choose `Host` in the top right.
+        Host Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=host)
+        then choose `Host` in the top right. Alternatively enter `ha host logs` in the Home Assistant CLI.
       render: txt
   - type: textarea
     attributes:

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

@@ -0,0 +1,96 @@
+name: 'Bump RPi Imager OS version'
+description: 'Bump version of Home Assistant OS in RPi Imager'
+inputs:
+  version:
+    required: true
+    description: "Version of Home Assistant OS to bump to."
+  release-date:
+    required: true
+    description: "Release date as ISO 8601 date string."
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      id: validate-input
+      env:
+        INPUTS_DATE: ${{ inputs.release-date }}
+      run: |
+        if [[ -z "$INPUTS_DATE" ]] || [[ ! "$INPUTS_DATE" =~ ^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$ ]]; then
+          echo "::error::Argument 'release-date' must be an ISO 8601 date string."
+          exit 1
+        else
+          echo "date=$(date --date=${INPUTS_DATE} +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
+        fi
+
+    - shell: bash
+      run: git clone --depth 1 https://github.com/home-assistant/version.git /tmp/version
+
+    - shell: bash
+      env:
+        INPUTS_VERSION: ${{ inputs.version }}
+      run: |
+        function bump_entry() {
+          json=$1
+          version=$2
+          release_date=$3
+          image_id=$4
+          image_name=$5
+          url="https://github.com/home-assistant/operating-system/releases/download/${version}/haos_${image_id}-${version}.img.xz"
+          temp_image=$(mktemp --suffix=.img.xz)
+          temp_out=$(mktemp)
+
+          curl -fsL -o "$temp_image" "$url"
+          image_download_size=$(stat --printf="%s" "$temp_image")
+          image_download_sha256=$(sha256sum "$temp_image" | awk '{print $1}')
+          unxz "$temp_image"
+          temp_unpacked="${temp_image%.*}"
+          extract_size=$(stat --printf="%s" "$temp_unpacked")
+          extract_sha256=$(sha256sum "$temp_unpacked" | awk '{print $1}')
+
+          entry_name="Home Assistant OS ${version} (${image_name})"
+
+            jq '
+              . as $data
+              | $data
+              | .os_list = [
+                  .os_list[]
+                  | if .name | test("Home Assistant OS .* \\(" + $image_name + "\\)") then
+                    .name = "Home Assistant OS " + $version + " (" + $image_name + ")"
+                    | .url = $url
+                    | .extract_size = ($extract_size | tonumber)
+                    | .extract_sha256 = $extract_sha256
+                    | .release_date = $release_date
+                    | .image_download_size = ($image_download_size | tonumber)
+                    | .image_download_sha256 = $image_download_sha256
+                  else .
+                  end
+                ]' \
+              --arg version "$version" \
+              --arg image_name "$image_name" \
+              --arg entry_name "$entry_name" \
+              --arg release_date "$release_date" \
+              --arg url "$url" \
+              --arg image_download_size "$image_download_size" \
+              --arg image_download_sha256 "$image_download_sha256" \
+              --arg extract_size "$extract_size" \
+              --arg extract_sha256 "$extract_sha256" \
+              "$json" > "$temp_out"
+
+          mv "$temp_out" "$json"
+          rm -rf "$temp_unpacked" "$temp_out"
+        }
+
+        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"
+
+    - shell: bash
+      env:
+        INPUTS_VERSION: ${{ inputs.version }}
+      run: |
+        cd /tmp/version
+        git commit -am "Bump Home Assistant OS to ${INPUTS_VERSION} for RPi Imager"
+        git push
+
+    - shell: bash
+      run: rm -rf /tmp/version

.github/label-actions.yml

@@ -8,6 +8,7 @@ assume-fixed:
     release. You can find the latest stable release at
     https://github.com/home-assistant/operating-system/releases/latest
   close: true
+  close-reason: not planned
 
 core-issue:
   comment: >
@@ -19,6 +20,19 @@ core-issue:
     repository, the issue might have been reported already. Open a new issue
     in that repository if you can't find a matching issue.
   close: true
+  close-reason: not planned
+
+frontend-issue:
+  comment: >
+    :wave: @{issue-author}, thanks for reporting an issue!
+
+
+    It looks like this issue is related to Home Assistant Frontend. Please
+    check the [Home Assistant Frontend](https://github.com/home-assistant/frontend/issues)
+    repository, the issue might have been reported already. Open a new issue
+    in that repository if you can't find a matching issue.
+  close: true
+  close-reason: not planned
 
 supervisor-issue:
   comment: >
@@ -30,6 +44,7 @@ supervisor-issue:
     repository, the issue might have been reported already. Open a new issue
     in that repository if you can't find a matching issue.
   close: true
+  close-reason: not planned
 
 new-feature:
   comment: >
@@ -41,3 +56,4 @@ new-feature:
     Please check if someone already requested a similar feature, or create
     a new feature request with the "haos" tag in that forum. Thank you!
   close: true
+  close-reason: not planned

.github/release-drafter.yml

@@ -10,6 +10,8 @@ categories:
     label: 'board/raspberrypi'
   - title: 'Home Assistant Yellow'
     label: 'board/yellow'
+  - title: 'Home Assistant Green'
+    label: 'board/green'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
   - title: 'Generic x86-64'

.github/workflows/artifacts-index.yaml

@@ -0,0 +1,93 @@
+name: Update artifacts index
+
+on:
+  # Manual run for specified version
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version of HAOS to build index for
+        required: true
+        type: string
+
+  # Called by other workflows (e.g. build.yaml)
+  workflow_call:
+    inputs:
+      version:
+        description: Version of HAOS to build index for
+        required: true
+        type: string
+    secrets:
+      R2_OS_ARTIFACTS_ID:
+        required: true
+      R2_OS_ARTIFACTS_KEY:
+        required: true
+      R2_OS_ARTIFACTS_BUCKET:
+        required: true
+      R2_OS_ARTIFACTS_ENDPOINT:
+        required: true
+      CF_ZONE:
+        required: true
+      CF_PURGE_TOKEN:
+        required: true
+
+env:
+  PYTHON_VERSION: "3.10"
+
+jobs:
+  build-index:
+    name: Build Home Assistant OS artifacts index
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Setup Python version ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Install AWS CLI
+        run: pip install awscli
+
+      - name: Create build index
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
+        run: |
+          aws s3api list-objects-v2 \
+            --bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
+            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
+            --prefix "${{ inputs.version }}/" \
+            --query 'Contents[].Key' | jq 'map(split("/")[1]) | sort' > "${{ inputs.version }}.json"
+          aws s3 cp \
+            "${{ inputs.version }}.json" \
+            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/indexes/ \
+            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}"
+
+      - name: Regenerate artifacts index
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
+        run: |
+          aws s3api list-objects-v2 \
+            --bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
+            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
+            --prefix "indexes/" \
+            --query 'Contents[].Key' | jq 'map(capture("indexes/(?<version>[[:digit:]].+).json").version) | sort' > .os-artifacts/index.json
+          aws s3 sync \
+            .os-artifacts/ \
+            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/ \
+            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
+
+      - name: Flush CloudFlare cache
+        run: |
+          curl --silent --show-error --fail -X POST \
+            "https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache" \
+            -H "Authorization: Bearer ${{ secrets.CF_PURGE_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            --data '{"files": [
+              "https://os-artifacts.home-assistant.io/index.html",
+              "https://os-artifacts.home-assistant.io/index.json"
+            ] }'

.github/workflows/build.yaml

@@ -0,0 +1,444 @@
+# Home Assistant Operating System build workflow
+
+name: OS build
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      boards:
+        description: 'List of boards to build (comma separated identifiers)'
+        required: false
+        type: string
+      publish:
+        description: 'Publish build artifacts to R2 (not applicable to forks)'
+        required: true
+        type: boolean
+        default: true
+
+env:
+  PYTHON_VERSION: "3.10"
+
+jobs:
+  prepare:
+    name: Prepare build
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      pull-requests: read
+      packages: write
+    outputs:
+      version_dev: ${{ steps.version_dev.outputs.version_dev }}
+      version_main: ${{ steps.version.outputs.version_main }}
+      version_full: ${{ steps.version.outputs.version_full }}
+      channel: ${{ steps.channel.outputs.channel }}
+      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
+        with:
+          persist-credentials: false
+
+      - name: Check if build should be published
+        id: check_publish
+        env:
+          PUBLISH_FLAG: ${{ inputs.publish }}
+        run: |
+          if [ "${{ github.repository }}" == "home-assistant/operating-system" ]; then
+            if [ "${PUBLISH_FLAG}" != "true" ] && [ "${{ github.event_name }}" != "release" ]; then
+              echo "publish_build=false" >> "$GITHUB_OUTPUT"
+            else
+              echo "publish_build=true" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "publish_build=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Generate development version
+        shell: bash
+        id: version_dev
+        if: ${{ github.event_name != 'release' }}
+        env:
+          PUBLISH_BUILD: ${{ steps.check_publish.outputs.publish_build }}
+        run: |
+          version_dev="dev$(date --utc +'%Y%m%d')"
+          if [ "${{ env.PUBLISH_BUILD }}" != "true" ]; then
+            version_dev="dev$(date +%s)"
+          fi
+          echo "Development version \"${version_dev}\""
+          echo "version_dev=${version_dev}" >> $GITHUB_OUTPUT
+
+      - name: Set version suffix
+        if: ${{ github.event_name != 'release' }}
+        env:
+          VERSION_DEV: ${{ steps.version_dev.outputs.version_dev }}
+        run: |
+          sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
+
+      - name: Get version
+        id: version
+        run: |
+          . ${GITHUB_WORKSPACE}/buildroot-external/meta
+          echo "version_main=${VERSION_MAJOR}.${VERSION_MINOR}" >> $GITHUB_OUTPUT
+          if [ -z "${VERSION_SUFFIX}" ]; then
+            version_full="${VERSION_MAJOR}.${VERSION_MINOR}"
+          else
+            version_full="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUFFIX}"
+          fi
+          echo "version_full=${version_full}" >> $GITHUB_OUTPUT
+          echo "Full version number of this release is \"${version_full}\"."
+
+      - name: Validate version
+        id: version_check
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          if [ "${{ steps.version.outputs.version_full }}" != "${{ github.event.release.tag_name }}" ]; then
+            echo "Version number in Buildroot metadata does not match tag (${{ steps.version.outputs.version_full }} vs ${{ github.event.release.tag_name }})."
+            exit 1
+          fi
+
+      - name: Get channel
+        id: channel
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then
+              echo "channel=beta" >> "$GITHUB_OUTPUT"
+            else
+              echo "channel=stable" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "channel=dev" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create build matrix
+        uses: actions/github-script@v7
+        id: generate_matrix
+        with:
+          script: |
+            const boards = require('./.github/workflows/matrix.json')
+            if ("${{ github.event_name }}" == "release") {
+              return { "board": boards }
+            }
+
+            const boardFilter = "${{ github.event.inputs.boards }}"
+            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(","))
+              const buildBoards = boards.filter(b => boardSet.has(b.id))
+              return { "board": buildBoards }
+            }
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v3.0.0
+        with:
+            registry: ghcr.io
+            username: ${{ github.repository_owner }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push
+        uses: docker/build-push-action@v5.1.0
+        id: build_haos_builder
+        with:
+          context: .
+          file: Dockerfile
+          tags: ghcr.io/${{ github.repository_owner }}/haos-builder
+          cache-from: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
+          cache-to: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
+          push: true
+
+      - name: Generate self-signed certificate
+        id: generate_signing_key
+        env:
+          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
+          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
+        if: env.RAUC_CERTIFICATE == '' || env.RAUC_PRIVATE_KEY == ''
+        run: |
+          echo "::warning:: RAUC certificate or key is missing in the repository secrets. Building with a public self-signed certificate!"
+          buildroot-external/scripts/generate-signing-key.sh cert.pem key.pem
+          echo "self_signed_cert=true" >> $GITHUB_OUTPUT
+
+      - name: Create signing key
+        uses: actions/upload-artifact@v4
+        if: steps.generate_signing_key.outcome == 'success'
+        with:
+          name: signing-key
+          path: |
+            cert.pem
+            key.pem
+
+  build:
+    name: Build for ${{ matrix.board.id }}
+    permissions:
+      contents: write  # for actions/upload-release-asset to upload release asset
+    needs: prepare
+    strategy:
+      fail-fast: ${{ github.event_name == 'release' }}
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          persist-credentials: false
+
+      - name: Setup Python version ${{ env.PYTHON_VERSION }}
+        if: ${{ github.event_name != 'release' }}
+        uses: actions/setup-python@v5
+        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
+
+      - name: Set version suffix
+        if: ${{ github.event_name != 'release' }}
+        env:
+          VERSION_DEV: ${{ needs.prepare.outputs.version_dev }}
+        run: |
+          sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
+
+      - name: 'Add release PKI certs'
+        if: ${{ needs.prepare.outputs.self_signed_cert != 'true' }}
+        env:
+          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
+          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
+        run: |
+          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
+          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
+
+      - name: Get self-signed certificate from the prepare job
+        if: ${{ needs.prepare.outputs.self_signed_cert == 'true' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: signing-key
+
+      - name: Free space on build drive
+        run: |
+          # Inspired by https://github.com/easimon/maximize-build-space/blob/v7/action.yml
+          df -h
+          sudo rm -rf /usr/local/lib/android/sdk/ndk
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          sudo mkdir /mnt/cache
+          sudo mkdir /mnt/output
+          WORKSPACE_OWNER="$(stat -c '%U:%G' "${GITHUB_WORKSPACE}")"
+          # output directory is symlinked for easier access from workspace
+          # but for build container it must be mounted as a volume
+          sudo ln -sf /mnt/output "${GITHUB_WORKSPACE}/output"
+          sudo chown -R "${WORKSPACE_OWNER}" /mnt/cache
+          sudo chown -R "${WORKSPACE_OWNER}" /mnt/output
+          df -h
+
+      - name: "Restore cache: object files"
+        uses: actions/cache/restore@v4
+        with:
+          path: /mnt/cache/cc
+          key: haos-cc-${{ matrix.board.id }}
+
+      - name: Build
+        run: |
+          BUILDER_UID="$(id -u)"
+          BUILDER_GID="$(id -g)"
+          docker run --rm --privileged \
+            -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: |
+          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" \
+            ${{ 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' }}
+        working-directory: output/images/
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
+        run: |
+          aws s3 sync \
+            ./ \
+            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/${{ needs.prepare.outputs.version_full }}/ \
+            --exclude "*" \
+            --include "haos_*" \
+            --endpoint-url ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
+
+      - name: Upload release assets
+        if: ${{ github.event_name == 'release' }}
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: output/images/haos_*
+
+      - name: Print cache stats
+        run: |
+          echo "Cache size: $(du -sh /mnt/cache/cc)"
+          echo "Files total: $(find /mnt/cache/cc -mindepth 1 -type f | wc -l)"
+          echo "Old files to remove: $(find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile | wc -l)"
+          find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile -delete
+          echo "Cache size after pruning: $(du -sh /mnt/cache/cc)"
+
+      - name: "Save cache: object files"
+        if: github.ref == 'refs/heads/dev'
+        uses: actions/cache/save@v4
+        with:
+          path: /mnt/cache/cc
+          key: haos-cc-${{ matrix.board.id }}-${{ github.run_id }}
+
+      - name: Generate build summary
+        run: |
+          echo "# ${{ matrix.board.id }} build summary" >> $GITHUB_STEP_SUMMARY
+          echo "## Artifacts" >> $GITHUB_STEP_SUMMARY
+          echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
+          echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
+          for f in output/images/haos_*; do
+            echo "| $(basename $f) | $(du -b $f | cut -f1) | $(du -bh $f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
+          done
+          echo "## Partitions" >> $GITHUB_STEP_SUMMARY
+          echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
+          echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
+          for f in boot.vfat kernel.img rootfs.squashfs overlay.ext4 data.ext4; do
+            echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
+          done
+
+      - name: Upload OS image artifact
+        uses: actions/upload-artifact@v4
+        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
+          path: |
+            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
+
+      - name: Upload RAUC bundle artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' }}
+        with:
+          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
+          path: |
+            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
+
+      - name: Upload Open Virtualization Format (OVA) artifact
+        uses: actions/upload-artifact@v4
+        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
+          path: |
+            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
+
+      - name: Upload QEMU disk image artifact
+        uses: actions/upload-artifact@v4
+        # 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:
+          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
+          path: |
+            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
+        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
+          path: |
+            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
+        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
+          path: |
+            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
+        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
+          path: |
+            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
+
+  test:
+    name: Test OS image
+    needs: [ build, prepare ]
+    uses: ./.github/workflows/test.yaml
+    with:
+      version: ${{ needs.prepare.outputs.version_full }}
+
+  update_index:
+    name: Update artifacts index
+    if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
+    needs: [ build, prepare ]
+    uses: home-assistant/operating-system/.github/workflows/artifacts-index.yaml@dev
+    with:
+      version: ${{ needs.prepare.outputs.version_full }}
+    secrets:
+      R2_OS_ARTIFACTS_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
+      R2_OS_ARTIFACTS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
+      R2_OS_ARTIFACTS_BUCKET: ${{ secrets.R2_OS_ARTIFACTS_BUCKET }}
+      R2_OS_ARTIFACTS_ENDPOINT: ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
+      CF_ZONE: ${{ secrets.CF_ZONE }}
+      CF_PURGE_TOKEN: ${{ secrets.CF_PURGE_TOKEN }}
+
+  bump_version:
+    name: Bump ${{ needs.prepare.outputs.channel }} channel version
+    if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' }}
+    environment: ${{ needs.prepare.outputs.channel }}
+    needs: [ build, prepare ]
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout source
+      uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+
+    - name: Initialize git
+      uses: home-assistant/actions/helpers/git-init@master
+      with:
+        name: ${{ secrets.GIT_NAME }}
+        email: ${{ secrets.GIT_EMAIL }}
+        token: ${{ secrets.GIT_TOKEN }}
+
+    - name: Bump Home Assistant OS ${{ needs.prepare.outputs.channel }} channel version
+      uses: home-assistant/actions/helpers/version-push@master
+      with:
+        key: "hassos[]"
+        key-description: "Home Assistant OS"
+        version: ${{ needs.prepare.outputs.version_full }}
+        channel: ${{ needs.prepare.outputs.channel }}
+
+    - name: Bump Home Assistant OS beta channel version on stable release
+      if: ${{ needs.prepare.outputs.channel == 'stable' }}
+      uses: home-assistant/actions/helpers/version-push@master
+      with:
+        key: "hassos[]"
+        key-description: "Home Assistant OS"
+        version: ${{ needs.prepare.outputs.version_full }}
+        channel: beta
+
+    - name: Bump stable Home Assistant version for RPi Imager
+      if: ${{ github.event_name == 'release' && needs.prepare.outputs.channel == 'stable' }}
+      uses: "./.github/actions/bump-rpi-imager-version"
+      with:
+        version: ${{ needs.prepare.outputs.version_full }}
+        release-date: ${{ github.event.release.published_at }}

.github/workflows/dev.yml

@@ -1,143 +0,0 @@
-# Home Assistant Operating System build workflow
-
-name: Development build
-
-on:
-  workflow_dispatch:
-  pull_request_target:
-    types: [opened,synchronize,labeled]
-
-jobs:
-  prepare:
-    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
-    name: Prepare build
-    runs-on: [ "ubuntu-20.04" ]
-    permissions:
-      contents: read
-      pull-requests: read
-    outputs:
-      version_main: ${{ steps.version_main.outputs.version_main }}
-      version_dev: ${{ steps.version_dev.outputs.version_dev }}${{ steps.version_pr.outputs.version_pr }}
-      matrix: ${{ steps.generate_matrix.outputs.result }}
-    steps:
-      - name: Generate Development build version
-        shell: bash
-        id: version_dev
-        run: |
-          version_dev="dev$(date --utc +'%Y%m%d')"
-          echo "Development version \"${version_dev}\""
-          echo "version_dev=${version_dev}" >> $GITHUB_OUTPUT
-      - name: Generate Development build version for PR
-        if: ${{ github.event.pull_request }}
-        shell: bash
-        id: version_pr
-        run: |
-          version_pr=$(printf "%05d" ${{ github.event.pull_request.number }})
-          echo "Development build for PR #${{ github.event.pull_request.number }}"
-          echo "version_pr=${version_pr}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3
-      - name: Get Major/Minor version
-        id: version_main
-        run: |
-          major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
-          build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
-          echo "version_main=${major}.${build}" >> $GITHUB_OUTPUT
-      - name: Create build matrix
-        uses: actions/github-script@v6
-        id: generate_matrix
-        with:
-          script: |
-            const boards = require('./.github/workflows/matrix.json')
-
-            if (context.eventName == "workflow_dispatch") {
-              console.log("Run full build for all boards")
-              return { "board": boards }
-            }
-
-            const labels = context.payload.pull_request.labels.map(l => l.name)
-            const labelsSet = new Set(labels)
-            const buildBoards = boards.filter(b => labelsSet.has(b.label))
-
-            return { "board": buildBoards }
-
-  build:
-    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
-    name: Development build for ${{ matrix.board.id }}
-    environment: "dev_build"
-    needs: prepare
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
-    runs-on: ${{ matrix.board.runner }}
-
-    steps:
-      - name: Define git reference
-        uses: actions/github-script@v6
-        id: generate_gitref
-        with:
-          script: |
-            if (context.eventName == "workflow_dispatch")
-              return { "ref": context.ref }
-            return { "ref": context.payload.pull_request.head.sha }
-
-      - name: Checkout source
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          persist-credentials: false
-          ref: ${{ fromJSON(steps.generate_gitref.outputs.result).ref }}
-
-      - name: Build container
-        run: docker build -t haos-builder .
-
-      - name: 'Add release PKI certs'
-        env:
-          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
-          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
-        run: |
-          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
-          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
-
-      - name: Build
-        run: |
-          BUILDER_UID="$(id -u)"
-          BUILDER_GID="$(id -g)"
-          docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
-            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
-            -v "${{ matrix.board.runner }}-build-cache:/cache" \
-            -v "/build/output" \
-            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}
-
-      - name: Upload images
-        uses: burnett01/rsync-deployments@5.2
-        with:
-          rsh: -q
-          switches: -aW
-          path: release/
-          remote_path: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}/
-          remote_host: ${{ secrets.DEV_HOST }}
-          remote_port: ${{ secrets.DEV_PORT }}
-          remote_user: ${{ secrets.DEV_USERNAME }}
-          remote_key: ${{ secrets.DEV_SSH_KEY }}
-
-  bump_version:
-    name: Bump dev channel version
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [ build, prepare ]
-    runs-on: [ "ubuntu-20.04" ]
-
-    steps:
-    - name: Initialize git
-      uses: home-assistant/actions/helpers/git-init@master
-      with:
-        name: ${{ secrets.GIT_NAME }}
-        email: ${{ secrets.GIT_EMAIL }}
-        token: ${{ secrets.GIT_TOKEN }}
-
-    - name: Bump Home Assistant OS dev channel version to ${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}
-      uses: home-assistant/actions/helpers/version-push@master
-      with:
-        key: "hassos[]"
-        key-description: "Home Assistant OS"
-        version: ${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}
-        channel: "dev"

.github/workflows/label-actions.yml

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

.github/workflows/matrix.json

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

.github/workflows/pr-checks.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true
 
@@ -21,7 +21,7 @@ jobs:
     - name: Check shell scripts
       uses: ludeeus/action-shellcheck@2.0.0
       with:
-        ignore: buildroot
+        ignore_paths: buildroot
 
     - name: Check buildroot-external packages
       run: |

.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@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,176 +0,0 @@
-# Home Assistant Operating System release build workflow
-
-name: Release build
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  validate_release:
-    name: Validate release
-    runs-on: [ "ubuntu-20.04" ]
-    outputs:
-      version: ${{ steps.version_check.outputs.version }}
-      version_dev: ${{ steps.version_check.outputs.version_dev }}
-      matrix: ${{ steps.generate_matrix.outputs.result }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Validate version
-        id: version_check
-        run: |
-          major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
-          build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
-          tag_major=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 1)
-          tag_build=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 2)
-          tag_dev=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 3)
-          if [ "${major}.${build}" != "${tag_major}.${tag_build}" ]; then
-            echo "Version number in Buildroot metadata is does not match tag (${major}.${build} vs ${{ github.event.release.tag_name }})."
-            exit 1
-          fi
-          if [ "" != "${tag_dev}" ]; then
-            echo "version=${major}.${build}.${tag_dev}" >> $GITHUB_OUTPUT
-          else
-            echo "version=${major}.${build}" >> $GITHUB_OUTPUT
-          fi
-          echo "version_dev=${tag_dev}" >> $GITHUB_OUTPUT
-      - name: Create build matrix
-        uses: actions/github-script@v6
-        id: generate_matrix
-        with:
-          script: |
-            const boards = require('./.github/workflows/matrix.json')
-            return { "board": boards }
-
-  build:
-    permissions:
-      contents: write  # for actions/upload-release-asset to upload release asset
-    name: Release build for ${{ matrix.board.id }}
-    needs: validate_release
-    strategy:
-      matrix: ${{ fromJson(needs.validate_release.outputs.matrix) }}
-    runs-on: ${{ matrix.board.runner }}
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Build container
-        run: docker build -t haos-builder .
-
-      - name: 'Add release PKI certs'
-        env:
-          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
-          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
-        run: |
-          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
-          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
-
-      - name: Build
-        run: |
-          BUILDER_UID="$(id -u)"
-          BUILDER_GID="$(id -g)"
-          docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
-            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
-            -v "${{ matrix.board.runner }}-build-cache:/cache" \
-            -v "/build/output" \
-            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.defconfig }}
-
-      - name: Upload disk image
-        if: ${{ matrix.board.id != 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload rauc update
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_content_type: application/octet-stream
-
-      - name: Upload ova image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_content_type: application/x-tar
-
-      - name: Upload qcow2 image
-        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload vdi image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
-          asset_content_type: application/zip
-
-      - name: Upload vhdx image
-        if: ${{ matrix.board.id == 'ova' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
-          asset_content_type: application/zip
-
-      - name: Upload vmdk image
-        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
-          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
-          asset_content_type: application/zip
-
-  bump_version:
-    name: Bump dev version to ${{ needs.validate_release.outputs.version }}
-    needs: [ build, validate_release ]
-    runs-on: [ "ubuntu-20.04" ]
-
-    steps:
-    - name: Initialize git
-      uses: home-assistant/actions/helpers/git-init@master
-      with:
-        name: ${{ secrets.GIT_NAME }}
-        email: ${{ secrets.GIT_EMAIL }}
-        token: ${{ secrets.GIT_TOKEN }}
-
-    - name: Bump Home Assistant OS beta version
-      uses: home-assistant/actions/helpers/version-push@master
-      with:
-        key: "hassos[]"
-        key-description: "Home Assistant OS"
-        version: ${{ needs.validate_release.outputs.version }}
-        channel: "beta"

.github/workflows/stale.yml

@@ -3,7 +3,7 @@ name: Stale
 # yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: "0 * * * *"
+    - cron: "40 5 * * *"
   workflow_dispatch:
 
 jobs:
@@ -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@v7.0.0
+        uses: actions/stale@v9.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

.github/workflows/test.yaml

@@ -0,0 +1,98 @@
+name: Test HAOS image
+run-name: "Test HAOS ${{ inputs.version || format('(OS build #{0})', github.event.workflow_run.run_number) }}"
+
+on:
+  # Manual test of specified version
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version of HAOS to test
+        required: true
+        type: string
+
+  # Called by other workflows (e.g. build.yaml)
+  workflow_call:
+    inputs:
+      use-artifact:
+        # Workaround for GH weirdness: https://github.com/actions/runner/discussions/1884
+        description: Download OS image using actions/download-artifact
+        required: false
+        type: boolean
+        default: true
+      version:
+        description: Version of HAOS to test (as used in the name of the qcow2 image artifact)
+        required: true
+        type: string
+
+jobs:
+  test:
+    if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
+
+    env:
+      NO_KVM: 1
+
+    name: Test in QEMU
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Install system dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y qemu-system-x86 ovmf
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Install Python requirements
+        run:
+          pip install -r tests/requirements.txt
+
+      - name: Download HAOS image
+        if: ${{ !inputs.use-artifact }}
+        run: |
+          curl -sfL -o haos.qcow2.xz  https://os-artifacts.home-assistant.io/${{github.event.inputs.version}}/haos_ova-${{github.event.inputs.version}}.qcow2.xz
+
+      - name: Get OS image artifact
+        if: ${{ inputs.use-artifact }}
+        uses: actions/download-artifact@v4
+        with:
+          name: haos_ova-${{ inputs.version }}.qcow2.xz
+
+      - name: Extract OS image
+        run: |
+          xz -dc haos*.qcow2.xz > tests/haos.qcow2
+          rm haos*.qcow2.xz
+
+      - name: Run tests
+        run: |
+          ./tests/run_tests.sh
+
+      - name: Archive logs
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: logs
+          path: |
+            tests/lg_logs/**
+
+      - name: Archive JUnit reports
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: junit_reports
+          path: |
+            tests/junit_reports/*.xml
+
+      - name: Publish test report
+        uses: mikepenz/action-junit-report@v4
+        if: always()
+        with:
+          report_paths: 'tests/junit_reports/*.xml'
+          annotate_only: true
+          detailed_summary: true

.gitignore

@@ -9,4 +9,4 @@ output*/
 *.pem
 
 # vscode generated files
-.vscode*
+.vscode*

.os-artifacts/index.html

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Home Assistant OS - development builds</title>
+        <link rel="shortcut icon" href="https://brands.home-assistant.io/homeassistant/icon.png">
+        <style>
+            body {
+                font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+            }
+
+            .error {
+                color: maroon;
+            }
+            </style>
+    </head>
+    <body>
+        <h1>Home Assistant OS - development builds</h1>
+        <select id="os-builds"></select>
+        <div id="os-builds-list"></div>
+        <script>
+            const buildSelect = document.getElementById('os-builds');
+            const osBuildsList = document.getElementById('os-builds-list');
+
+            const fillVersions = async () => {
+                try {
+                    const response = await fetch('/index.json');
+                    if (!response.ok) {
+                        const p = document.createElement('p');
+                        p.className = "error";
+                        p.textContent = "Could not load version index file.";
+                        osBuildsList.appendChild(p);
+                        return;
+                    }
+                    const items = await response.json();
+                    items.reverse();
+
+                    items.forEach(buildVersion => {
+                        buildSelect.appendChild(new Option(buildVersion, buildVersion));
+                    });
+
+                    buildSelect.dispatchEvent(new Event('change'));
+                } catch (error) {
+                    console.error('Error fetching data:', error);
+                }
+            }
+
+            buildSelect.addEventListener('change', async function() {
+                osBuildsList.innerHTML = '';
+
+                const buildVersion = this.value;
+
+                try {
+                    const response = await fetch(`/indexes/${buildVersion}.json`);
+                    if (!response.ok) {
+                        const p = document.createElement('p');
+                        p.className = "error";
+                        p.textContent = `Could not load index file for version ${buildVersion}.`;
+                        osBuildsList.appendChild(p);
+                        return;
+                    }
+                    const images = await response.json();
+
+                    const ul = document.createElement('ul');
+                    images.forEach(image => {
+                        const li = document.createElement('li');
+                        const a = document.createElement('a');
+                        a.href =`/${buildVersion}/${image}`;
+                        a.textContent = image;
+                        li.appendChild(a);
+                        ul.appendChild(li);
+                    });
+
+                    osBuildsList.appendChild(ul);
+                } catch (error) {
+                    console.error('Error fetching images:', error);
+                }
+            });
+
+            fillVersions();
+        </script>
+    </body>
+</html>

Dockerfile

@@ -12,8 +12,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gpg \
         dirmngr \
         software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/docker.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/docker.gpg] \
+        https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list \
     && apt-get update && apt-get install -y --no-install-recommends \
         docker-ce \
     && rm -rf /var/lib/apt/lists/*

Documentation/boards/README.md

@@ -5,27 +5,24 @@
 The following boards/devices are supported:
 
 - Raspberry Pi
-  - Pi 4 Model B (1 GB, 2 GB, 4 GB and 8 GB model) 64-bit (recommended)
-  - Pi 4 Model B (1 GB, 2 GB, 4 GB and 8 GB model) 32-bit
-  - Pi 3 Model B and B+ 64-bit (recommended)
-  - Pi 3 Model B and B+ 32-bit
-  - Pi 2 (not recommended)
-  - Pi Zero-W (not recommended)
-  - Pi (not recommended)
+  - 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
-  - ODROID-C4
-  - ODROID-M1
-  - ODROID-N2
-  - ODROID-N2+
-  - ODROID-XU4
+  - [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-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
+  - [Tinker Board](https://tinker-board.asus.com/product/tinker-board.html)
 - Generic x86-64 (UEFI, not suited for virtualization)
-  - Intel NUC5CPYH
-  - Intel NUC6CAYH
-  - Intel NUC10I3FNK2
-  - Gigabyte GB-BPCE-3455
+  - [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
@@ -41,6 +38,7 @@ Notes:
 
 |Board|Build|Config|Docs|
 |-----|----|------|----|
+|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/)|

Documentation/boards/hardkernel/odroid-m1.md

@@ -8,9 +8,20 @@ SD-card boot is supported via on-board bootloader (SPL) or recovery button.
 
 ## eMMC
 
-eMMC boot is currently only supported via recovery button. eMMC boot via
-on-board bootloader will require an update of Petitboot (as of March 13 2023,
-this update hasn't been released yet.
+eMMC boot via on-board bootloader requires the latest version of Petitboot
+(spiboot 20230328). To install the latest version download the SPI boot image
+from [linuxfactory.or.kr][1] as follows:
+
+1. Download `spiupdate_odroidm1_20220304.img.xz`
+2. Use balenaEtcher or another tool to flash the updater onto an SD card
+3. Download `spiboot-20230328.img`
+4. Rename the `spiboot-20230328.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 20230328 in the top right 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
 
@@ -24,8 +35,8 @@ 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 future releases also on the eMMC). This mechanism allows you to boot the Home
-Assistant OS U-Boot without pressing the recovery button.
+(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
 
@@ -35,3 +46,5 @@ 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/raspberrypi/README.md

@@ -4,10 +4,10 @@
 
 | Device              | Release Date  | Support         | Config             |
 |---------------------|---------------|-----------------|--------------------|
-| Raspberry Pi B/B+/A+|2012/2014/2014 | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig)              |
 | 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
 

Documentation/kernel.md

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

Documentation/network.md

@@ -188,6 +188,6 @@ If you now view the default connection `cat /etc/NetworkManager/system-connectio
 
 Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.
 
-[nm-manual]: https://developer.gnome.org/NetworkManager/stable/manpages.html
+[nm-manual]: https://networkmanager.dev/docs/api/1.40/manpages.html
 [configuration-usb]: configuration.md
-[uuid]: https://www.uuidgenerator.net/
+[uuid]: https://www.uuidgenerator.net/version4

Makefile

@@ -1,11 +1,8 @@
 BUILDDIR:=$(shell pwd)
-RELEASE_DIR = $(BUILDDIR)/release
 
 BUILDROOT=$(BUILDDIR)/buildroot
 BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
 DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
-VERSION_DATE := $(shell date --utc +'%Y%m%d')
-VERSION_DEV := "dev$(VERSION_DATE)"
 
 TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
 TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
@@ -23,9 +20,6 @@ endif
 
 all: $(TARGETS)
 
-$(RELEASE_DIR):
-	mkdir -p $(RELEASE_DIR)
-
 savedefconfig:
 	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "savedefconfig"
@@ -34,10 +28,9 @@ $(TARGETS_CONFIG): %-config:
 	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
 
-$(TARGETS): %: $(RELEASE_DIR) %-config
+$(TARGETS): %: %-config
 	@echo "build $@"
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
-	cp -f $(O)/images/haos_* $(RELEASE_DIR)/
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
 
 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)

README.md

@@ -2,7 +2,7 @@
 
 Home Assistant Operating System (formerly HassOS) is a Linux based operating system optimized to host [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).
 
-Home Assistant Operating System uses Docker as Container engine. It by default deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.
+Home Assistant Operating System uses Docker as its container engine. By default it deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.
 
 ## Features
 
@@ -55,4 +55,4 @@ The Home Assistant Operating System documentation can be found on the [Home Assi
 
 The Development build GitHub Action Workflow is a manually triggered workflow
 which creates Home Assistant OS development builds. The development builds are
-available at [os-builds.home-assistant.io](https://os-builds.home-assistant.io/).
+available at [https://os-artifacts.home-assistant.io/index.html](https://os-artifacts.home-assistant.io/index.html).

buildroot-external/board/arm-uefi/generic-aarch64/grub.cfg

@@ -60,7 +60,7 @@ fi
 
 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID
 
-default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=$MACHINE_ID fsck.repair=yes $boot_condition"
+default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 systemd.machine_id=$MACHINE_ID fsck.repair=yes $boot_condition"
 file_env -f ($root)/cmdline.txt cmdline
 
 # root is a full HDD/partition definition in GRUB format like hd0,gpt1

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

@@ -1,17 +1,43 @@
 CONFIG_EFI_STUB=y
 
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+
+CONFIG_CONNECTOR=y
+
+CONFIG_VSOCKETS=y
+
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_BLK_SCSI=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_SCSI_VIRTIO=y
-CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_CRYPTO_ENGINE=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+
+# options for backward compatibility
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+
+# These options are needed for virtio-fs
+CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
+CONFIG_DAX=y
+CONFIG_FS_DAX=y
+CONFIG_ZONE_DEVICE=y
+
+CONFIG_DMI_SYSFS=m
+CONFIG_FW_CFG_SYSFS=m
 
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
@@ -19,7 +45,6 @@ CONFIG_NVME_HWMON=y
 
 CONFIG_DRM_VIRTIO_GPU=m
 
-CONFIG_HYPERVISOR_GUEST=y
 CONFIG_HYPERV=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m

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

@@ -19,8 +19,7 @@ function hassos_pre_image() {
     # SPL
     create_spl_image
 
-    dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
+    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 

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

@@ -1,5 +1,4 @@
-From 3553f8a938dbb498aa1846a37ea343b7f53739da Mon Sep 17 00:00:00 2001
-Message-Id: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From b4d676729c5bee4b9adb85362f6f2e32f833b6c2 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
@@ -7,13 +6,13 @@ Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
 
 This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
 ---
- arch/arm/boot/dts/rk3288.dtsi | 8 --------
+ arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 --------
  1 file changed, 8 deletions(-)
 
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 487b0e03d4b4..1569b1824c89 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
+index cb9cdaddffd4..51f1273d6beb 100644
+--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
++++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
 @@ -378,8 +378,6 @@ uart0: serial@ff180000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
@@ -50,6 +49,3 @@ index 487b0e03d4b4..1569b1824c89 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart4_xfer>;
  		status = "disabled";
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 695638c05c0bb6f7bcc65e172dd132b3aa280b47 Mon Sep 17 00:00:00 2001
-Message-Id: <695638c05c0bb6f7bcc65e172dd132b3aa280b47.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From 02c7d9bb23f497993d52f5a41341ed955e6a2745 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
@@ -17,13 +14,13 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
 [move change to rk3288-tinker.dtsi]
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 19 +++++++++++++++++++
+ arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 index 09618bb7d872..30430d2e64b9 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
++++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -483,6 +483,25 @@ &sdio0 {
  	status = "okay";
  };
@@ -50,6 +47,3 @@ index 09618bb7d872..30430d2e64b9 100644
  &tsadc {
  	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
  	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From d04122215cb56b57458e05b475e41744b8126533 Mon Sep 17 00:00:00 2001
-Message-Id: <d04122215cb56b57458e05b475e41744b8126533.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From bf7869033cf3caa50912cbdfa548428a6571c104 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
@@ -10,13 +7,13 @@ Enable I2C devices which are accessible via 40-pin header.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 8 ++++++++
+ arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 index 30430d2e64b9..395afc2b2283 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+--- 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 {
  	};
  };
@@ -36,6 +33,3 @@ index 30430d2e64b9..395afc2b2283 100644
  &i2c5 {
  	status = "okay";
  };
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 7d37754f29c379c5066c6abf38c8d01d654b1613 Mon Sep 17 00:00:00 2001
-Message-Id: <7d37754f29c379c5066c6abf38c8d01d654b1613.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From a0ef6a86e96920a9cf703d8c65d0126494037d37 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
@@ -13,13 +10,13 @@ This patch is taken from the patches provided by the ARMbian team.
 
 Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
 ---
- arch/arm/boot/dts/rk3288.dtsi | 2 +-
+ arch/arm/boot/dts/rockchip/rk3288.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 1569b1824c89..478fd1bb85df 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
+index 51f1273d6beb..d8663928bfe2 100644
+--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
++++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
 @@ -311,7 +311,7 @@ spi2: spi@ff130000 {
  		dma-names = "tx", "rx";
  		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -29,6 +26,3 @@ index 1569b1824c89..478fd1bb85df 100644
  		reg = <0x0 0xff130000 0x0 0x1000>;
  		#address-cells = <1>;
  		#size-cells = <0>;
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 05fde1d1dbbe7805a58a8c445b8fb19e0df59826 Mon Sep 17 00:00:00 2001
-Message-Id: <05fde1d1dbbe7805a58a8c445b8fb19e0df59826.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From e828e0fc2be98e5ad20c93981681505fc97b063b 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
@@ -10,13 +7,13 @@ Taken from the various patches provided by @TonyMac32 .
 
 Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
 ---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +-
+ arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 index 395afc2b2283..c7e79e594720 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+--- 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 {
  				regulator-always-on;
  				regulator-boot-on;
@@ -26,6 +23,3 @@ index 395afc2b2283..c7e79e594720 100644
  				regulator-name = "vdd_arm";
  				regulator-ramp-delay = <6000>;
  				regulator-state-mem {
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 940d61e1e04929166d5a2bcbc1934aa931952ca5 Mon Sep 17 00:00:00 2001
-Message-Id: <940d61e1e04929166d5a2bcbc1934aa931952ca5.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From ad1ffd6be5f54a0871e3c303602548687dfe0ffc 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
@@ -24,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 2a99f15f527f..181718374429 100644
+index b07190ba4b7a..0badaa1b404e 100644
 --- a/drivers/mmc/host/dw_mmc-rockchip.c
 +++ b/drivers/mmc/host/dw_mmc-rockchip.c
 @@ -12,6 +12,11 @@
@@ -114,6 +111,3 @@ index 2a99f15f527f..181718374429 100644
  
  	return 0;
  }
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 479e2acb95c09b15382b3766391294790ebd200b Mon Sep 17 00:00:00 2001
-Message-Id: <479e2acb95c09b15382b3766391294790ebd200b.1676488094.git.stefan@agner.ch>
-In-Reply-To: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
-References: <3553f8a938dbb498aa1846a37ea343b7f53739da.1676488094.git.stefan@agner.ch>
+From 4e6c3d013c847f199664a3075934f5ca52d8cba4 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
@@ -11,13 +8,13 @@ for Realtek rtl8723bs Bluetooth device.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 26 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 26 +++++++++++++++++++
  1 file changed, 26 insertions(+)
 
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 index c7e79e594720..5d261fae6e72 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+--- 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 {
  		};
  	};
@@ -58,6 +55,3 @@ index c7e79e594720..5d261fae6e72 100644
  };
  
  &uart1 {
--- 
-2.39.1
-

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

@@ -0,0 +1,32 @@
+From f597ec583c262ed4c3264ddf661e22b503fb8a11 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
+
+Converted to git-series patch from the original plain git diff file
+buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch
+
+Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
+---
+ sound/usb/card.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/sound/usb/card.c b/sound/usb/card.c
+index 1b2edc0fd2e9..3069ac5b6759 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,
+ 	}
+ 
+ 	strim(card->shortname);
++
++	/* Tinker Board ALC4040 CODEC	*/
++
++	if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
++		USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
++			strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
++	}
++	
+ }
+ 
+ static void usb_audio_make_longname(struct usb_device *dev,

buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch

@@ -1,19 +0,0 @@
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 2bfe4e80a..cea93aaf5 100644
---- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -382,6 +382,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
- 	}
- 
- 	strim(card->shortname);
-+
-+	/* Tinker Board ALC4040 CODEC	*/
-+
-+	if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
-+		USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
-+			strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
-+	}
-+	
- }
- 
- static void usb_audio_make_longname(struct usb_device *dev,

buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch

@@ -1,37 +0,0 @@
-From 966cd1782632bc8279667955ec315e93c89495e6 Mon Sep 17 00:00:00 2001
-Message-Id: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH 1/2] SPL: modify load address of U-Boot
-
-Default load address of U-Boot is at sector 16384, which is where HAOS
-has its first partition. Use 0x2000 (8192) instead.
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- configs/tinker-rk3288_defconfig   | 1 +
- configs/tinker-s-rk3288_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index a9c9a122f6..b839fdb570 100644
---- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -92,3 +92,4 @@ CONFIG_VIDEO_ROCKCHIP=y
- CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
-diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
-index f367c9370f..c52b0753ec 100644
---- a/configs/tinker-s-rk3288_defconfig
-+++ b/configs/tinker-s-rk3288_defconfig
-@@ -94,3 +94,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CONSOLE_SCROLL_LINES=10
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
--- 
-2.35.1
-

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

@@ -1,10 +1,7 @@
-From 98674c65a6595e7ac554f7ec9d6f0228556756f6 Mon Sep 17 00:00:00 2001
-Message-Id: <98674c65a6595e7ac554f7ec9d6f0228556756f6.1645627366.git.stefan@agner.ch>
-In-Reply-To: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
-References: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
+From defc964eaa9f4ccc9cd1568ade4e4d81f35b9e07 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
-Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup
+Subject: [PATCH] pmic: enable LDO2 vcc33_mipi at bootup
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -64,5 +61,5 @@ index f85209c649..6fa1bb0c66 100644
 +}
 +#endif
 -- 
-2.35.1
+2.43.0
 

buildroot-external/board/asus/tinker/uboot-boot.ush

@@ -20,7 +20,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"

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

@@ -1,3 +1,6 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SPL_PAD_TO=0x3f8000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
+# CONFIG_ENV_IS_IN_MMC is not set

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

@@ -22,7 +22,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"

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

@@ -22,7 +22,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"

buildroot-external/board/hardkernel/odroid-m1/hassos-hook.sh

@@ -14,8 +14,7 @@ function hassos_pre_image() {
     # SPL
     create_spl_image
 
-    dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-    dd if="${BINARIES_DIR}/u-boot.itb" of="${SPL_IMG}" conv=notrunc bs=512 seek=16384
+    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 

buildroot-external/board/hardkernel/odroid-m1/kernel.config

@@ -1,3 +1,4 @@
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 
 CONFIG_THERMAL_GOV_BANG_BANG=y
@@ -7,3 +8,5 @@ CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_GPIO_POLLED=y
 
 CONFIG_MMC_SDHCI_OF_DWCMSHC=y
+
+# CONFIG_DW_WATCHDOG is not set

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

@@ -1,38 +0,0 @@
-From 24048c1753916bd983746542b16d19d2b399eeb7 Mon Sep 17 00:00:00 2001
-Message-Id: <24048c1753916bd983746542b16d19d2b399eeb7.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:36 +0200
-Subject: [PATCH] arm64: dts: rockchip: add thermal support to ODROID-M1
-
-Add the thermal nodes for the ODROID-M1.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-4-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index b3016437640b..112c65af3f55 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -409,6 +409,12 @@ &sdmmc0 {
- 	status = "okay";
- };
- 
-+&tsadc {
-+	rockchip,hw-tshut-mode = <1>;
-+	rockchip,hw-tshut-polarity = <0>;
-+	status = "okay";
-+};
-+
- &uart2 {
- 	status = "okay";
- };
--- 
-2.39.2
-

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

@@ -1,103 +0,0 @@
-From 982bb2beab8e38a7c0a365770be2ad9c5221a650 Mon Sep 17 00:00:00 2001
-Message-Id: <982bb2beab8e38a7c0a365770be2ad9c5221a650.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:37 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add NOR flash to ODROID-M1
-
-Enable the Rockchip Serial Flash Controller for the ODROID-M1 and add
-the corresponding SPI NOR flash entry. The SFC is used in dual I/O mode
-and not quad I/O mode, as the FSPI_D2 pin is shared with the EMMC_RSTn
-pin.
-
-The partitions addresses and sizes are taken from the ODROID-M1
-Partition Table page on the ODROID wiki.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-5-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 58 +++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 112c65af3f55..94e839c9afab 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -351,6 +351,20 @@ rgmii_phy0: ethernet-phy@0 {
- };
- 
- &pinctrl {
-+	fspi {
-+		fspi_dual_io_pins: fspi-dual-io-pins {
-+			rockchip,pins =
-+				/* fspi_clk */
-+				<1 RK_PD0 1 &pcfg_pull_none>,
-+				/* fspi_cs0n */
-+				<1 RK_PD3 1 &pcfg_pull_none>,
-+				/* fspi_d0 */
-+				<1 RK_PD1 1 &pcfg_pull_none>,
-+				/* fspi_d1 */
-+				<1 RK_PD2 1 &pcfg_pull_none>;
-+		};
-+	};
-+
- 	leds {
- 		led_power_pin: led-power-pin {
- 			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-@@ -409,6 +423,50 @@ &sdmmc0 {
- 	status = "okay";
- };
- 
-+&sfc {
-+	/* Dual I/O mode as the D2 pin conflicts with the eMMC */
-+	pinctrl-0 = <&fspi_dual_io_pins>;
-+	pinctrl-names = "default";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <100000000>;
-+		spi-rx-bus-width = <2>;
-+		spi-tx-bus-width = <1>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "SPL";
-+				reg = <0x0 0xe0000>;
-+			};
-+			partition@e0000 {
-+				label = "U-Boot Env";
-+				reg = <0xe0000 0x20000>;
-+			};
-+			partition@100000 {
-+				label = "U-Boot";
-+				reg = <0x100000 0x200000>;
-+			};
-+			partition@300000 {
-+				label = "splash";
-+				reg = <0x300000 0x100000>;
-+			};
-+			partition@400000 {
-+				label = "Filesystem";
-+				reg = <0x400000 0xc00000>;
-+			};
-+		};
-+	};
-+};
-+
- &tsadc {
- 	rockchip,hw-tshut-mode = <1>;
- 	rockchip,hw-tshut-polarity = <0>;
--- 
-2.39.2
-

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

@@ -1,102 +0,0 @@
-From ae25f92a09abb7dd16a9ad3b74e0c105b385f214 Mon Sep 17 00:00:00 2001
-Message-Id: <ae25f92a09abb7dd16a9ad3b74e0c105b385f214.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:38 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add analog audio on ODROID-M1
-
-On the ODROID-M1, the I2S1 TDM controller is connected to the rk809
-codec in I2S mode. It is used to provide a stereo headphones output and
-a mono speaker output. A GPIO with an external pullup is used as an
-headphone detection input.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-6-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 43 ++++++++++++++++++-
- 1 file changed, 42 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 94e839c9afab..634c1bd80b4e 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -59,6 +59,31 @@ led_work: led-1 {
- 		};
- 	};
- 
-+	rk809-sound {
-+		compatible = "simple-audio-card";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&hp_det_pin>;
-+		simple-audio-card,name = "Analog RK817";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
-+		simple-audio-card,mclk-fs = <256>;
-+		simple-audio-card,widgets =
-+			"Headphone", "Headphones",
-+			"Speaker", "Speaker";
-+		simple-audio-card,routing =
-+			"Headphones", "HPOL",
-+			"Headphones", "HPOR",
-+			"Speaker", "SPKO";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s1_8ch>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&rk809>;
-+		};
-+	};
-+
- 	vcc3v3_sys: vcc3v3-sys-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc3v3_sys";
-@@ -131,10 +156,15 @@ rk809: pmic@20 {
- 		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_l>;
-+		pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
- 		rockchip,system-power-controller;
-+		#sound-dai-cells = <0>;
- 		vcc1-supply = <&vcc3v3_sys>;
- 		vcc2-supply = <&vcc3v3_sys>;
- 		vcc3-supply = <&vcc3v3_sys>;
-@@ -340,6 +370,11 @@ regulator-state-mem {
- 	};
- };
- 
-+&i2s1_8ch {
-+	rockchip,trcm-sync-tx-only;
-+	status = "okay";
-+};
-+
- &mdio0 {
- 	rgmii_phy0: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
-@@ -379,6 +414,12 @@ pmic_int_l: pmic-int-l {
- 			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
- 		};
- 	};
-+
-+	rk809 {
-+		hp_det_pin: hp-det-pin {
-+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
- };
- 
- &pmu_io_domains {
--- 
-2.39.2
-

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

@@ -1,97 +0,0 @@
-From 3a1be3d8719ef6335385d4e5e456371e7bf7383f Mon Sep 17 00:00:00 2001
-Message-Id: <3a1be3d8719ef6335385d4e5e456371e7bf7383f.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:39 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable vop2 and hdmi tx on ODROID-M1
-
-Enable the RK356x Video Output Processor (VOP) 2 on ODROID M1.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-7-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 47 +++++++++++++++++++
- 1 file changed, 47 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 634c1bd80b4e..126b893048fe 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -8,6 +8,7 @@
- #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 "rk3568.dtsi"
- 
- / {
-@@ -37,6 +38,17 @@ dc_12v: dc-12v-regulator {
- 		regulator-max-microvolt = <12000000>;
- 	};
- 
-+	hdmi-con {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
-@@ -131,6 +143,24 @@ &gmac0_rgmii_clk
- 	rx_delay = <0x2d>;
- };
- 
-+&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>;
-+	};
-+};
-+
- &i2c0 {
- 	status = "okay";
- 
-@@ -517,3 +547,20 @@ &tsadc {
- &uart2 {
- 	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.39.2
-

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

@@ -1,48 +0,0 @@
-From ded87dc761951205b8b9ba8ee4081e28a850a3db Mon Sep 17 00:00:00 2001
-Message-Id: <ded87dc761951205b8b9ba8ee4081e28a850a3db.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:40 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable HDMI audio on ODROID-M1.
-
-This enables the i2s0 controller and the hdmi-sound node on the
-ODROID-M1.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-8-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 126b893048fe..ac4e94d18feb 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -161,6 +161,10 @@ hdmi_out_con: endpoint {
- 	};
- };
- 
-+&hdmi_sound {
-+	status = "okay";
-+};
-+
- &i2c0 {
- 	status = "okay";
- 
-@@ -400,6 +404,10 @@ regulator-state-mem {
- 	};
- };
- 
-+&i2s0_8ch {
-+	status = "okay";
-+};
-+
- &i2s1_8ch {
- 	rockchip,trcm-sync-tx-only;
- 	status = "okay";
--- 
-2.39.2
-

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

@@ -1,37 +0,0 @@
-From 13438a717627cae086cc3a1126552cffa2f4bd16 Mon Sep 17 00:00:00 2001
-Message-Id: <13438a717627cae086cc3a1126552cffa2f4bd16.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:41 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable the GPU on ODROID-M1
-
-Enable the GPU core on the Rockchip RK3568 ODROID-M1.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-9-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index ac4e94d18feb..e4b7699d3eea 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -143,6 +143,11 @@ &gmac0_rgmii_clk
- 	rx_delay = <0x2d>;
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
- &hdmi {
- 	avdd-0v9-supply = <&vdda0v9_image>;
- 	avdd-1v8-supply = <&vcca1v8_image>;
--- 
-2.39.2
-

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

@@ -1,111 +0,0 @@
-From 0f0a85a289b4d0fbd5c39eb5ddbb681a37ad490c Mon Sep 17 00:00:00 2001
-Message-Id: <0f0a85a289b4d0fbd5c39eb5ddbb681a37ad490c.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:42 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable the USB 2.0 ports on ODROID-M1
-
-The Rockchip RK3568 has two USB OHCI/EHCI controllers connected to a PHY
-providing one host-only port and one OTG port. On the ODROID-M1, they
-are both used in host mode. The USB ports are powered by a DC/DC
-converter providing 5V and named VCC5V0_SYS on the schematics, followed
-by a power switch.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-10-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 61 +++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index e4b7699d3eea..2e4cc20bd676 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -105,6 +105,28 @@ vcc3v3_sys: vcc3v3-sys-regulator {
- 		regulator-max-microvolt = <3300000>;
- 		vin-supply = <&dc_12v>;
- 	};
-+
-+	vcc5v0_sys: vcc5v0-sys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&dc_12v>;
-+	};
-+
-+	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_usb_host";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_host_en_pin>;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
- };
- 
- &cpu0 {
-@@ -463,6 +485,15 @@ hp_det_pin: hp-det-pin {
- 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
- 	};
-+
-+	usb {
-+		vcc5v0_usb_host_en_pin: vcc5v0-usb-host-en-pin {
-+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+		vcc5v0_usb_otg_en_pin: vcc5v0-usb-otg-en-pin {
-+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
- };
- 
- &pmu_io_domains {
-@@ -561,6 +592,36 @@ &uart2 {
- 	status = "okay";
- };
- 
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host0_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ohci {
-+	status = "okay";
-+};
-+
-+&usb2phy1 {
-+	status = "okay";
-+};
-+
-+&usb2phy1_host {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy1_otg {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
- &vop {
- 	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
- 	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
--- 
-2.39.2
-

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

@@ -1,114 +0,0 @@
-From d8abc451c669a8fd36b31db5cb96ec49da819124 Mon Sep 17 00:00:00 2001
-Message-Id: <d8abc451c669a8fd36b31db5cb96ec49da819124.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:43 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable the USB 3.0 ports on ODROID-M1
-
-The Rockchip RK3568 has two USB XHCI controllers. The USB 2.0 signals
-are connected to a PHY providing one host-only port and one OTG port.
-The USB 3.0 signals are connected to two USB3.0/PCIE/SATA combo PHY.
-
-The ODROID M1 has 2 type A USB 3.0 connectors, with the USB 3.0 signals
-connected to the two combo PHYs. For the USB 2.0 signals, one connector
-is connected to the host-only PHY and uses the same power switch as the
-USB 2.0 ports. The other connector has its own power switch and is
-connected to the OTG PHY, which is also connected to a device only
-micro-USB connector. The purpose of this micro-USB connector is for
-firmware update using the Rockusb vendor specific USB class. Therefore
-it does not make sense to enable this port on Linux, and the PHY is
-forced to host mode.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-11-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 49 ++++++++++++++++++-
- 1 file changed, 48 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 2e4cc20bd676..9a84a7e76d7a 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -127,6 +127,30 @@ vcc5v0_usb_host: vcc5v0-usb-host-regulator {
- 		regulator-max-microvolt = <5000000>;
- 		vin-supply = <&vcc5v0_sys>;
- 	};
-+
-+	vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_usb_otg";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_otg_en_pin>;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&combphy0 {
-+	/* Used for USB3 */
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&combphy1 {
-+	/* Used for USB3 */
-+	phy-supply = <&vcc5v0_usb_otg>;
-+	status = "okay";
- };
- 
- &cpu0 {
-@@ -490,7 +514,7 @@ usb {
- 		vcc5v0_usb_host_en_pin: vcc5v0-usb-host-en-pin {
- 			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
--		vcc5v0_usb_otg_en_pin: vcc5v0-usb-otg-en-pin {
-+		vcc5v0_usb_otg_en_pin: vcc5v0-usb-dr-en-pin {
- 			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
- 	};
-@@ -600,6 +624,11 @@ &usb_host0_ohci {
- 	status = "okay";
- };
- 
-+&usb_host0_xhci {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
- &usb_host1_ehci {
- 	status = "okay";
- };
-@@ -608,6 +637,24 @@ &usb_host1_ohci {
- 	status = "okay";
- };
- 
-+&usb_host1_xhci {
-+	status = "okay";
-+};
-+
-+&usb2phy0 {
-+	status = "okay";
-+};
-+
-+&usb2phy0_host {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy0_otg {
-+	phy-supply = <&vcc5v0_usb_otg>;
-+	status = "okay";
-+};
-+
- &usb2phy1 {
- 	status = "okay";
- };
--- 
-2.39.2
-

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

@@ -1,48 +0,0 @@
-From 2f6d4521403932ca22cb4dabef9033f1d52232ba Mon Sep 17 00:00:00 2001
-Message-Id: <2f6d4521403932ca22cb4dabef9033f1d52232ba.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:44 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add SATA support to ODROID-M1
-
-Enable the Combo PHY and SATA nodes in ODROID-M1.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-12-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 9a84a7e76d7a..bd24ccf94e76 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -153,6 +153,11 @@ &combphy1 {
- 	status = "okay";
- };
- 
-+&combphy2 {
-+	/* used for SATA */
-+	status = "okay";
-+};
-+
- &cpu0 {
- 	cpu-supply = <&vdd_cpu>;
- };
-@@ -538,6 +543,10 @@ &saradc {
- 	status = "okay";
- };
- 
-+&sata2 {
-+	status = "okay";
-+};
-+
- &sdhci {
- 	bus-width = <8>;
- 	max-frequency = <200000000>;
--- 
-2.39.2
-

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

@@ -1,80 +0,0 @@
-From 1572a9c5d9fa9f654fbc1909528ae5940ad34aa3 Mon Sep 17 00:00:00 2001
-Message-Id: <1572a9c5d9fa9f654fbc1909528ae5940ad34aa3.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:45 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add PCIEe v3 nodes to ODROID-M1
-
-Add nodes to ODROID-M1 to support PCIe v3 on the M2 slot.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-13-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 34 +++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index bd24ccf94e76..2f685c606bb9 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -96,6 +96,19 @@ simple-audio-card,codec {
- 		};
- 	};
- 
-+	vcc3v3_pcie: vcc3v3-pcie-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_pcie";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc3v3_pcie_en_pin>;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <5000>;
-+		vin-supply = <&vcc3v3_sys>;
-+	};
-+
- 	vcc3v3_sys: vcc3v3-sys-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc3v3_sys";
-@@ -479,6 +492,18 @@ rgmii_phy0: ethernet-phy@0 {
- 	};
- };
- 
-+&pcie30phy {
-+	status = "okay";
-+};
-+
-+&pcie3x2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie_reset_pin>;
-+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_pcie>;
-+	status = "okay";
-+};
-+
- &pinctrl {
- 	fspi {
- 		fspi_dual_io_pins: fspi-dual-io-pins {
-@@ -503,6 +528,15 @@ led_work_pin: led-work-pin {
- 		};
- 	};
- 
-+	pcie {
-+		pcie_reset_pin: pcie-reset-pin {
-+			rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+		vcc3v3_pcie_en_pin: vcc3v3-pcie-en-pin {
-+			rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	pmic {
- 		pmic_int_l: pmic-int-l {
- 			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
--- 
-2.39.2
-

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

@@ -1,54 +0,0 @@
-From b2eae73eeb32dd9383571de6af18fc8bd39aac3a Mon Sep 17 00:00:00 2001
-Message-Id: <b2eae73eeb32dd9383571de6af18fc8bd39aac3a.1678107917.git.stefan@agner.ch>
-In-Reply-To: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-References: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 30 Sep 2022 07:12:46 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add IR receiver node to ODROID-M1
-
-Add the infrared receiver and its associated pinctrl entry. Note that
-there is an external pullup to VCC3V3_SYS.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-14-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-index 2f685c606bb9..59ecf868dbd0 100644
---- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -49,6 +49,13 @@ hdmi_con_in: endpoint {
- 		};
- 	};
- 
-+	ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&ir_receiver_pin>;
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
-@@ -519,6 +526,13 @@ fspi_dual_io_pins: fspi-dual-io-pins {
- 		};
- 	};
- 
-+	ir-receiver {
-+		ir_receiver_pin: ir-receiver-pin {
-+			/* external pullup to VCC3V3_SYS */
-+			rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	leds {
- 		led_power_pin: led-power-pin {
- 			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
--- 
-2.39.2
-

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

@@ -1,5 +1,5 @@
-
 part start mmc ${devnum} hassos-bootstate mmc_env
+mmc dev ${devnum}
 
 setenv loadbootstate " \
     echo 'loading env...'; \
@@ -20,7 +20,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"

buildroot-external/board/hardkernel/odroid-m1/uboot.config

@@ -1,5 +1,2 @@
-CONFIG_DOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+# CONFIG_DWC_ETH_QOS is not set
+# CONFIG_DWC_ETH_QOS_ROCKCHIP is not set

buildroot-external/board/hardkernel/odroid-m1s/hassos-hook.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# shellcheck disable=SC2155
+
+function hassos_pre_image() {
+    local BOOT_DATA="$(path_boot_dir)"
+    local SPL_IMG="$(path_spl_img)"
+
+    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
+    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
+
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
+}
+
+
+function hassos_post_image() {
+    convert_disk_image_xz
+}
+

buildroot-external/board/hardkernel/odroid-m1s/kernel.config

@@ -0,0 +1,12 @@
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_SENSORS_GPIO_FAN=y
+
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=y
+
+CONFIG_MMC_SDHCI_OF_DWCMSHC=y
+
+# CONFIG_DW_WATCHDOG is not set

buildroot-external/board/hardkernel/odroid-m1s/meta

@@ -0,0 +1,12 @@
+BOARD_ID=odroid-m1s
+BOARD_NAME="Hardkernel ODROID-M1S"
+CHASSIS=embedded
+BOOTLOADER=uboot
+KERNEL_FILE=Image
+BOOT_SYS=gpt
+BOOT_SIZE=16M
+BOOT_SPL=true
+BOOT_SPL_SIZE=16M
+BOOT_ENV_SIZE=0x8000
+SUPERVISOR_MACHINE=odroid-m1
+SUPERVISOR_ARCH=aarch64

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

@@ -0,0 +1,896 @@
+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

@@ -0,0 +1,335 @@
+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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,51 @@
+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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,52 @@
+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-m1s/uboot-boot.ush

@@ -0,0 +1,98 @@
+part start ${devtype} ${devnum} hassos-bootstate mmc_env
+${devtype} dev ${devnum}
+
+setenv loadbootstate " \
+    echo 'loading env...'; \
+    ${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; \
+    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x40;"
+
+run loadbootstate
+test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
+test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
+test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
+
+# Allows ConditionFirstBoot=
+test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
+
+# HassOS bootargs
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+
+# HassOS system A/B
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+
+part number ${devtype} ${devnum} hassos-boot boot_partnum
+
+# Load environment from haos-config.txt
+if test -e ${devtype} ${devnum}:${boot_partnum} haos-config.txt; then
+  fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
+  env import -t ${ramdisk_addr_r} ${filesize}
+fi
+
+# Load extraargs
+fileenv ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
+
+# Load device tree
+setenv fdtfile rk3566-odroid-m1s.dtb
+echo "Loading standard device tree ${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 ${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 ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
+fi
+
+setenv bootargs
+for BOOT_SLOT in "${BOOT_ORDER}"; do
+  if test "x${bootargs}" != "x"; then
+    # skip remaining slots
+  elif test "x${BOOT_SLOT}" = "xA"; then
+    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 ${devtype} ${devnum} hassos-kernel0 kernel_partnum
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
+      fi
+    fi
+  elif test "x${BOOT_SLOT}" = "xB"; then
+    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 ${devtype} ${devnum} hassos-kernel1 kernel_partnum
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
+      fi
+    fi
+  fi
+done
+
+if test -n "${bootargs}"; then
+  run storebootstate
+else
+  echo "No valid slot found, resetting tries to 3"
+  setenv BOOT_A_LEFT 3
+  setenv BOOT_B_LEFT 3
+  run storebootstate
+  reset
+fi
+
+echo "Starting kernel"
+booti ${kernel_addr_r} - ${fdt_addr_r}
+
+echo "Boot failed, resetting..."
+reset

buildroot-external/board/hardkernel/odroid-m1s/uboot.config

@@ -0,0 +1 @@
+

buildroot-external/board/hardkernel/odroid-n2/kernel.config

@@ -1,3 +1,4 @@
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 
 CONFIG_THERMAL_GOV_BANG_BANG=y

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

@@ -22,7 +22,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"

buildroot-external/board/hardkernel/odroid-xu4/kernel.config

@@ -0,0 +1,6 @@
+CONFIG_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+
+# CONFIG_S3C2410_WATCHDOG is not set
+
+# CONFIG_PROVE_LOCKING is not set

buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch

@@ -1,61 +0,0 @@
-From d6b82edb420c7df4fa8bb0924dae2476beb649a2 Mon Sep 17 00:00:00 2001
-Message-Id: <d6b82edb420c7df4fa8bb0924dae2476beb649a2.1622398359.git.stefan@agner.ch>
-From: "charles.park" <charles.park@hardkernel.com>
-Date: Fri, 1 Jun 2018 18:12:01 +0900
-Subject: [PATCH] ODROID-XU4: Update hack avoiding the invalid temperature by
- TMU broken
-
-Change-Id: I6092834427950a50746535458e99bf7089212044
----
- drivers/thermal/thermal_helpers.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
-index c94bc824e5d3..2880126c5861 100644
---- a/drivers/thermal/thermal_helpers.c
-+++ b/drivers/thermal/thermal_helpers.c
-@@ -75,6 +75,10 @@ EXPORT_SYMBOL(get_thermal_instance);
-  *
-  * Return: On success returns 0, an error code otherwise
-  */
-+
-+#define	CRITICAL_TEMP	120000
-+int thermal_zone_data[4] = { 0, };
-+
- int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
- {
- 	int ret = -EINVAL;
-@@ -108,6 +112,30 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
- 			*temp = tz->emul_temperature;
- 	}
- 
-+	/* save thermal_zone data */
-+	if (!ret)
-+		thermal_zone_data[tz->id] = *temp;
-+	/*
-+	 * This case is that the thermal sensor is broken.
-+	 * That's not real temperature. Set the fake temperature value in order to
-+	 * avoid reaching the ciritical temperature.
-+	 */
-+	if ((thermal_zone_data[tz->id] > CRITICAL_TEMP) && (tz->id != 4)) {
-+		int i, broken_sensor = 0, correct_temp = 0;
-+		for (i = 0; i < 4; i++) {
-+			if ((thermal_zone_data[i] <= CRITICAL_TEMP) &&
-+			    (correct_temp <= thermal_zone_data[i]))
-+				correct_temp = thermal_zone_data[i];
-+			if (thermal_zone_data[i] > CRITICAL_TEMP)
-+				broken_sensor++;
-+		}
-+		/*
-+		 * if all thermal sensor broken then critical temperature data send
-+		 * for system poweroff.
-+		 */
-+		*temp = (broken_sensor == 4) ? CRITICAL_TEMP : correct_temp;
-+	}
-+
- 	mutex_unlock(&tz->lock);
- exit:
- 	return ret;
--- 
-2.31.1
-

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

@@ -1,5 +1,4 @@
-From e7d59e0444170873e945a0675ed1565a65c99e17 Mon Sep 17 00:00:00 2001
-Message-Id: <e7d59e0444170873e945a0675ed1565a65c99e17.1676489173.git.stefan@agner.ch>
+From c51639443d3c90127a77f1534e39dd01fac1577f 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
@@ -17,7 +16,7 @@ Signed-off-by: Marian Mihailescu <mihailescu2m@gmail.com>
  1 file changed, 55 insertions(+)
 
 diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
-index ebc67e3ddd4f..51f128076db9 100644
+index 570b61420f3a..286b606660a4 100644
 --- a/drivers/regulator/s2mps11.c
 +++ b/drivers/regulator/s2mps11.c
 @@ -1117,6 +1117,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
@@ -89,6 +88,3 @@ index ebc67e3ddd4f..51f128076db9 100644
  out:
  	kfree(rdata);
  
--- 
-2.39.1
-

buildroot-external/board/hardkernel/odroid-xu4/patches/uboot/0001-samsung-common-ignore-if-CROS-EC-is-not-supported.patch

@@ -1,30 +0,0 @@
-From 24252c65cfea76c5724044381bafb587a9fecd6a Mon Sep 17 00:00:00 2001
-Message-Id: <24252c65cfea76c5724044381bafb587a9fecd6a.1676446297.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Wed, 15 Feb 2023 08:30:41 +0100
-Subject: [PATCH] samsung: common: ignore if CROS EC is not supported
-
-If the CROS device class is not compiled in, uclass returns not
-supported. Ignore this case as well.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- board/samsung/common/board.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
-index 16ce5cb892..663d7ca991 100644
---- a/board/samsung/common/board.c
-+++ b/board/samsung/common/board.c
-@@ -223,7 +223,7 @@ int board_late_init(void)
- 	char mmcbootdev_str[16];
- 
- 	ret = uclass_first_device_err(UCLASS_CROS_EC, &dev);
--	if (ret && ret != -ENODEV) {
-+	if (ret && ret != -ENODEV && ret != -EPFNOSUPPORT) {
- 		/* Force console on */
- 		gd->flags &= ~GD_FLG_SILENT;
- 
--- 
-2.39.1
-

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

@@ -24,7 +24,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"

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

@@ -1,5 +1,4 @@
-From 86f6a398d2c080f92d51048ededf45efbe3a96d4 Mon Sep 17 00:00:00 2001
-Message-Id: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From e780a5f405a02e3102c471415f7b0ad73a5cc036 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
@@ -10,15 +9,15 @@ button press is triggered.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 11 +++++++++++
  1 file changed, 11 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 fd3fa82e4c33..06bdba57b04c 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
- 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+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
+--- 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 {
+ 		#cooling-cells = <2>;
  	};
  
 +	gpio-keys-polled {
@@ -35,6 +34,3 @@ index fd3fa82e4c33..06bdba57b04c 100644
  	leds {
  		compatible = "gpio-leds";
  
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From e269c47ef68371dbed1ff5919a67fcc385d8c6da Mon Sep 17 00:00:00 2001
-Message-Id: <e269c47ef68371dbed1ff5919a67fcc385d8c6da.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From cff7ba94733d9103487d87a6474e2ab026bd718c 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
@@ -12,15 +9,15 @@ cannot be modulated.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 11 +++++++++++
  1 file changed, 11 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 06bdba57b04c..bcf6d8eacd6e 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
- 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+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
+--- 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 {
+ 		};
  	};
  
 +	/*
@@ -34,9 +31,6 @@ index 06bdba57b04c..bcf6d8eacd6e 100644
 +		status = "okay";
 +	};
 +
- 	gpio-keys-polled {
- 		compatible = "gpio-keys-polled";
- 		poll-interval = <100>;
--- 
-2.39.1
-
+ 	leds {
+ 		compatible = "gpio-leds";
+ 

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

@@ -1,7 +1,4 @@
-From 8c3e65cf09d62797a2fe50234f30f33f6e4eda44 Mon Sep 17 00:00:00 2001
-Message-Id: <8c3e65cf09d62797a2fe50234f30f33f6e4eda44.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 8d781fc504780a3aa8ef751724e3749c2bfda7a9 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
@@ -16,14 +13,14 @@ downstream kernel.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- .../dts/amlogic/meson-g12b-odroid-n2.dtsi     | 38 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-g12b-odroid.dtsi   | 38 +++++++++++++++++++
  1 file changed, 38 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 bcf6d8eacd6e..6dcf990e0efc 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -390,6 +390,44 @@ &clkc_audio {
+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
+--- 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 {
  	status = "okay";
  };
  
@@ -68,6 +65,3 @@ index bcf6d8eacd6e..6dcf990e0efc 100644
  &cpu0 {
  	cpu-supply = <&vddcpu_b>;
  	operating-points-v2 = <&cpu_opp_table_0>;
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 433c5a06b1195e2e689f8d260ec471caca2fa1b6 Mon Sep 17 00:00:00 2001
-Message-Id: <433c5a06b1195e2e689f8d260ec471caca2fa1b6.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 01ac730fa92a030690a7701c9b8781bc4ef7bcae 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
@@ -11,23 +8,23 @@ available as UART by default.
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 7 +++++++
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 7 +++++++
  1 file changed, 7 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 6dcf990e0efc..7eaaced7893b 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+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
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -12,6 +12,7 @@
  / {
  	aliases {
  		serial0 = &uart_AO;
 +		serial1 = &uart_A;
  		ethernet0 = &ethmac;
- 		rtc0 = &rtc;
  		rtc1 = &vrtc;
-@@ -730,6 +731,12 @@ &toddr_c {
- 	status = "okay";
+ 	};
+@@ -496,6 +497,12 @@ &uart_AO {
+ 	pinctrl-names = "default";
  };
  
 +&uart_A {
@@ -36,9 +33,6 @@ index 6dcf990e0efc..7eaaced7893b 100644
 +	pinctrl-names = "default";
 +};
 +
- &uart_AO {
+ &usb {
  	status = "okay";
- 	pinctrl-0 = <&uart_ao_a_pins>;
--- 
-2.39.1
-
+ };

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

@@ -1,7 +1,4 @@
-From 00129576fb656015b66958f4d7370ee7e2d990e2 Mon Sep 17 00:00:00 2001
-Message-Id: <00129576fb656015b66958f4d7370ee7e2d990e2.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From f5676219e12b48a0f591e911797304fae05ca78c 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+
@@ -16,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 7eaaced7893b..8d183253389c 100644
+index 91c9769fda20..ececc6b17639 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -588,6 +588,12 @@ &ir {
- 	linux,rc-map-name = "rc-odroid";
+@@ -248,6 +248,12 @@ usb-hub-hog {
+ 	};
  };
  
 +&i2c2 {
@@ -32,6 +29,3 @@ index 7eaaced7893b..8d183253389c 100644
  &i2c3 {
  	status = "okay";
  	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From d6b1ddfb5816b887470452920d273661e361632d Mon Sep 17 00:00:00 2001
-Message-Id: <d6b1ddfb5816b887470452920d273661e361632d.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 1c9c3ca476adf09884295e9f8298288ea497e5ac 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
@@ -11,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 ddb1b345397f..49b88c1e11cd 100644
+index 1db2327bbd13..e67869fbb460 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 @@
@@ -25,7 +22,7 @@ index ddb1b345397f..49b88c1e11cd 100644
  	};
  
  	chosen {
-@@ -450,6 +451,12 @@ &tohdmitx {
+@@ -449,6 +450,12 @@ &tohdmitx {
  	status = "okay";
  };
  
@@ -38,6 +35,3 @@ index ddb1b345397f..49b88c1e11cd 100644
  &uart_AO {
  	status = "okay";
  	pinctrl-0 = <&uart_ao_a_pins>;
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From a78a968b4a51a32f44c170c591a46b27326b97f2 Mon Sep 17 00:00:00 2001
-Message-Id: <a78a968b4a51a32f44c170c591a46b27326b97f2.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 9cd343da01d9b69ad33444105208949775c909b4 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
@@ -11,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 49b88c1e11cd..b8d88310ae3a 100644
+index e67869fbb460..90d2eea7fe24 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 @@
@@ -23,7 +20,7 @@ index 49b88c1e11cd..b8d88310ae3a 100644
  		serial0 = &uart_AO;
  		serial1 = &uart_A;
  	};
-@@ -387,6 +389,57 @@ &ir {
+@@ -386,6 +388,57 @@ &ir {
  	pinctrl-names = "default";
  };
  
@@ -81,6 +78,3 @@ index 49b88c1e11cd..b8d88310ae3a 100644
  &pwm_AO_cd {
  	pinctrl-0 = <&pwm_ao_d_e_pins>;
  	pinctrl-names = "default";
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From 8263e17f170296c28d3a781d5b05e59778fe4a27 Mon Sep 17 00:00:00 2001
-Message-Id: <8263e17f170296c28d3a781d5b05e59778fe4a27.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 299d45dd82df026c0164e170d476b56eada4aa77 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
@@ -12,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 201596247fd9..b2cb12fb46fd 100644
+index e6d2de7c45a9..c6a38d890db5 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 @@ / {
@@ -24,7 +21,7 @@ index 201596247fd9..b2cb12fb46fd 100644
  		ethernet0 = &ethmac;
  	};
  
-@@ -399,6 +401,18 @@ &uart_AO {
+@@ -383,6 +385,18 @@ &uart_AO {
  	pinctrl-names = "default";
  };
  
@@ -43,6 +40,3 @@ index 201596247fd9..b2cb12fb46fd 100644
  &usb0_phy {
  	status = "disabled";
  	phy-supply = <&usb_otg_pwr>;
--- 
-2.39.1
-

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

@@ -1,7 +1,4 @@
-From ceef8d62bcf0c2c7b3e96831e85a872009657cf0 Mon Sep 17 00:00:00 2001
-Message-Id: <ceef8d62bcf0c2c7b3e96831e85a872009657cf0.1676488652.git.stefan@agner.ch>
-In-Reply-To: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
-References: <86f6a398d2c080f92d51048ededf45efbe3a96d4.1676488652.git.stefan@agner.ch>
+From 61a378b42a2f61589cc62ff85334dd607014cb6d 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
@@ -12,7 +9,7 @@ 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 7c029f552a23..b3c22861b022 100644
+index 12ef6e81c8bd..90ae81493de2 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 @@ -333,6 +333,8 @@ &hwrng {
@@ -33,6 +30,3 @@ index 7c029f552a23..b3c22861b022 100644
  };
  
  &i2c_C {
--- 
-2.39.1
-

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

@@ -1,5 +1,4 @@
-From 5d2feca5947f84259bae41730ce54231578b37be Mon Sep 17 00:00:00 2001
-Message-Id: <5d2feca5947f84259bae41730ce54231578b37be.1645627508.git.stefan@agner.ch>
+From 11f015e13ef0442b6d2bb734954291abde415f73 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 2 Sep 2019 15:42:04 +0200
 Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz
@@ -23,5 +22,5 @@ index fcf4f03d1e..6ded4b619b 100644
  	cfg->name = dev->name;
  
 -- 
-2.35.1
+2.43.0
 

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

@@ -6,8 +6,6 @@ CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_MEMCG=y
@@ -160,10 +158,9 @@ CONFIG_PCI_IOV=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_DW_PLAT_HOST=y
-# CONFIG_PCI_MESON is not set
+CONFIG_PCI_MESON=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_SIMPLE_PM_BUS=y
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_RAW_NAND=y
@@ -262,7 +259,6 @@ CONFIG_RTL8192CU=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE_SDIO=m
 # CONFIG_XEN_NETDEV_FRONTEND is not set
-CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_MATRIXKMAP=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
@@ -294,11 +290,11 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_OPTEE=m
 CONFIG_TCG_TPM=y
 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
@@ -306,11 +302,9 @@ CONFIG_I2C_MESON=y
 CONFIG_I2C_RK3X=y
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=m
-CONFIG_SPI_NXP_FLEXSPI=y
 CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_PL022=y
-CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
@@ -363,7 +357,7 @@ CONFIG_MFD_BD9571MWV=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_HI6421_PMIC=y
 CONFIG_MFD_MAX77620=y
-CONFIG_MFD_RK808=y
+CONFIG_MFD_RK8XX_I2C=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_ROHM_BD718XX=y
 CONFIG_MFD_KHADAS_MCU=y
@@ -449,37 +443,35 @@ CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_PWC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_VIDEO_USBTV=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_V4L2=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_CEC_CORE=m
+CONFIG_CEC_PIN=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_DW_HDMI_CEC=y
-CONFIG_DRM_MESON=y
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_EFI=y
+CONFIG_FB=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_DYNAMIC_MINORS=y
@@ -490,16 +482,15 @@ CONFIG_SND_SOC=y
 CONFIG_SND_MESON_AXG_SOUND_CARD=y
 CONFIG_SND_MESON_GX_SOUND_CARD=y
 CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_DMIC=y
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
 CONFIG_SND_SOC_MAX98357A=y
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SPDIF=y
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_HIDRAW=y
-CONFIG_I2C_HID=m
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
@@ -587,12 +578,9 @@ CONFIG_VIRTIO_MMIO=y
 # CONFIG_XEN_GNTDEV is not set
 # CONFIG_XEN_GRANT_DEV_ALLOC is not set
 CONFIG_STAGING=y
-CONFIG_STAGING_GASKET_FRAMEWORK=m
-CONFIG_STAGING_APEX_DRIVER=m
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_CS2000_CP=y
 CONFIG_COMMON_CLK_S2MPS11=y
-CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 CONFIG_HWSPINLOCK=y
@@ -609,11 +597,8 @@ CONFIG_SENSORS_ISL29018=m
 CONFIG_MPL3115=m
 CONFIG_PWM=y
 CONFIG_PWM_MESON=y
-CONFIG_PHY_XGENE=y
-CONFIG_PHY_FSL_IMX8MQ_USB=y
 CONFIG_PHY_QCOM_USB_HS=y
 CONFIG_PHY_SAMSUNG_USB2=y
-CONFIG_MESON_EFUSE=y
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_EXT3_FS=m
@@ -626,7 +611,7 @@ CONFIG_F2FS_FS=m
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y

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

@@ -22,7 +22,7 @@ test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"

buildroot-external/board/nabucasa/green/hassos-hook.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# shellcheck disable=SC2155
+
+function hassos_pre_image() {
+    local BOOT_DATA="$(path_boot_dir)"
+    local SPL_IMG="$(path_spl_img)"
+
+    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
+    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
+
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
+}
+
+
+function hassos_post_image() {
+    convert_disk_image_xz
+}
+

buildroot-external/board/nabucasa/green/kernel.config

@@ -0,0 +1,14 @@
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_SENSORS_GPIO_FAN=y
+
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=y
+
+CONFIG_MMC_SDHCI_OF_DWCMSHC=y
+
+# CONFIG_RTC_DRV_RK808 is not set
+
+# CONFIG_DW_WATCHDOG is not set

buildroot-external/board/nabucasa/green/meta

@@ -0,0 +1,12 @@
+BOARD_ID=green
+BOARD_NAME="Home Assistant Green"
+CHASSIS=embedded
+BOOTLOADER=uboot
+KERNEL_FILE=Image
+BOOT_SYS=gpt
+BOOT_SIZE=16M
+BOOT_SPL=true
+BOOT_SPL_SIZE=16M
+BOOT_ENV_SIZE=0x8000
+SUPERVISOR_MACHINE=green
+SUPERVISOR_ARCH=aarch64

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

@@ -1,44 +1,40 @@
-From d388735d551e09b00317a509859fca51776b9826 Mon Sep 17 00:00:00 2001
-Message-Id: <d388735d551e09b00317a509859fca51776b9826.1678107917.git.stefan@agner.ch>
-From: Dongjin Kim <tobetter@gmail.com>
-Date: Fri, 30 Sep 2022 07:12:35 +0200
-Subject: [PATCH] arm64: dts: rockchip: Add Hardkernel ODROID-M1 board
+From 9b1367f47f2e790f155d4aab39878233eedf7b22 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch is to add a device tree for new board Hardkernel ODROID-M1
-based on Rockchip RK3568, includes basic peripherals -
-uart/eMMC/uSD/i2c and on-board ethernet.
-
-Signed-off-by: Dongjin Kim <tobetter@gmail.com>
-[aurelien@aurel32.net: addressed issues from initial review]
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Dan Johansen <strit@manjaro.org>
-Link: https://lore.kernel.org/r/20220930051246.391614-3-aurelien@aurel32.net
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+[Replaced custom rk860x driver with upstream fan53555]
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
  arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3568-odroid-m1.dts    | 414 ++++++++++++++++++
- 2 files changed, 415 insertions(+)
- create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+ .../boot/dts/rockchip/rk3566-ha-green.dts     | 684 ++++++++++++++++++
+ 2 files changed, 685 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 8c15593c0ca4..5dc1607b3ecf 100644
+index e7728007fd1b..475becd793ac 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -71,4 +71,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+@@ -75,6 +75,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-pinenote-v1.2.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.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..b3016437640b
+index 000000000000..b5e4a67b3fc7
 --- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-@@ -0,0 +1,414 @@
++++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
+@@ -0,0 +1,684 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
-+ * Copyright (c) 2022 Hardkernel Co., Ltd.
++ * Copyright (c) 2023 Seeed Co., Ltd.
 + *
 + */
 +
@@ -46,20 +42,17 @@ index 000000000000..b3016437640b
 +#include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/leds/common.h>
 +#include <dt-bindings/pinctrl/rockchip.h>
-+#include "rk3568.dtsi"
++#include <dt-bindings/soc/rockchip,vop2.h>
++#include "rk3566.dtsi"
 +
 +/ {
-+	model = "Hardkernel ODROID-M1";
-+	compatible = "rockchip,rk3568-odroid-m1", "rockchip,rk3568";
++	model = "Home Assistant Green";
++	compatible = "rockchip,rk3566-ha-green", "rockchip,rk3566";
 +
 +	aliases {
-+		ethernet0 = &gmac0;
-+		i2c0 = &i2c3;
-+		i2c3 = &i2c0;
++		ethernet0 = &gmac1;
 +		mmc0 = &sdhci;
 +		mmc1 = &sdmmc0;
-+		serial0 = &uart1;
-+		serial1 = &uart0;
 +	};
 +
 +	chosen {
@@ -75,11 +68,22 @@ index 000000000000..b3016437640b
 +		regulator-max-microvolt = <12000000>;
 +	};
 +
++	hdmi-con {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++
 +	leds {
 +		compatible = "gpio-leds";
 +
 +		led_power: led-0 {
-+			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
++			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
 +			function = LED_FUNCTION_POWER;
 +			color = <LED_COLOR_ID_RED>;
 +			default-state = "keep";
@@ -87,13 +91,43 @@ index 000000000000..b3016437640b
 +			pinctrl-names = "default";
 +			pinctrl-0 = <&led_power_pin>;
 +		};
-+		led_work: led-1 {
++		led_act: led-1 {
 +			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
++			function = LED_FUNCTION_ACTIVITY;
++			color = <LED_COLOR_ID_GREEN>;
++			linux,default-trigger = "activity";
++			pinctrl-names = "default";
++			pinctrl-0 = <&led_act_pin>;
++		};
++		led_user: led-2 {
++			gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
 +			function = LED_FUNCTION_HEARTBEAT;
-+			color = <LED_COLOR_ID_BLUE>;
++			color = <LED_COLOR_ID_YELLOW>;
 +			linux,default-trigger = "heartbeat";
 +			pinctrl-names = "default";
-+			pinctrl-0 = <&led_work_pin>;
++			pinctrl-0 = <&led_usr_pin>;
++		};
++	};
++
++	rk809-sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,name = "Analog RK817";
++		simple-audio-card,format = "i2s";
++		simple-audio-card,mclk-fs = <256>;
++		simple-audio-card,widgets =
++			"Headphone", "Headphones",
++			"Speaker", "Speaker";
++		simple-audio-card,routing =
++			"Headphones", "HPOL",
++			"Headphones", "HPOR",
++			"Speaker", "SPKO";
++
++		simple-audio-card,cpu {
++			sound-dai = <&i2s1_8ch>;
++		};
++
++		simple-audio-card,codec {
++			sound-dai = <&rk809>;
 +		};
 +	};
 +
@@ -106,6 +140,28 @@ index 000000000000..b3016437640b
 +		regulator-max-microvolt = <3300000>;
 +		vin-supply = <&dc_12v>;
 +	};
++
++	vcc5v0_sys: vcc5v0-sys-regulator {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_sys";
++		regulator-always-on;
++		regulator-boot-on;
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		vin-supply = <&dc_12v>;
++	};
++
++	vcc5v0_usb_host: vcc5v0-usb-host-regulator {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_usb_host";
++		enable-active-high;
++		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&vcc5v0_usb_host_en_pin>;
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		vin-supply = <&vcc5v0_sys>;
++	};
 +};
 +
 +&cpu0 {
@@ -124,41 +180,73 @@ index 000000000000..b3016437640b
 +	cpu-supply = <&vdd_cpu>;
 +};
 +
-+&gmac0 {
-+	assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
-+	assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>;
++&gmac1 {
++	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
++	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
 +	assigned-clock-rates = <0>, <125000000>;
 +	clock_in_out = "output";
-+	phy-handle = <&rgmii_phy0>;
++
++	snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;
++	snps,reset-active-low;
++	/* Reset time is 20ms, 100ms for rtl8211f */
++	snps,reset-delays-us = <0 20000 100000>;
++
++	phy-handle = <&rgmii_phy1>;
 +	phy-mode = "rgmii";
-+	phy-supply = <&vcc3v3_sys>;
++
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&gmac0_miim
-+		     &gmac0_tx_bus2
-+		     &gmac0_rx_bus2
-+		     &gmac0_rgmii_clk
-+		     &gmac0_rgmii_bus>;
++	pinctrl-0 = <&gmac1m0_miim
++		     &gmac1m0_tx_bus2
++		     &gmac1m0_rx_bus2
++		     &gmac1m0_rgmii_clk
++		     &gmac1m0_rgmii_bus>;
 +	status = "okay";
 +
-+	tx_delay = <0x4f>;
-+	rx_delay = <0x2d>;
++	tx_delay = <0x47>;
++	rx_delay = <0x27>;
++};
++
++&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 {
++	status = "okay";
 +};
 +
 +&i2c0 {
 +	status = "okay";
 +
-+	vdd_cpu: regulator@1c {
-+		compatible = "tcs,tcs4525";
-+		reg = <0x1c>;
-+		fcs,suspend-voltage-selector = <1>;
++	vdd_cpu: regulator@41 {
++		compatible = "rockchip,rk8600";
++		reg = <0x41>;
++		vin-supply = <&vcc5v0_sys>;
 +		regulator-name = "vdd_cpu";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <800000>;
-+		regulator-max-microvolt = <1150000>;
++		regulator-min-microvolt = <712500>;
++		regulator-max-microvolt = <1500000>;
 +		regulator-ramp-delay = <2300>;
-+		vin-supply = <&vcc3v3_sys>;
-+
++		fcs,suspend-voltage-selector = <1>;
++		regulator-boot-on;
++		regulator-always-on;
 +		regulator-state-mem {
 +			regulator-off-in-suspend;
 +		};
@@ -169,10 +257,18 @@ index 000000000000..b3016437640b
 +		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_l>;
++		pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
++
 +		rockchip,system-power-controller;
++		#sound-dai-cells = <0>;
++		wakeup-source;
++
 +		vcc1-supply = <&vcc3v3_sys>;
 +		vcc2-supply = <&vcc3v3_sys>;
 +		vcc3-supply = <&vcc3v3_sys>;
@@ -182,7 +278,6 @@ index 000000000000..b3016437640b
 +		vcc7-supply = <&vcc3v3_sys>;
 +		vcc8-supply = <&vcc3v3_sys>;
 +		vcc9-supply = <&vcc3v3_sys>;
-+		wakeup-source;
 +
 +		regulators {
 +			vdd_logic: DCDC_REG1 {
@@ -378,24 +473,64 @@ index 000000000000..b3016437640b
 +	};
 +};
 +
-+&mdio0 {
-+	rgmii_phy0: ethernet-phy@0 {
++&i2c1 {
++	clock-frequency = <400000>;
++	status = "okay";
++
++	rtc: rtc@51 {
++		compatible = "nxp,pcf8563";
++		reg = <0x51>;
++		#clock-cells = <0>;
++	};
++};
++
++&i2s0_8ch {
++	status = "okay";
++};
++
++&i2s1_8ch {
++	rockchip,trcm-sync-tx-only;
++	status = "okay";
++};
++
++&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>;
 +	};
 +};
 +
 +&pinctrl {
++	fspi {
++		fspi_dual_io_pins: fspi-dual-io-pins {
++			rockchip,pins =
++				/* fspi_clk */
++				<1 RK_PD0 1 &pcfg_pull_none>,
++				/* fspi_cs0n */
++				<1 RK_PD3 1 &pcfg_pull_none>,
++				/* fspi_d0 */
++				<1 RK_PD1 1 &pcfg_pull_none>,
++				/* fspi_d1 */
++				<1 RK_PD2 1 &pcfg_pull_none>;
++		};
++	};
++
++	ethernet {
++		eth_phy_rst: eth_phy_rst {
++			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++
 +	leds {
 +		led_power_pin: led-power-pin {
-+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
++			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 +		};
-+		led_work_pin: led-work-pin {
++		led_act_pin: led-act-pin {
 +			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
 +		};
++		led_usr_pin: led-user-pin {
++			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
 +	};
 +
 +	pmic {
@@ -403,6 +538,12 @@ index 000000000000..b3016437640b
 +			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
 +		};
 +	};
++
++	usb {
++		vcc5v0_usb_host_en_pin: vcc5v0-usb-host-en-pin {
++			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
 +};
 +
 +&pmu_io_domains {
@@ -411,9 +552,9 @@ index 000000000000..b3016437640b
 +	vccio1-supply = <&vccio_acodec>;
 +	vccio2-supply = <&vcc_1v8>;
 +	vccio3-supply = <&vccio_sd>;
-+	vccio4-supply = <&vcc_1v8>;
-+	vccio5-supply = <&vcc_3v3>;
-+	vccio6-supply = <&vcc_3v3>;
++	vccio4-supply = <&vcc_1v8>; /* float */
++	vccio5-supply = <&vcc_1v8>;
++	vccio6-supply = <&vcc_1v8>;
 +	vccio7-supply = <&vcc_3v3>;
 +	status = "okay";
 +};
@@ -441,15 +582,137 @@ index 000000000000..b3016437640b
 +	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";
 +};
 +
++&sfc {
++	/* Dual I/O mode as the D2 pin conflicts with the eMMC */
++	pinctrl-0 = <&fspi_dual_io_pins>;
++	pinctrl-names = "default";
++	#address-cells = <1>;
++	#size-cells = <0>;
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <100000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <1>;
++
++		partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				label = "SPL";
++				reg = <0x0 0xe0000>;
++			};
++			partition@e0000 {
++				label = "U-Boot Env";
++				reg = <0xe0000 0x20000>;
++			};
++			partition@100000 {
++				label = "U-Boot";
++				reg = <0x100000 0x200000>;
++			};
++			partition@300000 {
++				label = "splash";
++				reg = <0x300000 0x100000>;
++			};
++			partition@400000 {
++				label = "Filesystem";
++				reg = <0x400000 0xc00000>;
++			};
++		};
++	};
++};
++
++&tsadc {
++	rockchip,hw-tshut-mode = <1>;
++	rockchip,hw-tshut-polarity = <0>;
++	status = "okay";
++};
++
 +&uart2 {
 +	status = "okay";
 +};
--- 
-2.39.2
-
++
++&usb_host0_ehci {
++	status = "okay";
++};
++
++&usb_host0_ohci {
++	status = "okay";
++};
++
++&usb_host0_xhci {
++	dr_mode = "host";
++	status = "okay";
++};
++
++&usb_host1_ehci {
++	status = "okay";
++};
++
++&usb_host1_ohci {
++	status = "okay";
++};
++
++&usb_host1_xhci {
++	status = "okay";
++	phys = <&usb2phy0_host>;
++	phy-names = "usb2-phy";
++	snps,dis_u2_susphy_quirk;
++	extcon = <&usb2phy0>;
++	maximum-speed = "high-speed";
++};
++
++&usb2phy0 {
++	status = "okay";
++};
++
++&usb2phy0_host {
++	phy-supply = <&vcc5v0_usb_host>;
++	status = "okay";
++};
++
++&usb2phy0_otg {
++	phy-supply = <&vcc5v0_usb_host>;
++	status = "okay";
++};
++
++&usb2phy1 {
++	status = "okay";
++};
++
++&usb2phy1_host {
++	phy-supply = <&vcc5v0_usb_host>;
++	status = "okay";
++};
++
++&usb2phy1_otg {
++	phy-supply = <&vcc5v0_usb_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>;
++	};
++};