Bump version 4.10

* Make odroid upstream again

* Fix question

* Linux 5.7

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>

* Add patch

* Add DT sound

* fix build

* Fix kernel options

* working audio

.github/ISSUE_TEMPLATE.md

@@ -1,54 +1,32 @@
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
-- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/operating-system/releases
-- Do not report issues for integrations here, please refer to https://github.com/home-assistant/core/issues
-- Do not report issues for Add-Ons here, please refer to
-  Official Add-ons: https://github.com/home-assistant/addons/issues
-  Home Assistant Community Add-ons: https://github.com/hassio-addons/repository
+- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Do not report issues for components here, plaese refer to https://github.com/home-assistant/home-assistant/issues
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
-- Provide as many details as possible. Paste logs, configuration sample and code using blocks with three backticks. Do not delete text from this template!
-- Please add modifications to boot files, e.g. if you are using Raspberry Pi and did modifications in config.txt.
+- Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
+- If you have a problem with a Add-on, make a issue on there repository.
 -->
 
-**Hardware Environment**
+**HassOS release with the issue:**
 <!--
-Describe the Homme Assistant image you are using and the hardare environemnt
--->
-- [ ] Raspberry Pi [1/2/3/4]
-- [ ] ODROID [C2/C4/N2(+)/XU4]
-- [ ] ASUS Tinker [S]
-- [ ] Intel NUC (or compatible)
-- [ ] OVA (Open Virtualization Applicance, on Intel NUC or any other hardware, please add the Hypervisor you are using)
-
-**Home Assistant OS release:**
-- [ ] Fresh installation of release x.y
-- [ ] Updated from version x.y
-- Additional information (if accessible):
-<!--
-- Home Assistant Frontend -> Configuration -> Info (use the copy button in the System Health block)
-- Or use this command: `ha info`
+- Frontend -> Developer tools -> Info
+- Or use this command: hass --version
 -->
 
 **Supervisor logs:**
 <!--
-- Home Assistant Frontend -> Supervisor -> System (Log Provider Supervisor)
+- Frontend -> Hass.io -> System
 - Or use this command: ha su logs
 -->
 
 **Journal logs:**
 <!--
-- Enable SSH on OS level and login, then use `journalctl`
+- use this command: journalctl
 -->
 
 **Kernel logs:**
 <!--
 - use this command: dmesg
-- Enable SSH on OS level and login, then use `dmesg`.
 -->
 
 **Description of problem:**
-<!--
-- Is the problem reproducible?
-- Has this been working before (is this a regression?)
-- Has there been attempt to rule out harware issues? (different SD card etc.)
--->

.github/release-drafter.yml

@@ -1,18 +1,16 @@
 categories:
-  - title: 'Home Assistant Operating System'
+  - title: 'HassOS Core'
     label: 'os'
-  - title: 'Build System'
+  - title: 'Build'
     label: 'build'
   - title: 'Raspberry Pi'
     label: 'board/raspberrypi'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
-  - title: 'Intel NUC'
+  - title: 'Intel-Nuc'
     label: 'board/intel-nuc'
-  - title: 'Hardkernel ODROID'
+  - title: 'Hardkernel'
     label: 'board/hardkernel'
-  - title: 'ASUS Tinker'
-    label: 'board/tinker'
 template: |
   ## Changes
 

.github/workflows/dev.yml

@@ -1,89 +0,0 @@
-# Home Assistant Operating System build workflow
-
-name: Development build
-
-on:
-  workflow_dispatch:
-
-jobs:
-  version:
-
-    name: Generate version
-    runs-on: [ "ubuntu-20.04" ]
-    outputs:
-      version_main: ${{ steps.version_main.outputs.version_main }}
-      version_dev: ${{ steps.version_dev.outputs.version_dev }}
-    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 "::set-output name=version_dev::${version_dev}"
-      - uses: actions/checkout@v2
-      - 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 "::set-output name=version_main::${major}.${build}"
-
-  build:
-    name: Release build for ${{ matrix.board.name }}
-    needs: version
-    strategy:
-      fail-fast: false
-      matrix:
-        board:
-          - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
-          - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
-          - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
-          - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
-          - {"name": "odroid_xu4", "output": "odroid-xu4" , "runner": "aarch64-runner"}
-          - {"name": "rpi", "output": "rpi", "runner": "arm-runner"}
-          - {"name": "rpi0_w", "output": "rpi0-w", "runner": "arm-runner"}
-          - {"name": "rpi2", "output": "rpi2", "runner": "arm-runner"}
-          - {"name": "rpi3", "output": "rpi3", "runner": "arm-runner"}
-          - {"name": "rpi3_64", "output": "rpi3-64", "runner": "aarch64-runner"}
-          - {"name": "rpi4", "output": "rpi4", "runner": "arm-runner"}
-          - {"name": "rpi4_64", "output": "rpi4-64", "runner": "aarch64-runner"}
-          - {"name": "tinker", "output": "tinker", "runner": "arm-runner"}
-    runs-on: ${{ matrix.board.runner }}
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - 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" \
-            haos-builder make VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
-
-      - name: Upload images
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.DEV_HOST }}
-          username: ${{ secrets.DEV_USERNAME }}
-          port: ${{ secrets.DEV_PORT }}
-          key: ${{ secrets.DEV_SCP_KEY }}
-          source: "release/*"
-          target: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}/
-          strip_components: 1
-

.github/workflows/pr-checks.yml

@@ -1,20 +0,0 @@
-# Home Assistant Operating System pull-request checks
-
-name: PR checks
-
-on: [pull_request]
-
-jobs:
-  linters:
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v1
-    - name: Check Dockerfile
-      uses: brpaz/hadolint-action@v1.1.0
-      with:
-        dockerfile: Dockerfile
-    - name: Check shell scripts
-      uses: ludeeus/action-shellcheck@1.0.0
-      with:
-        ignore: "buildroot"

.github/workflows/release-drafter.yml

@@ -1,15 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - dev
-      - rel-4
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,169 +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 }}
-    steps:
-      - uses: actions/checkout@v2
-      - 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)
-          if [ "${major}.${build}" != "${{ github.event.release.tag_name }}" ]; then
-            echo "Version number in Buildroot metadata is does not match tag (${major}.${build} vs ${{ github.event.release.tag_name }})."
-            exit 1
-          fi
-          echo "::set-output name=version::${major}.${build}"
-
-  build:
-    name: Release build for ${{ matrix.board.name }}
-    needs: validate_release
-    strategy:
-      matrix:
-        board:
-          - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
-          - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
-          - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
-          - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
-          - {"name": "odroid_xu4", "output": "odroid-xu4" , "runner": "aarch64-runner"}
-          - {"name": "rpi", "output": "rpi", "runner": "arm-runner"}
-          - {"name": "rpi0_w", "output": "rpi0-w", "runner": "arm-runner"}
-          - {"name": "rpi2", "output": "rpi2", "runner": "arm-runner"}
-          - {"name": "rpi3", "output": "rpi3", "runner": "arm-runner"}
-          - {"name": "rpi3_64", "output": "rpi3-64", "runner": "aarch64-runner"}
-          - {"name": "rpi4", "output": "rpi4", "runner": "arm-runner"}
-          - {"name": "rpi4_64", "output": "rpi4-64", "runner": "aarch64-runner"}
-          - {"name": "tinker", "output": "tinker", "runner": "arm-runner"}
-    runs-on: ${{ matrix.board.runner }}
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - 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" \
-            haos-builder make VERSION_DEV="" ${{ matrix.board.name }}
-
-      - name: Upload disk image
-        if: ${{ matrix.board.name != '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ 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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_content_type: application/octet-stream
-
-      - name: Upload ova image
-        if: ${{ matrix.board.name == '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
-          asset_content_type: application/x-tar
-
-      - name: Upload qcow2 image
-        if: ${{ matrix.board.name == '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload vdi image
-        if: ${{ matrix.board.name == '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload vhdx image
-        if: ${{ matrix.board.name == '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.xz
-          asset_content_type: application/x-xz
-
-      - name: Upload vmdk image
-        if: ${{ matrix.board.name == '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/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.xz
-          asset_content_type: application/x-xz
-
-  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 dev version
-      uses: home-assistant/actions/helpers/version-push@master
-      with:
-        key: "hassos[]"
-        key-description: "Home Assistant OS"
-        version: ${{ needs.validate_release.outputs.version }}
-        channel: "dev"

.gitignore

@@ -1,3 +1,2 @@
-.DS_Store
 /release
 *.pem

Dockerfile

@@ -38,8 +38,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         wget \
         qemu-utils \
-        openssh-client \
-        vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry

Documentation/README.md

@@ -1,13 +0,0 @@
-# Developer Documentation
-
-## Contents
-
-- [Getting started](./getting_started_development.md) - the place for developers to begin
-- [Development](./development.md) - more details for developers
-- [Deployment](./deployment.md) - approach to git branching and releases
-- [Configuration](./configuration.md) - how users can configure HassOS
-- [Partition](./partition.md) - partition layout
-- [Network](./network.md) - approach to networking
-- [Bluetooth](./bluetooth.md) - approach to bluetooth
-- [Kernel](./kernel.md) - kernel versions
-- [Boards](./boards/README.md) - board specific documentation

Documentation/boards/README.md

@@ -1,55 +0,0 @@
-# Boards
-
-## Overview
-
-The following boards/devices are supported:
-
-- Raspberry Pi
-  - Pi 4 Model B (1 GB, 2 GB and 4 GB model) 32-bit (recommended)
-  - Pi 4 Model B (1 GB, 2 GB and 4 GB model) 64-bit
-  - Pi 3 Model B and B+ 32-bit (recommended)
-  - Pi 3 Model B and B+ 64-bit
-  - Pi 2 (not recommended)
-  - Pi Zero-W (not recommended)
-  - Pi (not recommended)
-- Hardkernel
-  - Odroid-C2
-  - Odroid-C4 (_experimental_)
-  - Odroid-N2
-  - Odroid-XU4
-- Intel NUC
-  - Intel NUC5CPYH
-  - Intel NUC6CAYH
-  - Intel NUC10I3FNK2
-  - Gigabyte GB-BPCE-3455
-  - Others recent Intel NUC computers are likely to work too, only those listed above have been tested.
-- Asus
-  - Tinker Board
-- Virtual appliance (x86_64/UEFI):
-  - VMDK
-  - OVA ?
-  - VHDX ?
-  - VDI ?
-  - QCOW2 ?
-
-Notes:
-  - see ? above: are these currently supported? see ova documentation which explains issues with previous OVA distribution)
-
-## Board specifics
-
-|Board|Build|Config|Docs|
-|-----|----|------|----|
-|Pi4B 32-bit |`make rpi4`      |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi4B 64-bit |`make rpi4_64`   |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 32-bit |`make rpi3`      |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 64-bit |`make rpi3_64`   |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi2         |`make rpi2`      |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi Zero     |`make rpi0_w`    |[rpi0_w](../../buildroot-external/configs/rpi0_w_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi          |`make rpi`       |[rpi](../../buildroot-external/configs/rpi_defconfig)|[raspberrypi](./raspberrypi/)|
-|Odroid-C2   |`make odroid_c2` |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-C4   |`make odroid_c4` |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-N2   |`make odroid_n2` |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-XU4  |`make odroid_xu4`|[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
-|NUC         |`make intel_nuc` |[intel_nuc](../../buildroot-external/configs/intel_nuc_defconfig)|[intel](./intel/)|
-|Tinker Board|`make tinker`    |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
-|OVA         |`make ova`       |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|

Documentation/boards/asus/README.md

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

Documentation/boards/hardkernel/README.md

@@ -1,12 +0,0 @@
-# ODROID
-
-## Supported Hardware
-
-| Device         | Release Date  | Support      | Config    |
-|----------------|---------------|--------------|-----------|
-| ODROID-XU4     | 2015          | yes          | [odroid_xu4](../../../buildroot-external/configs/odroid_xu4_defconfig)|
-| ODROID-C2      | 2016          | yes          | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
-| ODROID-C4      | 2020          | experimental | [odroid_c4](../../../buildroot-external/configs/odroid_c4_defconfig) |
-| ODROID-N2      | 2019          | yes          | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
-
-See separate documentation for each board.

Documentation/boards/hardkernel/odroid-c4.md

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

Documentation/boards/hardkernel/odroid-xu4.md

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

Documentation/boards/intel/README.md

@@ -1,56 +0,0 @@
-# Intel NUC
-
-## Supported Hardware
-
-This board configuration supports the Intel NUC mini PCs and compatibles. It should work for most recent NUC computers and, because this is a UEFI based image, it should in fact work with for any x86-64 based computer with UEFI. Hardware it has been tested with is listed below.
-
-## Tested Hardware
-
-| Device                | Release Date | Support | Config      |
-|-----------------------|--------------|---------|-------------|
-| Intel NUC5CPYH        | Q3 2015      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Intel NUC6CAYH        | Q4 2016      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Intel NUC10i3FNK2     | Q4 2019      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Gigabyte GB-BPCE-3455 | 2017         | yes*    | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-
-\* needs 'nomodeset' in cmdline.txt if you want a console
-
-
-## Requirements
-
-- x86-64 support
-- UEFI boot
-- SATA/AHCI storage
-- Supported NIC:
-  - Intel Gigabit NIC (e1000, igb - via Linux mainline)
-  - Intel PCIe Gigabit NIC (e1000e - via out-of-tree module in *buildroot-external/package/intel-e1000e*)
-  - Realtek Gigabit NIC (r8169)
-  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
-
-## Wifi
-
-The following cards are supported:
-
-- Intel Wireless 3160
-- Intel Wireless 7260
-- Intel Wireless 7265
-- Intel Wireless-AC 3165
-- Intel Wireless-AC 3168
-- Intel Wireless-AC 8260
-- Intel Wireless-AC 8265
-- Intel Wireless-AC 9260
-- Intel Wireless-AC 9461
-- Intel Wireless-AC 9462
-- Intel Wireless-AC 9560
-
-## Bluetooth
-
-Bluetooth is untested.
-
-## Installation
-
-Currently there is no shiny installation method. Checklist:
-- Boot PC to live-environment using PXE or USB
-- Copy or download the hassos image into your live environment
-- zcat the image to local harddisk
-- Reboot

Documentation/boards/nuc.md

@@ -0,0 +1,51 @@
+# Intel NUC
+
+This board configuration supports the Intel NUC mini PCs and compatibles. 
+Probably most recent computers will work.
+
+Requirements:
+- x86-64 support
+- UEFI boot
+- SATA/AHCI storage
+- Supported NIC:
+  - Intel Gigabit NIC (e1000, e1000e, igb)
+  - Realtek Gigabit NIC (r8169)
+  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
+
+## Tested Hardware
+
+| Device | Quirks | 
+|--------|-----------|
+| Intel NUC5CPYH |  |
+| Intel NUC6CAYH |  |
+| Gigabyte GB-BPCE-3455 | needs 'nomodeset' in cmdline.txt if you want a console |
+
+
+## Wifi
+
+The following cards are supported:
+
+- Intel Wireless 3160
+- Intel Wireless 7260
+- Intel Wireless 7265
+- Intel Wireless-AC 3165
+- Intel Wireless-AC 3168
+- Intel Wireless-AC 8260
+- Intel Wireless-AC 8265
+- Intel Wireless-AC 9260
+- Intel Wireless-AC 9461
+- Intel Wireless-AC 9462
+- Intel Wireless-AC 9560
+
+## Bluetooth
+
+Bluetooth is untested.
+
+## Installation
+
+Currently there is no shiny installation method. Checklist:
+- Boot PC to live-environment using PXE or USB
+- Copy or download the hassos image into your live environment
+- zcat the image to local harddisk
+- Reboot
+

Documentation/boards/ova.md

@@ -0,0 +1,18 @@
+# Virtual Machine
+
+Using this VMDK in a virtual machine requires the following:
+
+- Operating system: Other 4.x or later Linux (64-bit)
+- Enabled support for UEFI boot
+- SATA disk controller
+- Minimal of 1GB RAM
+- At least 2x vCPU
+- An assigned network
+
+# OVA (Open Virtual Appliance)
+
+Currently, we only publish a VMDK virtual disk, due to issues with our previous OVA distribution. We are currently investigating our options to bring back the OVA distribution. However, the VMDK works on the following hypervisors:
+
+- HyperV
+- VirtualBox
+- VMware

Documentation/boards/ova/README.md

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

Documentation/boards/raspberrypi.md

@@ -0,0 +1,49 @@
+# Raspberry PI
+
+Supported Hardware:
+
+| Device | Board |
+|--------|-----------|
+| Raspberry Pi A+/B/B+| rpi |
+| Raspberry Pi Zero | rpi |
+| Raspberry Pi Zero W | rpi0-w |
+| Raspberry Pi 2 B | rpi2 |
+| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
+| Raspberry Pi 4 B | rpi4 / rpi4-64 |
+
+## Limitation 64bit
+
+The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
+
+## Serial console
+
+For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
+
+## I2C
+
+Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
+
+rpi-i2c.conf:
+```
+i2c-dev
+i2c-bcm2708
+```
+
+## USB Boot
+
+USB mass storage boot is available on Raspberry Pi 3B, 3B+, 3A+, and 2B v1.2.
+To enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
+
+For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
+
+### Caveats
+
+* All bootable SD cards must be removed.
+* Boot time can be significantly longer with USB. This is due to the boot process first attempting to boot from SD card, failing, and resorting to USB.
+* Many USB drives simply do not work for boot. This is likely due to minimal driver support in uboot and will not be fixed. If you can't get it to boot on one drive, try a different brand/model. SanDisk Cruzer drives seem to have a higher rate of issues.
+
+## Tweaks
+
+If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
+
+[config]: ../configuration.md#automatic

Documentation/boards/raspberrypi/README.md

@@ -1,56 +0,0 @@
-# Raspberry PI
-
-## Supported Hardware
-
-| 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 Zero   |2015           | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig)              |
-| Raspberry Pi Zero W |2017           | not recommended | [rpi0_w](../../../buildroot-external/configs/rpi0_w_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) |
-
-\*1,2 and 4 GiB versions of the Raspberry Pi 4 B are supported. Support for the 8 GiB version is coming soon is part of #740.
-
-## Limitation 64bit
-
-The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
-
-## Serial console
-
-For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
-
-## I2C
-
-Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
-
-rpi-i2c.conf:
-```
-i2c-dev
-i2c-bcm2708
-```
-
-## USB Boot
-
-USB mass storage boot is available on Raspberry Pi 4 (64-bit only), 3B, 3B+, 3A+, and 2B v1.2.
-
-For Raspberry 3B, 3A+ and 2B v1.2, to enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
-
-For Raspberry 4, make sure to update the bootloader to a stable release
-supporting USB mass storage boot (see
-[bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot). If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
-
-For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
-
-### Caveats
-
-* All bootable SD cards must be removed.
-* Boot time can be significantly longer with USB. This is due to the boot process first attempting to boot from SD card, failing, and resorting to USB.
-* Many USB drives simply do not work for boot. This is likely due to minimal driver support in uboot and will not be fixed. If you can't get it to boot on one drive, try a different brand/model. SanDisk Cruzer drives seem to have a higher rate of issues.
-
-## Tweaks
-
-If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
-
-[config]: ../../configuration.md#automatic

Documentation/boards/tinker.md

@@ -0,0 +1,19 @@
+# Tinker Board
+
+Supported Hardware:
+
+| Device | Board | 
+|--------|-----------|
+| Tinker RK3288 | tinker |
+| Tinker S RK3288 |  |
+
+<!--
+## eMMC
+
+eMMC support is provided transparently. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB.
+-->
+
+## Serial console
+
+To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
+

Documentation/configuration.md

@@ -59,4 +59,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
 [network.md]: network.md
 [hassos-release]: https://github.com/home-assistant/hassos/releases/
-[debug-homeassistant]: https://developers.home-assistant.io/docs/operating-system/debugging
+[debug-homeassistant]: https://developers.home-assistant.io/docs/en/hassio_debugging.html

Documentation/deployment.md

@@ -2,8 +2,8 @@
 
 We provide 3 different types of release builds:
 
-- development (dev)
-- staging (beta)
+- development (beta/dev)
+- staging (rc)
 - production (stable)
 
 ## Versioning
@@ -15,7 +15,7 @@ The development number they will be bump for the stable release version and the
 
 The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.
 
-If we create a new productive/staging release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
+If we create a new productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
 
 ## Upload release files
 

Documentation/development.md

@@ -36,7 +36,6 @@ Default 2. That is the size of end image in GB.
 
 - intel-nuc
 - odroid-c2
-- odroid-c4
 - odroid-n2
 - odroid-xu
 - qemuarm

Documentation/kernel.md

@@ -5,15 +5,14 @@ Default Kernel tree: 5.4
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.4.109 |
-| Raspberry Pi | 5.4.83 |
-| Raspberry Pi 0-W | 5.4.83 |
-| Raspberry Pi 2 | 5.4.83 |
-| Raspberry Pi 3 | 5.4.83 |
-| Raspberry Pi 4 | 5.4.83 |
-| Tinker Board | 5.4.109 |
-| Odroid-C2 | 5.9.16 |
-| Odroid-C4 | 5.9.16 |
-| Odroid-N2 | 5.9.16 |
-| Odroid-XU4 | 5.9.16 |
-| Intel NUC | 5.4.109 |
+| Open Virtual Applicance | 5.4.44 |
+| Raspberry Pi | 4.19.126 |
+| Raspberry Pi 0-W | 4.19.126 |
+| Raspberry Pi 2 | 4.19.126 |
+| Raspberry Pi 3 | 4.19.126 |
+| Raspberry Pi 4 | 4.19.126 |
+| Tinker Board | 5.4.44 |
+| Odroid-C2 | 5.7.0 |
+| Odroid-N2 | 5.7.0 |
+| Odroid-XU4 | 5.7.0 |
+| Intel NUC | 5.4.44 |

Documentation/network.md

@@ -1,6 +1,6 @@
 # Network
 
-Home Assistant Operating System uses NetworkManager to control the host network.
+HassOS uses NetworkManager to control the host network.
 
 ## Configure network
 
@@ -10,8 +10,6 @@ Only a manual configuration using NetworkManager connection files is supported.
 
 You can read the [NetworkManager manual][nm-manual] or find many configuration examples across the internet. Keep in mind that the system is read-only. If you don't want the IP address to change on every boot, you should modify the UUID property to a generic [UUID4][uuid]. Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a file called `my-network` and add the appropriate contents below:
 
-**NOTE: Please make sure to save this file with UNIX line endings (LF, and not Windows' default CRLF endings). You can do this using Notepad these days!**
-
 ### Default
 
 A preinstalled connection profile is provided by default:
@@ -150,6 +148,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/NetworkManager.conf.html
+[nm-manual]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
 [configuration-usb]: configuration.md
 [uuid]: https://www.uuidgenerator.net/

Documentation/partition.md

@@ -1,8 +1,8 @@
 # Partition
 
-The partition layout is a bit different than the typical setup. We prefer GPT, if possible. With SoCs which don't support GPT, we use a hybrid GPT. For more details about this topic, please refer to the [development](development.md) documentation.
+The partition layout is a bit different than for regular setups. We prefer GPT, if possible. With SoCs which don't support GPT, we use the hybrid GPT. For more details about this topic, please refer to the [development](development.mnd) documentation.
 
-The system is designed to have as few write operations to the storage media as possible. This means that we only write during the OTA updates and 5-6 times per week on the overlay partition. The data partition receives the main I/O operations and for this reason is ideal for placing on a different drive.
+The system is designed to have as less as possible write operations on the storage media. Which means that we have basically only write during the OTA update and 5-6 times per week on the overlay part. The data partition is having I/O. This is the reason which is should be run on a different drive.
 
 A visual representation looks like this:
 
@@ -36,28 +36,12 @@ Sometime the bootloader part can look different because there can be firmware or
 
 ## Data
 
-The data partition is the only partition with real I/O. It will be expanded automatically at boot to the full size of the disk.
+The data partition is the only partition with real I/O. It will be expanded automatic on boot time to the full size of the disk.
 
-
-## Using datactl to move the data partition.
-
-In a Home Assistant OS installation, the data is stored on the `/mnt/data` partition of the SD card. This is the only read+write partition on the SD drive. Using the `datactl` move command, this partition can be moved off of the SD card onto an externally connected drive, leaving the rest of the read-only system on the SD.
-
-The storage capacity of the external drive must be larger than the storage capacity of the existing SD card.
-
-The command needs to be run from the host console by either connecting a keyboard and monitor or making use of the [debug ssh access](https://developers.home-assistant.io/docs/operating-system/debugging/) over port 22222. The command will not work from within an SSH add-on container.
-
-Log in as `root` to get to the Home Assistant CLI and then enter `login` to continue to the host.
-
-Confirm your USB SSD/HD is connected and recognized using `fdisk -l`.
-
-With the drive connected, use the following command (replacing sdx with your drive, without a partition number):
+This partition can be offloaded to a different drive with the utility:
 
 ```sh
-$ datactl move /dev/sdx
+$ datactl move /dev/xxx
 ```
 
-Enter "yes" to confirm the operation. This will prepare the disk, however, the
-actual move will be running on next reboot. Once complete, the external drive
-will contain the data and will need to be plugged in to successfully boot Home
-Assistant OS.
+On next boot, the partition will be moved to the new drive. The drive needs to be bigger as the old one and we own the full new drive.

Makefile

@@ -3,19 +3,10 @@ RELEASE_DIR = /build/release
 BUILDROOT=/build/buildroot
 BUILDROOT_EXTERNAL=/build/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)))
 
-# Set O variable if not already done on the command line
-ifneq ("$(origin O)", "command line")
-O := $(BUILDROOT)/output
-else
-override O := $(BUILDROOT)/$(O)
-endif
-
 .NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all
 
 .PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
@@ -31,8 +22,8 @@ $(TARGETS_CONFIG): %-config:
 
 $(TARGETS): %: $(RELEASE_DIR) %-config
 	@echo "build $@"
-	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
-	cp -f $(O)/images/hassos_* $(RELEASE_DIR)/
+	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
+	cp -f $(BUILDROOT)/output/images/hassos_* $(RELEASE_DIR)/
 
 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)

README.md

@@ -1,58 +1,18 @@
-# Home Assistant Operating System
+# Home Assistant Operating system
 
-Home Assistant Operating System (formerly HassOS) is an operating system optimized for hosting [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).
+Home Assistant Operating System (HassOS) is based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of hardware. It is also available as virtual appliance for different virtualization solutions. The whole system is optimized for hosting [Home Assistant](https://www.home-assistant.io) and its features (to be precise, the [Add-ons](https://www.home-assistant.io/addons/)). You can update the system by using OTA updates or offline updates.
 
-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 for running Home Assistant, especially on single board compute (SBC) devices like the Pi, ODROID, NUC and Tinker Board (see supported hardware below).
+This is an embedded Linux which works different than a normal Linux distribution. The system is designed to run with minimal I/O and is optimized for its tasks.
 
-## Features
+If you don't have experience with embedded systems, buildroot or the build process Linux distributions, then please read up on those topics. All provided documentation here is focusing on developers with a background on embedded systems or a strong understanding of the internal workings of operating systems.
 
-- Lightweight and memory-efficient
-- Minimized I/O
-- Over The Air (OTA) updates
-- Offline updates
-- Modular using Docker
+## Focus
 
-## Supported hardware
-
-- Raspberry Pi
-- Hardkernel ODROID
-- Intel NUC
-- Asus Tinker Board
-- Virtual appliances
-
-See the full list and specific models [here](./Documentation/boards/README.md)
-
-## Getting Started
-
-If you just want to use Home Assistant the official [getting started guide](https://www.home-assistant.io/getting-started/) and [installation instructions](https://www.home-assistant.io/hassio/installation/) take you through how to download Home Assistant Operating System and get it running on your machine.
-
-If you're interested in finding out more about Home Assistant Operating System and how it works read on...
-
-## HassOS components
-
-- **Bootloader:**
-  - [Barebox](https://barebox.org/) for devices that support EFI
-  - [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support EFI
-- **Operating System:**
-  - [Buildroot](https://buildroot.org/) LTS Linux
-- **File Systems:**
-  - [SquashFS](https://www.kernel.org/doc/Documentation/filesystems/squashfs.txt) for read-only file systems (using LZ4 compression)
-  - [ZRAM](https://www.kernel.org/doc/Documentation/blockdev/zram.txt) for `/tmp`, `/var` and swap (using LZ4 compression)
-- **Container Platform:**
-  - [Docker Engine](https://docs.docker.com/engine/) for running Home Assistant components in containers
-- **Updates:**
-  - [RAUC](https://rauc.io/) for Over The Air (OTA) and USB updates
-- **Security:**
-  - [AppArmor](https://apparmor.net/) Linux kernel security module
-
-If you don't have experience with these, embedded systems, buildroot or the build process for Linux distributions, then please read up on these topics. The rest of the documentation in this project is for developers and assumes you have experience with embedded systems or a strong understanding of the internal workings of operating systems.
-
-## Developer Documentation
-
-All developer documentation is in the [Documentation](./Documentation) directory.
-
-### Development builds
-
-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/).
+- Barebox as bootloader on EFI
+- U-Boot as bootloader
+- Linux/Buildroot LTS
+- RAUC for OTA updates
+- SquashFS LZ4 as filesystem
+- Docker-CE
+- AppArmor protected
+- ZRAM LZ4 for `/tmp`, `/var` and swap

azure-pipelines-ci.yml

@@ -0,0 +1,53 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+pr:
+- dev
+
+variables:
+  - name: versionHadolint
+    value: 'v1.17.2'
+  - name: versionShellCheck
+    value: 'v0.7.0'
+
+jobs:
+
+- job: 'Hadolint'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: |
+      sudo docker pull hadolint/hadolint:$(versionHadolint)
+    displayName: 'Install Hadolint'
+  - script: |
+      sudo docker run --rm -i \
+        -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \
+        hadolint/hadolint:$(versionHadolint) < Dockerfile
+    displayName: 'Run Hadolint'
+
+
+- job: 'ShellCheck'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: |
+      sudo docker pull koalaman/shellcheck:$(versionShellCheck)
+    displayName: 'Install ShellCheck'
+  - script: |
+      set -e
+
+      # Check build script
+      sudo docker run --rm -i \
+        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) \
+          scripts/*.sh \
+          buildroot-external/scripts/*.sh \
+          buildroot-external/board/**/*.sh \
+          buildroot-external/rootfs-overlay/usr/bin/* \
+          buildroot-external/rootfs-overlay/usr/sbin/* \
+          buildroot-external/rootfs-overlay/usr/libexec/* \
+          buildroot-external/rootfs-overlay/usr/lib/rauc/*
+    displayName: 'Run ShellCheck'

azure-pipelines-release.yml

@@ -0,0 +1,95 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  tags:
+    include:
+    - '*'
+    exclude:
+    - untagged*
+pr: none
+
+variables:
+  - name: versionGHR
+    value: 'v0.13.0'
+  - group: github
+  - group: rauc
+
+jobs:
+
+- job: 'VersionValidate'
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - script: |
+      . buildroot-external/meta
+
+      if [ "${VERSION_MAJOR}.${VERSION_BUILD}" != "$(Build.SourceBranchName)" ]; then
+        exit 1
+      fi
+    displayName: 'Check version of branch/tag'
+
+
+- job: 'Release'
+  dependsOn:
+  - 'VersionValidate'
+  timeoutInMinutes: 240
+  pool:
+    name: 'Buildroot'
+  strategy:
+    maxParallel: 1
+    matrix:
+      OpenVirtualAppliance:
+        board: 'ova'
+      IntelNuc:
+        board: 'intel_nuc'
+      OdroidC2:
+        board: 'odroid_c2'
+      OdroidN2:
+        board: 'odroid_n2'
+      OdroidXU4:
+        board: 'odroid_xu4'
+      RaspberryPi:
+        board: 'rpi'
+      RaspberryPi0-W:
+        board: 'rpi0_w'
+      RaspberryPi2:
+        board: 'rpi2'
+      RaspberryPi3:
+        board: 'rpi3'
+      RaspberryPi3-64:
+        board: 'rpi3_64'
+      RaspberryPi4:
+        board: 'rpi4'
+      RaspberryPi4-64:
+        board: 'rpi4_64'
+      AsusTinker:
+        board: 'tinker'
+  workspace:
+    clean: 'all'
+  steps:
+  - script: |
+      echo -e "-----BEGIN CERTIFICATE-----\n$(releaseCertificate)\n-----END CERTIFICATE-----" > cert.pem
+      echo -e "-----BEGIN PRIVATE KEY-----\n$(releaseKey)\n-----END PRIVATE KEY-----" > key.pem
+    displayName: 'Add release PKI certs'
+  - script: |
+      sudo docker build -t hassos:azure .
+    displayName: 'Build container for HassOS'
+  - script: |
+      curl -SsL https://github.com/tcnksm/ghr/releases/download/$(versionGHR)/ghr_$(versionGHR)_linux_amd64.tar.gz | tar xzf -
+      cp ghr_$(versionGHR)_linux_amd64/ghr .
+      rm -rf ghr_$(versionGHR)_linux_amd64
+    displayName: 'Install GHR'
+  - script: |
+      BUILDER_UID="$(id -u)"
+      BUILDER_GID="$(id -g)"
+
+      sudo docker run --rm --privileged -v "$(pwd):/build" \
+        -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
+        -v "/mnt/build-cache:/cache" \
+        hassos:azure make $(board)
+    displayName: 'Build $(board)'
+  - script: |
+      ./ghr -t $(githubToken) -replace $(Build.SourceBranchName) release/
+    displayName: 'Upload $(board)'

buildroot-external/Config.in

@@ -1,8 +1,7 @@
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in"

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

@@ -7,19 +7,23 @@ function hassos_pre_image() {
 
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/boot.scr" \
-        "${BINARIES_DIR}/rk3288-tinker.dtb" \
-        "${BINARIES_DIR}/rk3288-tinker-s.dtb"
+        "${BINARIES_DIR}/rk3288-tinker.dtb"
 
     echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
 
+    # Create boot binary
+    rm -f "${BINARIES_DIR}/idbloader.img"
+    mkimage -n rk3288 -T rksd -d "${BINARIES_DIR}/u-boot-tpl.bin" "${BINARIES_DIR}/idbloader.img"
+    cat "${BINARIES_DIR}/u-boot-spl.bin" >> "${BINARIES_DIR}/idbloader.img"
+
     # 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-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=12288
 }
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }

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

@@ -1,55 +0,0 @@
-From fc25c993bf2feb6e66d55bf03eb725ec688e47eb Mon Sep 17 00:00:00 2001
-Message-Id: <fc25c993bf2feb6e66d55bf03eb725ec688e47eb.1599250914.git.stefan@agner.ch>
-In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 22:15:14 +0100
-Subject: [PATCH 2/3] ARM: DTS: rk3288-tinker: Defining the SPI interface
-
-Taken from, and tested by @TonyMac32 .
-
-Well, the original one was tested by him but I had to adapt the
-registers definitions to the new 64-bits LPAE-compliant syntax.
-
-Therefore that *might* break, along with a few other patches.
-
-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 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index 284e7982925d..d6cc66ab5bb1 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -485,6 +485,25 @@ &sdio0 {
- 	status = "okay";
- };
- 
-+&spi2 {
-+	max-freq = <50000000>;
-+	status = "okay";
-+
-+	spidev@0 {
-+		compatible = "rockchip,spi_tinker";
-+		reg = <0x0 0>;
-+		spi-max-frequency = <50000000>;
-+		spi-cpha = <1>;
-+	};
-+
-+	spidev@1 {
-+		compatible = "rockchip,spi_tinker";
-+		reg = <0x1>;
-+		spi-max-frequency = <50000000>;
-+		spi-cpha = <1>;
-+	};
-+};
-+
- &tsadc {
- 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
- 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
--- 
-2.28.0
-

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

@@ -1,41 +0,0 @@
-From 3a9d71847ae869ffdb2b0818aa86a36d57d96331 Mon Sep 17 00:00:00 2001
-Message-Id: <3a9d71847ae869ffdb2b0818aa86a36d57d96331.1599250914.git.stefan@agner.ch>
-In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 4 Sep 2020 21:57:55 +0200
-Subject: [PATCH 3/3] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
-
-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 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index d6cc66ab5bb1..7af5818ac77c 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -344,10 +344,18 @@ regulator-state-mem {
- 	};
- };
- 
-+&i2c1 {
-+	status = "okay";
-+};
-+
- &i2c2 {
- 	status = "okay";
- };
- 
-+&i2c4 {
-+	status = "okay";
-+};
-+
- &i2c5 {
- 	status = "okay";
- };
--- 
-2.28.0
-

buildroot-external/board/asus/tinker/patches/linux/1-2-regulator-act8865-add-restart-handler-for-act8846.patch

@@ -0,0 +1,74 @@
+Patches act8846 regulator providing the proper reset handle and exploit
+the SIPC bit in GLB_POWER_OFF register. Mainly used to reset some rockchip
+boards.
+
+Origin: <https://patchwork.kernel.org/patch/6409521/>
+
+diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
+index 2ff73d7..836d10b 100644
+--- a/drivers/regulator/act8865-regulator.c
++++ b/drivers/regulator/act8865-regulator.c
+@@ -27,6 +27,7 @@
+ #include <linux/regulator/of_regulator.h>
+ #include <linux/regmap.h>
+ #include <dt-bindings/regulator/active-semi,8865-regulator.h>
++#include <linux/reboot.h>
+ 
+ /*
+  * ACT8600 Global Register Map.
+@@ -133,6 +134,8 @@
+ #define	ACT8865_VOLTAGE_NUM	64
+ #define ACT8600_SUDCDC_VOLTAGE_NUM	255
+ 
++#define ACT8846_SIPC_MASK 0x01
++
+ struct act8865 {
+ 	struct regmap *regmap;
+ 	int off_reg;
+@@ -402,6 +405,22 @@ static void act8865_power_off(void)
+ 	while (1);
+ }
+ 
++static int act8846_power_cycle(struct notifier_block *this,
++	unsigned long code, void *unused)
++{
++	struct act8865 *act8846;
++
++	act8846 = i2c_get_clientdata(act8865_i2c_client);
++	regmap_write(act8846->regmap, ACT8846_GLB_OFF_CTRL, ACT8846_SIPC_MASK);
++
++	return NOTIFY_DONE;
++}
++
++static struct notifier_block act8846_restart_handler = {
++	.notifier_call = act8846_power_cycle,
++	.priority = 129,
++};
++
+ static int act8865_pmic_probe(struct i2c_client *client,
+ 			      const struct i2c_device_id *i2c_id)
+ {
+@@ -484,6 +503,8 @@ static int act8865_pmic_probe(struct i2c_client *client,
+ 	}
+ 
+ 	if (of_device_is_system_power_controller(dev->of_node)) {
++		int ret;
++
+ 		if (!pm_power_off && (off_reg > 0)) {
+ 			act8865_i2c_client = client;
+ 			act8865->off_reg = off_reg;
+@@ -492,6 +513,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
+ 		} else {
+ 			dev_err(dev, "Failed to set poweroff capability, already defined\n");
+ 		}
++
++		if (type == ACT8846) {
++			act8865_i2c_client = client;
++			ret = register_restart_handler(&act8846_restart_handler);
++			if (ret)
++				pr_err("%s: cannot register restart handler, %d\n",
++					__func__, ret);
++		}
+ 	}
+ 
+ 	/* Finally register devices */

buildroot-external/board/asus/tinker/patches/linux/1001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch

@@ -0,0 +1,35 @@
+From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001
+From: Myy Miouyouyou <myy@miouyouyou.fr>
+Date: Thu, 19 Oct 2017 21:09:50 +0200
+Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node
+
+Why is the MiQi the only one left without a working mali GPU node ?
+
+Seriously, is there a rk3288 chipset WITHOUT a mali GPU ? Couldn't
+they enable it once in the DTSI, instead of defining it as "disabled"
+and enabling it in every DTS file ?
+
+Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
+index 4d923aa6..3cd60674 100644
+--- a/arch/arm/boot/dts/rk3288-miqi.dts
++++ b/arch/arm/boot/dts/rk3288-miqi.dts
+@@ -149,6 +149,11 @@
+ 	status = "ok";
+ };
+ 
++&gpu {
++	mali-supply = <&vdd_gpu>;
++	status = "okay";
++};
++
+ &hdmi {
+ 	ddc-i2c-bus = <&i2c5>;
+ 	status = "okay";
+-- 
+2.11.0
+

buildroot-external/board/asus/tinker/patches/linux/1002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch

@@ -0,0 +1,45 @@
+From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Tue, 2 Aug 2016 08:31:00 +0200
+Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range
+ on MiQi board
+
+The board declared too narrow a voltage range for the CPU and GPU
+regulators, preventing it from using the full CPU frequency range.
+The regulators support 712500 to 1500000 microvolts.
+
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+(cherry picked from commit 95330e63a9295a2632cee8cce5db80677f01857a)
+---
+ arch/arm/boot/dts/rk3288-miqi.dts | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
+index 3cd60674..a1c3cdaa 100644
+--- a/arch/arm/boot/dts/rk3288-miqi.dts
++++ b/arch/arm/boot/dts/rk3288-miqi.dts
+@@ -168,8 +168,8 @@
+ 		fcs,suspend-voltage-selector = <1>;
+ 		reg = <0x40>;
+ 		regulator-name = "vdd_cpu";
+-		regulator-min-microvolt = <850000>;
+-		regulator-max-microvolt = <1350000>;
++		regulator-min-microvolt = <712500>;
++		regulator-max-microvolt = <1500000>;
+ 		regulator-always-on;
+ 		regulator-boot-on;
+ 		regulator-enable-ramp-delay = <300>;
+@@ -182,8 +182,8 @@
+ 		fcs,suspend-voltage-selector = <1>;
+ 		reg = <0x41>;
+ 		regulator-name = "vdd_gpu";
+-		regulator-min-microvolt = <850000>;
+-		regulator-max-microvolt = <1350000>;
++		regulator-min-microvolt = <712500>;
++		regulator-max-microvolt = <1500000>;
+ 		regulator-always-on;
+ 		vin-supply = <&vcc_sys>;
+ 	};
+-- 
+2.11.0
+

buildroot-external/board/asus/tinker/patches/linux/1003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch

@@ -0,0 +1,46 @@
+From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001
+From: Myy <myy@miouyouyou.fr>
+Date: Sun, 12 Mar 2017 19:43:15 +0000
+Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition
+
+The MiQi board is sold with an enclosure in which a fan is connected
+to the second LED output, and configured by default in "heartbeat"
+mode so that it rotates slowly and increases when the CPU load
+increases, ensuring appropriate cooling by default. This LED output
+is called "Fan" in the original kernel and connected to GPIO18
+(gpiochip 0, pin 18). Here we called it "miqi:green:fan" to stay
+consistent with the kernel's naming conventions.
+
+It's worth noting that without this patch the fan doesn't work at
+all, risking to make the board overheat.
+
+Fixes: 162718c (v4.7)
+Cc: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+
+Signed-off-by: Myy <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-miqi.dts | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
+index a1c3cdaa..0e383595 100644
+--- a/arch/arm/boot/dts/rk3288-miqi.dts
++++ b/arch/arm/boot/dts/rk3288-miqi.dts
+@@ -67,6 +67,13 @@
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
++		fan {
++			gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
++			label = "miqi:green:fan";
++			linux,default-trigger = "heartbeat";
++		};
++
++
+ 		work {
+ 			gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
+ 			label = "miqi:green:user";
+-- 
+2.11.0
+

buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch

@@ -0,0 +1,98 @@
+From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Mon, 5 Nov 2018 21:58:56 +0100
+Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
+
+Adding the appropriate nodes in order to exploit the WiFi capabilities
+of the board.
+Since these capabilities are provided through SDIO, and the SDIO
+nodes were not defined, these were added too.
+
+These seems to depend on each other so they are added in one big
+patch.
+
+Split if necessary.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 62 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index 1e43527aa..d4df13bed 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -6,8 +6,70 @@
+ /dts-v1/;
+ 
+ #include "rk3288-tinker.dtsi"
++#include <dt-bindings/clock/rockchip,rk808.h>
+ 
+ / {
+ 	model = "Rockchip RK3288 Asus Tinker Board";
+ 	compatible = "asus,rk3288-tinker", "rockchip,rk3288";
++
++	/* This is essential to get SDIO devices working.
++	   The Wifi depends on SDIO ! */
++	sdio_pwrseq: sdio-pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		clocks = <&rk808 RK808_CLKOUT1>;
++		clock-names = "ext_clock";
++		pinctrl-names = "default";
++		pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
++
++		/*
++		 * On the module itself this is one of these (depending
++		 * on the actual card populated):
++		 * - SDIO_RESET_L_WL_REG_ON
++		 * - PDN (power down when low)
++		 */
++		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
++	};
++
++	wireless-wlan {
++		compatible = "wlan-platdata";
++		rockchip,grf = <&grf>;
++		sdio_vref = <1800>;
++		status = "okay";
++		wifi_chip_type = "8723bs";
++		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&io_domains {
++	wifi-supply = <&vcc_18>;
++};
++
++&pinctrl {
++	sdio-pwrseq {
++		wifi_enable_h: wifienable-h {
++			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++
++		chip_enable_h: chip-enable-h {
++			rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++};
++
++&sdio0 {
++	bus-width = <4>;
++	cap-sd-highspeed;
++	cap-sdio-irq;
++	clock-frequency = <50000000>;
++	clock-freq-min-max = <200000 50000000>;
++	disable-wp;
++	keep-power-in-suspend;
++	mmc-pwrseq = <&sdio_pwrseq>;
++	non-removable;
++	num-slots = <1>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
++	sd-uhs-sdr104;
++	status = "okay";
++	supports-sdio;
+ };
+-- 
+2.16.4
+

buildroot-external/board/asus/tinker/patches/linux/1014-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch

@@ -1,8 +1,7 @@
-From 2ae3821fd824560ef2db3c87cfbec985177911f6 Mon Sep 17 00:00:00 2001
-Message-Id: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599249626.git.stefan@agner.ch>
+From 2c2e60256f2cbb2fce50a6317f85b1500efd1a6c Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:03:26 +0100
-Subject: [PATCH 1/2] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
+Subject: [PATCH] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
 
 The most essential being the RTS pin, which is clearly needed to
 upload the initial configuration into the Realtek Bluetooth
@@ -40,25 +39,24 @@ echo 1 > value &&
 sleep 1
 
 Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
-[move change to rk3288-tinker.dtsi]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
+ arch/arm/boot/dts/rk3288-tinker.dts | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index acfaa12ec239..284e7982925d 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -492,6 +492,8 @@ &tsadc {
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index d4df13bed..b92e59c1e 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -73,3 +73,9 @@
+ 	status = "okay";
+ 	supports-sdio;
  };
- 
- &uart0 {
++
++&uart0 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
- 	status = "okay";
- };
- 
++};
++
 -- 
-2.28.0
+2.16.4
 

buildroot-external/board/asus/tinker/patches/linux/1017-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch

@@ -0,0 +1,53 @@
+From a72e0749acad92df7b854e38e97e1dc7b4799abe Mon Sep 17 00:00:00 2001
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Mon, 5 Nov 2018 22:11:24 +0100
+Subject: [PATCH] ARM: DTS: rk3288-tinker: Defined the I2C interfaces
+
+And all the hardware behind.
+
+Taken from @TonyMac32, Butchered by @Miouyouyou .
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-tinker.dts | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index b92e59c1e..96d05fc6b 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -40,6 +40,31 @@
+ 	};
+ };
+ 
++&i2c1 {
++	status = "okay";
++};
++
++&i2c2 {
++	afc0:af-controller@0 {
++		status = "okay";
++		compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
++		reg = <0x0 0x0c>;
++	};
++
++	eeprom:m24c08@50 {
++		compatible = "at,24c08";
++		reg = <0x50>;
++	};
++};
++
++&i2c3 {
++	status = "okay";
++};
++
++&i2c4 {
++	status = "okay";
++};
++
+ &io_domains {
+ 	wifi-supply = <&vcc_18>;
+ };
+-- 
+2.16.4
+

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

@@ -0,0 +1,50 @@
+From b24b8f83e150811ad54ee2a4843e44cd1421fafa 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
+
+Taken from, and tested by @TonyMac32 .
+
+Well, the original one was tested by him but I had to adapt the
+registers definitions to the new 64-bits LPAE-compliant syntax.
+
+Therefore that *might* break, along with a few other patches.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-tinker.dts | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index 96d05fc6b..17bfea298 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -99,6 +99,25 @@
+ 	supports-sdio;
+ };
+ 
++&spi2 {
++	max-freq = <50000000>;
++	status = "okay";
++
++	spidev@0 {
++		compatible = "rockchip,spi_tinker";
++		reg = <0x0 0>;
++		spi-max-frequency = <50000000>;
++		spi-cpha = <1>;
++	};
++
++	spidev@1 {
++		compatible = "rockchip,spi_tinker";
++		reg = <0x1>;
++		spi-max-frequency = <50000000>;
++		spi-cpha = <1>;
++	};
++};
++
+ &uart0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
+-- 
+2.16.4
+

buildroot-external/board/asus/tinker/patches/linux/1024-arm-dts-veyron-Added-a-flag-to-disable-cache-flush-d.patch

@@ -0,0 +1,32 @@
+From 9177b30ab083dbda2bede3b3d61ef71ad4b1ffe0 Mon Sep 17 00:00:00 2001
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Thu, 1 Nov 2018 21:31:26 +0100
+Subject: [PATCH 2/2] arm: dts: veyron: Added a flag to disable cache flush
+ during reset
+
+Flushing the MMC cache of ASUS Chromebooks during initialization or
+"recovery" generates 10 minutes hangup, according to @SolidHal.
+
+This is an adaptation of @SolidHal, in order to pinpoint the fix to
+Veyron Chromebooks, and avoiding issues other RK3288 boards.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
+index 2075120cf..fa4951fd7 100644
+--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
++++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
+@@ -123,6 +123,7 @@
+ 	mmc-hs200-1_8v;
+ 	mmc-pwrseq = <&emmc_pwrseq>;
+ 	non-removable;
++	no-recovery-cache-flush;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+ };
+-- 
+2.16.4
+

buildroot-external/board/asus/tinker/patches/linux/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch

@@ -27,9 +27,9 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath
  
  	usb_anchor_urb(urb, &hif_dev->regout_submitted);
  	ret = usb_submit_urb(urb, GFP_KERNEL);
-@@ -735,11 +735,11 @@
- 
- 		rx_buf->skb = nskb;
+@@ -723,11 +723,11 @@
+ 			return;
+ 		}
  
 +		usb_fill_bulk_urb(urb, hif_dev->udev,
 +				 usb_rcvbulkpipe(hif_dev->udev,
@@ -38,13 +38,13 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath
  						 USB_REG_IN_PIPE),
  				 nskb->data, MAX_REG_IN_BUF_SIZE,
 +				 ath9k_hif_usb_reg_in_cb, nskb);
--				 ath9k_hif_usb_reg_in_cb, rx_buf, 1);
+-				 ath9k_hif_usb_reg_in_cb, nskb, 1);
  	}
  
  resubmit:
 @@ -909,11 +909,11 @@
- 		rx_buf->hif_dev = hif_dev;
- 		rx_buf->skb = skb;
+ 			goto err_skb;
+ 		}
  
 +		usb_fill_bulk_urb(urb, hif_dev->udev,
 +				  usb_rcvbulkpipe(hif_dev->udev,
@@ -53,7 +53,7 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath
  						  USB_REG_IN_PIPE),
  				  skb->data, MAX_REG_IN_BUF_SIZE,
 +				  ath9k_hif_usb_reg_in_cb, skb);
--				  ath9k_hif_usb_reg_in_cb, rx_buf, 1);
+-				  ath9k_hif_usb_reg_in_cb, skb, 1);
  
  		/* Anchor URB */
  		usb_anchor_urb(urb, &hif_dev->reg_in_submitted);

buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch

@@ -0,0 +1,25 @@
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index f88c913ff..7f04ccbdf 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
++++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -547,3 +547,20 @@
+ &gpiomem {
+     status = "okay";
+ };
++
++&emmc {
++    bus-width = <8>;
++    cap-mmc-highspeed;
++    non-removable;
++    pinctrl-names = "default";
++    pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
++    max-frequency = <150000000>;
++    mmc-hs200-1_8v;
++    mmc-ddr-1_8v;
++    status = "okay";
++};
++
++&hdmi {
++    pinctrl-names = "default";
++    pinctrl-0 = <&hdmi_cec_c0>;
++};

buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-dts-makefile.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 37a3de760..6bcfceede 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -832,6 +832,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+ 	rk3188-radxarock.dtb \
+ 	rk3228-evb.dtb \
+ 	rk3229-evb.dtb \
++	rk3288-xt-q8l-v10.dtb \
+ 	rk3229-xms6.dtb \
+ 	rk3288-evb-act8846.dtb \
+ 	rk3288-evb-rk808.dtb \
+

buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-remote-keymap.patch

@@ -0,0 +1,103 @@
+diff --git a/drivers/media/rc/keymaps/rc-xt-q8l-v10.c b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
+index e69de29..19c7d9e 100644
+--- /dev/null
++++ b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
+@@ -0,0 +1,76 @@
++// SPDX-License-Identifier: GPL-2.0+
++// rc-xt-q8l-v10.c - Keytable for xt-q8l-v10 tv box remote controller
++//
++// keymap imported from ir-keymaps.c
++//
++// Copyright (c) 2018 Paolo Sabatino
++
++#include <media/rc-map.h>
++#include <linux/module.h>
++
++/*
++
++*/
++
++static struct rc_map_table xt_q8l_v10[] = {
++	
++	{ 0xcc1d11, KEY_ENTER },
++	{ 0xcc1d00, KEY_POWER },
++	{ 0xcc1d15, KEY_PLAYPAUSE },
++	{ 0xcc1d16, KEY_STOP },
++	{ 0xcc1d06, KEY_PREVIOUSSONG },
++	{ 0xcc1d0a, KEY_NEXTSONG },
++	{ 0xcc1d41, KEY_1 },
++	{ 0xcc1d45, KEY_2 },
++	{ 0xcc1d4d, KEY_3 },
++	{ 0xcc1d42, KEY_4 },
++	{ 0xcc1d46, KEY_5 },
++	{ 0xcc1d4e, KEY_6 },
++	{ 0xcc1d43, KEY_7 },
++	{ 0xcc1d47, KEY_8 },
++	{ 0xcc1d4f, KEY_9 },
++	{ 0xcc1d49, KEY_0 },
++	{ 0xcc1d4a, KEY_BACKSPACE },
++	{ 0xcc1d48, KEY_F6 },
++	{ 0xcc1d03, KEY_HOME },
++	{ 0xcc1d0f, KEY_BACK },
++	{ 0xcc1d40, KEY_MENU },
++	{ 0xcc1d4c, KEY_TEXT },
++	{ 0xcc1d10, KEY_LEFT },
++	{ 0xcc1d12, KEY_RIGHT },
++	{ 0xcc1d44, KEY_DOWN },
++	{ 0xcc1d07, KEY_UP },
++	{ 0xcc1d02, KEY_VOLUMEDOWN },
++	{ 0xcc1d0c, KEY_MUTE },
++	{ 0xcc1d0e, KEY_VOLUMEUP },
++	{ 0xcc1d01, KEY_F1 },
++	{ 0xcc1d05, KEY_F2 },
++	{ 0xcc1d09, KEY_F3 },
++	{ 0xcc1d0d, KEY_F4 },
++	
++};
++
++static struct rc_map_list xt_q8l_v10_map = {
++	.map = {
++		.scan     = xt_q8l_v10,
++		.size     = ARRAY_SIZE(xt_q8l_v10),
++		.rc_proto = RC_PROTO_NEC,	/* Legacy IR type */
++		.name     = RC_MAP_XT_Q8L_V10,
++	}
++};
++
++static int __init init_rc_map_xt_q8l_v10(void)
++{
++	return rc_map_register(&xt_q8l_v10_map);
++}
++
++static void __exit exit_rc_map_xt_q8l_v10(void)
++{
++	rc_map_unregister(&xt_q8l_v10_map);
++}
++
++module_init(init_rc_map_xt_q8l_v10)
++module_exit(exit_rc_map_xt_q8l_v10)
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Paolo Sabatino");
+diff --git a/include/media/rc-map.h b/include/media/rc-map.h
+index d621acadf..ad7abdb97 100644
+--- a/include/media/rc-map.h
++++ b/include/media/rc-map.h
+@@ -278,6 +278,7 @@ struct rc_map *rc_map_get(const char *name);
+ #define RC_MAP_WINFAST_USBII_DELUXE      "rc-winfast-usbii-deluxe"
+ #define RC_MAP_SU3000                    "rc-su3000"
+ #define RC_MAP_XBOX_DVD                  "rc-xbox-dvd"
++#define RC_MAP_XT_Q8L_V10                "rc-xt-q8l-v10"
+ #define RC_MAP_X96MAX                    "rc-x96max"
+ 
+ /*
+diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
+index 5b1399af6..ec9ce1206 100644
+--- a/drivers/media/rc/keymaps/Makefile
++++ b/drivers/media/rc/keymaps/Makefile
+@@ -117,4 +117,5 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
+ 			rc-winfast-usbii-deluxe.o \
+ 			rc-su3000.o \
+ 			rc-xbox-dvd.o \
++			rc-xt-q8l-v10.o \
+ 			rc-x96max.o \

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

@@ -1,37 +0,0 @@
-From cd1aac268ff58eea28153bbabfb33abc2df52b1f Mon Sep 17 00:00:00 2001
-Message-Id: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH 1/4] 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 d459c7f50d..e0682ed479 100644
---- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -88,3 +88,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 68411d863b..1a285baf73 100644
---- a/configs/tinker-s-rk3288_defconfig
-+++ b/configs/tinker-s-rk3288_defconfig
-@@ -90,3 +90,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.28.0
-

buildroot-external/board/asus/tinker/patches/uboot/0001-TLP-Modify-entrypoint-for-u-boot.patch

@@ -0,0 +1,23 @@
+From 17735a28503d90db2a7173816861750f475580ea Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 24 Apr 2020 12:41:50 +0000
+Subject: [PATCH 1/1] TLP: Modify entrypoint for u-boot
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ configs/tinker-rk3288_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
+index 83c3450839..648a7904be 100644
+--- a/configs/tinker-rk3288_defconfig
++++ b/configs/tinker-rk3288_defconfig
+@@ -84,3 +84,5 @@ CONFIG_USB_ETHER_ASIX=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_CMD_DHRYSTONE=y
+ CONFIG_ERRNO_STR=y
++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x3000
++
+-- 
+2.17.1
+

buildroot-external/board/asus/tinker/patches/uboot/0002-rockchip-dts-tinker-move-i2c-node-to-shared-device-t.patch

@@ -1,55 +0,0 @@
-From d49ad12ee89d0d64f1f594bcad7de0e4f9631add Mon Sep 17 00:00:00 2001
-Message-Id: <d49ad12ee89d0d64f1f594bcad7de0e4f9631add.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 4 Sep 2020 15:40:55 +0200
-Subject: [PATCH 2/4] rockchip: dts: tinker: move i2c node to shared device
- tree
-
-The I2C EEPROM is present on Tinker Board S as well. Move the i2c node
-to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
-
-Cc: Jonas Karlman <jonas@kwiboo.se>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++
- arch/arm/dts/rk3288-tinker.dts         | 7 -------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-index 732aa4f91f..3d169906fd 100644
---- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-@@ -17,6 +17,13 @@
- 	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
- };
- 
-+&i2c2 {
-+    m24c08@50 {
-+        compatible = "at,24c08", "i2c-eeprom";
-+        reg = <0x50>;
-+    };
-+};
-+
- &pinctrl {
- 	u-boot,dm-pre-reloc;
- };
-diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
-index 4b8405fd82..338670123b 100644
---- a/arch/arm/dts/rk3288-tinker.dts
-+++ b/arch/arm/dts/rk3288-tinker.dts
-@@ -35,10 +35,3 @@
- 	vbus-supply = <&vcc5v0_host>;
- 	status = "okay";
- };
--
--&i2c2 {
--    m24c08@50 {
--        compatible = "at,24c08", "i2c-eeprom";
--        reg = <0x50>;
--    };
--};
--- 
-2.28.0
-

buildroot-external/board/asus/tinker/patches/uboot/0003-rockchip-dts-tinker-remove-unnecessary-node.patch

@@ -1,34 +0,0 @@
-From 07a02625ba95f68ba670b4c1cc98567acb390195 Mon Sep 17 00:00:00 2001
-Message-Id: <07a02625ba95f68ba670b4c1cc98567acb390195.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 4 Sep 2020 15:44:38 +0200
-Subject: [PATCH 3/4] rockchip: dts: tinker: remove unnecessary node
-
-The property reg-shift with the same value is present in the base
-device tree already. Remove unnecessary node from rk3288-tinker.dts.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/dts/rk3288-tinker.dts | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
-index 338670123b..8b1848c310 100644
---- a/arch/arm/dts/rk3288-tinker.dts
-+++ b/arch/arm/dts/rk3288-tinker.dts
-@@ -27,10 +27,6 @@
- 	status = "okay";
- };
- 
--&uart2 {
--	reg-shift = <2>;
--};
--
- &usb_host1 {
- 	vbus-supply = <&vcc5v0_host>;
- 	status = "okay";
--- 
-2.28.0
-

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

@@ -1,10 +1,7 @@
-From 549d98c233b2a8b7cd4b0d4eb9652ad60a8a0f75 Mon Sep 17 00:00:00 2001
-Message-Id: <549d98c233b2a8b7cd4b0d4eb9652ad60a8a0f75.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
+From 4147d34a63f74f78a8ff9a3dcf2f4c9cd8d6be3a Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
-Subject: [PATCH 4/4] pmic: enable LDO2 vcc33_mipi at bootup
+Subject: [PATCH 1/1] pmic: enable LDO2 vcc33_mipi at bootup
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -12,10 +9,10 @@ Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
  1 file changed, 37 insertions(+)
 
 diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-index f85209c649..6fa1bb0c66 100644
+index 7af39e10cd..f12409933d 100644
 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
 +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-@@ -13,6 +13,7 @@
+@@ -12,6 +12,7 @@
  #include <netdev.h>
  #include <asm/arch-rockchip/bootrom.h>
  #include <asm/io.h>
@@ -23,7 +20,7 @@ index f85209c649..6fa1bb0c66 100644
  
  static int get_ethaddr_from_eeprom(u8 *addr)
  {
-@@ -48,3 +49,39 @@ int mmc_get_env_dev(void)
+@@ -47,3 +48,39 @@ int mmc_get_env_dev(void)
  
  	return 1;
  }
@@ -64,5 +61,5 @@ index f85209c649..6fa1bb0c66 100644
 +}
 +#endif
 -- 
-2.28.0
+2.17.1
 

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

@@ -17,7 +17,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
@@ -27,11 +27,7 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
-if test "$devnum" = "0"; then
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker-s.dtb
-else
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
-fi
+fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
 
 setenv bootargs
 for BOOT_SLOT in "${BOOT_ORDER}"; do
@@ -40,18 +36,16 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   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 ..."
-      if ext4load mmc ${devnum}:2 ${kernel_addr_r} zImage; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
+      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:2 ${kernel_addr_r} zImage"
+      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
     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 ..."
-      if ext4load mmc ${devnum}:4 ${kernel_addr_r} zImage; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
+      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:4 ${kernel_addr_r} zImage"
+      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done
@@ -66,8 +60,10 @@ else
   reset
 fi
 
-echo "Starting kernel"
+echo "Loading kernel"
+run load_kernel
+echo " Starting kernel"
 bootz ${kernel_addr_r} - ${fdt_addr_r}
 
-echo "Boot failed, resetting..."
+echo "Fails on boot"
 reset

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

@@ -1253,7 +1253,7 @@ CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
+# CONFIG_CFG80211_WEXT is not set
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
@@ -4216,24 +4216,24 @@ CONFIG_SND_SOC=y
 #
 # ASoC support for Amlogic platforms
 #
-CONFIG_SND_MESON_AIU=y
-CONFIG_SND_MESON_AXG_FIFO=y
-CONFIG_SND_MESON_AXG_FRDDR=y
-CONFIG_SND_MESON_AXG_TODDR=y
-CONFIG_SND_MESON_AXG_TDM_FORMATTER=y
-CONFIG_SND_MESON_AXG_TDM_INTERFACE=y
-CONFIG_SND_MESON_AXG_TDMIN=y
-CONFIG_SND_MESON_AXG_TDMOUT=y
-CONFIG_SND_MESON_AXG_SOUND_CARD=y
-CONFIG_SND_MESON_AXG_SPDIFOUT=y
-CONFIG_SND_MESON_AXG_SPDIFIN=y
-CONFIG_SND_MESON_AXG_PDM=y
-CONFIG_SND_MESON_CARD_UTILS=y
-CONFIG_SND_MESON_CODEC_GLUE=y
-CONFIG_SND_MESON_GX_SOUND_CARD=y
-CONFIG_SND_MESON_G12A_TOACODEC=y
-CONFIG_SND_MESON_G12A_TOHDMITX=y
-CONFIG_SND_SOC_MESON_T9015=y
+CONFIG_SND_MESON_AIU=m
+CONFIG_SND_MESON_AXG_FIFO=m
+CONFIG_SND_MESON_AXG_FRDDR=m
+CONFIG_SND_MESON_AXG_TODDR=m
+CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
+CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
+CONFIG_SND_MESON_AXG_TDMIN=m
+CONFIG_SND_MESON_AXG_TDMOUT=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_AXG_SPDIFOUT=m
+CONFIG_SND_MESON_AXG_SPDIFIN=m
+CONFIG_SND_MESON_AXG_PDM=m
+CONFIG_SND_MESON_CARD_UTILS=m
+CONFIG_SND_MESON_CODEC_GLUE=m
+CONFIG_SND_MESON_GX_SOUND_CARD=m
+CONFIG_SND_MESON_G12A_TOACODEC=m
+CONFIG_SND_MESON_G12A_TOHDMITX=m
+CONFIG_SND_SOC_MESON_T9015=m
 # end of ASoC support for Amlogic platforms
 
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
@@ -4954,7 +4954,7 @@ CONFIG_RTC_DRV_RK808=m
 # CONFIG_RTC_DRV_PCF8523 is not set
 # CONFIG_RTC_DRV_PCF85063 is not set
 # CONFIG_RTC_DRV_PCF85363 is not set
-CONFIG_RTC_DRV_PCF8563=y
+# CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_BQ32K is not set

buildroot-external/board/hardkernel/odroid-c2/boot-env.txt

@@ -0,0 +1,131 @@
+
+
+# Custom modeline!
+# To use custom modeline you need to disable all the below resolutions
+# and setup your own!
+# For more information check our wiki:
+# http://odroid.com/dokuwiki/doku.php?id=en:c2_hdmi_autosetting
+# Example below:
+#m=custombuilt
+#modeline=1920,1200,154000,74040,60,1920,1968,2000,2080,1200,1202,1208,1235,1,0,1
+
+# 480 Lines (720x480)
+#m=480i60hz
+#m=480i_rpt
+#m=480p60hz
+#m=480p_rpt
+
+# 576 Lines (720x576)
+#m=576i50hz
+#m=576i_rpt
+#m=576p50hz
+#m=576p_rpt
+
+# 720 Lines (1280x720)
+#m=720p50hz
+#m=720p60hz
+
+# 1080 Lines (1920x1080)
+#m=1080i60hz
+m=1080p60hz
+#m=1080i50hz
+#m=1080p50hz
+#m=1080p24hz
+
+# 4K (3840x2160)
+#m=2160p30hz
+#m=2160p25hz
+#m=2160p24hz
+#m=smpte24hz
+#m=2160p50hz
+#m=2160p60hz
+#m=2160p50hz420
+#m=2160p60hz420
+
+### VESA modes ###
+#m=640x480p60hz
+#m=800x480p60hz
+#m=480x800p60hz
+#m=800x600p60hz
+#m=1024x600p60hz
+#m=1024x768p60hz
+#m=1280x800p60hz
+#m=1280x1024p60hz
+#m=1360x768p60hz
+#m=1440x900p60hz
+#m=1600x900p60hz
+#m=1680x1050p60hz
+#m=1600x1200p60hz
+#m=1920x1200p60hz
+#m=2560x1080p60hz
+#m=2560x1440p60hz
+#m=2560x1600p60hz
+#m=3440x1440p60hz
+
+# HDMI BPP Mode
+m_bpp=32
+#m_bpp=24
+#m_bpp=16
+
+# HDMI DVI/VGA modes
+# By default its set to HDMI, if needed change below.
+# Uncomment only a single Line.
+#vout=dvi
+#vout=vga
+
+# HDMI HotPlug Detection control
+# Allows you to force HDMI thinking that the cable is connected.
+# true = HDMI will believe that cable is always connected
+# false = will let board/monitor negotiate the connection status
+#hpd=false
+hpd=true
+
+# Monitor output
+# Controls if HDMI PHY should output anything to the monitor
+monitor_onoff=false
+
+# Server Mode (aka. No Graphics)
+# Setting nographics to 1 will disable all video subsystem
+# This mode is ideal of server type usage. (Saves ~300Mb of RAM)
+nographics=0
+
+# Meson Timer
+# 1 - Meson Timer
+# 0 - Arch Timer
+# Using meson_timer improves the video playback however it breaks KVM (virtualization).
+# Using arch timer allows KVM/Virtualization to work however you'll experience poor video
+mesontimer=1
+
+# UHS (Ultra High Speed) MicroSD mode enable/disable
+disableuhs=false
+
+# MicroSD Card Detection enable/disable
+# Force the MMC controlled to believe that a card is connected.
+mmc_removable=true
+
+# USB Multi WebCam tweak
+# Only enable this if you use it.
+usbmulticam=false
+
+# CPU Frequency / Cores control
+###########################################
+### WARNING!!! WARNING!!! WARNING!!!
+# Before changing anything here please read the wiki entry:
+# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq
+#
+# MAX CPU's
+#maxcpus=1
+#maxcpus=2
+#maxcpus=3
+maxcpus=4
+
+# MAX Frequency
+#max_freq=2016
+#max_freq=1944
+#max_freq=1944
+#max_freq=1920
+#max_freq=1896
+#max_freq=1752
+#max_freq=1680
+#max_freq=1656
+max_freq=1536

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

@@ -8,6 +8,7 @@ function hassos_pre_image() {
     local SPL_IMG="$(path_spl_img)"
 
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt"
     cp "${BINARIES_DIR}/meson-gxbb-odroidc2.dtb" "${BOOT_DATA}/meson-gxbb-odroidc2.dtb"
 
     echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
@@ -22,6 +23,6 @@ function hassos_pre_image() {
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }
 

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

@@ -18,13 +18,23 @@ 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
 
+if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
+  env import -t ${ramdisk_addr_r} ${filesize};
+fi
+
+# Board bootargs
+if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
+setenv bootargs_odroidc2 "no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}"
+
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
 
+usb start
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb
@@ -46,18 +56,16 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   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 ..."
-      if ext4load mmc ${devnum}:5 ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
+      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_a} rauc.slot=A ${cmdline}"
     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 ..."
-      if ext4load mmc ${devnum}:7 ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
+      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done
@@ -72,9 +80,12 @@ else
   reset
 fi
 
+echo "Loading kernel"
+run load_kernel
+echo " Starting kernel"
+printenv load_kernel
 printenv bootargs
-echo "Starting kernel"
 booti ${kernel_addr_r} - ${fdt_addr_r}
 
-echo "Boot failed, resetting..."
+echo "Fails on boot"
 reset

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

@@ -1,4 +1,3 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
-CONFIG_DISPLAY_BOARDINFO=y

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

@@ -1,23 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local UBOOT_SM1="${BINARIES_DIR}/u-boot.sm1"
-    local SPL_IMG="$(path_spl_img)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BINARIES_DIR}/meson-sm1-odroid-c4.dtb" "${BOOT_DATA}/meson-sm1-odroid-c4.dtb"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${UBOOT_SM1}" of="${SPL_IMG}" conv=notrunc bs=512 seek=1
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_xz
-}

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

@@ -1,10 +0,0 @@
-BOARD_ID=odroid-c4
-BOARD_NAME="Hardkernel Odroid-C4"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_SYS=mbr
-BOOT_SPL=true
-BOOT_ENV_SIZE=0x2000
-SUPERVISOR_MACHINE=odroid-c4
-SUPERVISOR_ARCH=aarch64

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

@@ -1,80 +0,0 @@
-
-###########################################
-
-part start mmc ${devnum} 9 mmc_env
-mmc dev ${devnum}
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
-    env import -c ${ramdisk_addr_r} 0x2000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
-
-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
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
-
-# Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} meson-sm1-odroid-c4.dtb
-
-# logical volumes get numbered after physical ones.
-# 1. boot
-# 2. Extended partition
-# 3. Overlay
-# 4. Data
-# 5. KernelA
-# 6. SystemA
-# 7. KernelB
-# 8. SystemB
-# 9. BootInfo
-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 ..."
-      if ext4load mmc ${devnum}:5 ${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 ..."
-      if ext4load mmc ${devnum}:7 ${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
-
-printenv bootargs
-echo "Starting kernel"
-booti ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Boot failed, resetting..."
-reset

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

@@ -1,4 +0,0 @@
-CONFIG_DOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_DISPLAY_BOARDINFO=y

buildroot-external/board/hardkernel/odroid-n2/boot-env.txt

@@ -0,0 +1,84 @@
+
+
+# Custom modeline!
+# To use custom modeline you need to disable all the below resolutions
+# and setup your own!
+# For more information check our wiki:
+# https://wiki.odroid.com/odroid-n2/application_note/software/set_display_mode
+
+# HDMI Mode
+# Resolution Configuration
+#    Symbol             | Resolution
+# ----------------------+-------------
+#    "480x320p60hz"     | 480x320 Progressive 60Hz
+#    "480p60hz"         | 720x480 Progressive 60Hz
+#    "576p50hz"         | 720x576 Progressive 50Hz
+#    "720p60hz"         | 1280x720 Progressive 60Hz
+#    "720p50hz"         | 1280x720 Progressive 50Hz
+#    "1080p60hz"        | 1920x1080 Progressive 60Hz
+#    "1080p50hz"        | 1920x1080 Progressive 50Hz
+#    "1080p30hz"        | 1920x1080 Progressive 30Hz
+#    "1080p24hz"        | 1920x1080 Progressive 24Hz
+#    "1080i60hz"        | 1920x1080 Interlaced 60Hz
+#    "1080i50hz"        | 1920x1080 Interlaced 50Hz
+#    "2160p60hz"        | 3840x2160 Progressive 60Hz
+#    "2160p50hz"        | 3840x2160 Progressive 50Hz
+#    "2160p30hz"        | 3840x2160 Progressive 30Hz
+#    "2160p25hz"        | 3840x2160 Progressive 25Hz
+#    "2160p24hz"        | 3840x2160 Progressive 24Hz
+#    "smpte24hz"        | 3840x2160 Progressive 24Hz SMPTE
+#    "2160p60hz420"     | 3840x2160 Progressive 60Hz YCbCr 4:2:0
+#    "2160p50hz420"     | 3840x2160 Progressive 50Hz YCbCr 4:2:0
+#    "640x480p60hz"     | 640x480 Progressive 60Hz
+#    "800x480p60hz"     | 800x480 Progressive 60Hz
+#    "800x600p60hz"     | 800x600 Progressive 60Hz
+#    "1024x600p60hz"    | 1024x600 Progressive 60Hz
+#    "1024x768p60hz"    | 1024x768 Progressive 60Hz
+#    "1280x800p60hz"    | 1280x800 Progressive 60Hz
+#    "1280x1024p60hz"   | 1280x1024 Progressive 60Hz
+#    "1360x768p60hz"    | 1360x768 Progressive 60Hz
+#    "1440x900p60hz"    | 1440x900 Progressive 60Hz
+#    "1600x900p60hz"    | 1600x900 Progressive 60Hz
+#    "1600x1200p60hz"   | 1600x1200 Progressive 60Hz
+#    "1680x1050p60hz"   | 1680x1050 Progressive 60Hz
+#    "1920x1200p60hz"   | 1920x1200 Progressive 60Hz
+#    "2560x1080p60hz"   | 2560x1080 Progressive 60Hz
+#    "2560x1440p60hz"   | 2560x1440 Progressive 60Hz
+#    "2560x1600p60hz"   | 2560x1600 Progressive 60Hz
+#    "3440x1440p60hz"   | 3440x1440 Progressive 60Hz
+hdmimode=1080p60hz
+ 
+# Overscan percentage
+# This value scales down the actual screen size by the percentage below
+# valid range is 80 to 100
+overscan=100
+ 
+### voutmode : hdmi or dvi
+#voutmode=dvi
+voutmode=hdmi
+ 
+# HPD enable/disable option
+disablehpd="false"
+ 
+# max cpu frequency for big core, A73 in MHz unit
+# 1.8 GHz, default value
+#max_freq_a73=2004  # 2.004 GHz
+#max_freq_a73=1908  # 1.908 GHz
+#max_freq_a73=1704  # 1.704 GHz
+max_freq_a73=1800
+ 
+# max cpu frequency for little core, A53 in MHz unit
+# 1.896 GHz, default value
+#max_freq_a53=1992  # 1.992 GHz
+#max_freq_a53=1704  # 1.704 GHz
+max_freq_a53=1896
+ 
+ 
+# max cpu-cores
+# Note:
+# CPU's 0 and 1 are the A53 (small cores)
+# CPU's 2 to 5 are the A73 (big cores)
+# Lowering this value disables only the bigger cores (the last cores).
+#maxcpus=4
+#maxcpus=5
+maxcpus=6

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

@@ -7,7 +7,8 @@ function hassos_pre_image() {
     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}/config.txt"
+    cp "${BINARIES_DIR}/meson-g12b-odroid-n2.dtb" "${BOOT_DATA}/meson-g12b-odroid-n2.dtb"
 
     echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
 
@@ -19,6 +20,6 @@ function hassos_pre_image() {
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }
 

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

@@ -1 +0,0 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

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

@@ -18,20 +18,28 @@ 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
 
+if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
+  env import -t ${ramdisk_addr_r} ${filesize};
+fi
+
+# Board bootargs
+if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
+ 
+# Boot Args
+setenv bootargs_odroidn2 "clk_ignore_unused hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} ${cmode} voutmode=${voutmode} disablehpd=${disablehpd} overscan=${overscan}"
+
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
 
+usb start
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-if test "${board_rev}" = "c"; then
-  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2-plus.dtb
-else
-  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
-fi
+fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
 
 # logical volumes get numbered after physical ones.
 # 1. boot
@@ -50,18 +58,16 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   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 ..."
-      if ext4load mmc ${devnum}:5 ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
+      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_a} rauc.slot=A ${cmdline}"
     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 ..."
-      if ext4load mmc ${devnum}:7 ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
+      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done
@@ -76,9 +82,12 @@ else
   reset
 fi
 
+echo "Loading kernel"
+run load_kernel
+echo " Starting kernel"
+printenv load_kernel
 printenv bootargs
-echo "Starting kernel"
 booti ${kernel_addr_r} - ${fdt_addr_r}
 
-echo "Boot failed, resetting..."
+echo "Fails on boot"
 reset

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

@@ -1,4 +1,3 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
-CONFIG_DISPLAY_BOARDINFO=y

buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt

@@ -0,0 +1,40 @@
+
+macaddr=00:1e:06:61:7a:39
+vout=hdmi
+# - DVI Mode (disables sound over HDMI as per DVI compat)
+# vout=dvi
+
+# --- HDMI CEC Configuration ---
+# ------------------------------------------
+cecenable=false
+# set to true to enable HDMI CEC
+
+# Enable/Disable ODROID-VU7 Touchsreen
+disable_vu7=false
+
+# DRAM Frequency
+# Sets the LPDDR3 memory frequency
+# Supported values: 933 825 728 633 (MHZ)
+ddr_freq=825
+
+# External watchdog board enable
+external_watchdog=false
+# debounce time set to 3 ~ 10 sec, default 3 sec
+external_watchdog_debounce=3
+
+
+#------------------------------------------------------------------------------
+#
+# HDMI Hot Plug detection
+#
+#------------------------------------------------------------------------------
+#
+# Forces the HDMI subsystem to ignore the check if the cable is connected or
+# not.
+# false : disable the detection and force it as connected.
+# true : let cable, board and monitor decide the connection status.
+#
+# default: true
+#
+#------------------------------------------------------------------------------
+HPD=true

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

@@ -10,6 +10,7 @@ function hassos_pre_image() {
     local spl_img="$(path_spl_img)"
 
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt"
     cp "${BINARIES_DIR}/exynos5422-odroidxu4.dtb" "${BOOT_DATA}/exynos5422-odroidxu4.dtb"
 
     echo "console=tty1 console=ttySAC2,115200" > "${BOOT_DATA}/cmdline.txt"
@@ -26,5 +27,5 @@ function hassos_pre_image() {
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }

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

@@ -20,13 +20,27 @@ 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
 
+if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
+  env import -t ${ramdisk_addr_r} ${filesize};
+fi
+
+# Board bootargs
+setenv hdmi_phy_control "HPD=${HPD} vout=${vout}"
+if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi
+if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
+if test "${external_watchdog}" = "true"; then setenv external_watchdog "external_watchdog=${external_watchdog} external_watchdog_debounce=${external_watchdog_debounce}"; fi
+
+setenv bootargs_odroidxu4 "${videoconfig} ${hdmi_phy_control} ${hid_quirks} smsc95xx.macaddr=${macaddr} ${external_watchdog}"
+
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
 
+#usb start
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 fatload mmc ${devnum}:1 ${fdt_addr_r} exynos5422-odroidxu4.dtb
@@ -50,18 +64,16 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   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 ..."
-      if ext4load mmc ${devnum}:5 ${kernel_addr_r} zImage; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
+      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} zImage"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_a} rauc.slot=A ${cmdline}"
     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 ..."
-      if ext4load mmc ${devnum}:7 ${kernel_addr_r} zImage; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
+      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
+      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} zImage"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done
@@ -76,9 +88,13 @@ else
   reset
 fi
 
+echo "Loading kernel"
+run load_kernel
+echo " Starting kernel"
+printenv load_kernel
 printenv bootargs
-echo "Starting kernel"
+dmc ${ddr_freq}
 bootz ${kernel_addr_r} - ${fdt_addr_r}
 
-echo "Boot failed, resetting..."
+echo "Fails on boot"
 reset

buildroot-external/board/hardkernel/patches/linux/0001-Fix-N2-audio.patch

@@ -0,0 +1,154 @@
+From 2fb3aa8c5f1534718cce1afd2bf61b1d21a5c851 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 5 Jun 2020 20:09:56 +0000
+Subject: [PATCH 1/1] Fix N2 audio
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 13 ++++++
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi    |  9 +++++
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 40 +++++++++++++++++--
+ 3 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index c0aef7d69117..bfddca4f91bb 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -9,6 +9,8 @@
+ #include <dt-bindings/clock/g12a-aoclkc.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
++#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
++#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
+ #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
+ #include <dt-bindings/thermal/thermal.h>
+ 
+@@ -250,6 +252,17 @@
+ 				};
+ 			};
+ 
++			acodec: audio-controller@32000 {
++				compatible = "amlogic,t9015";
++				reg = <0x0 0x32000 0x0 0x14>;
++				#sound-dai-cells = <0>;
++				sound-name-prefix = "ACODEC";
++				clocks = <&clkc CLKID_AUDIO_CODEC>;
++				clock-names = "pclk";
++				resets = <&reset RESET_AUDIO_CODEC>;
++				status = "disabled";
++			};
++
+ 			periphs: bus@34400 {
+ 				compatible = "simple-bus";
+ 				reg = <0x0 0x34400 0x0 0x400>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 55d39020ec72..0d14409f509c 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -343,6 +343,15 @@
+ 			status = "disabled";
+ 		};
+ 
++		toacodec: audio-controller@740 {
++			compatible = "amlogic,g12a-toacodec";
++			reg = <0x0 0x740 0x0 0x4>;
++			#sound-dai-cells = <1>;
++			sound-name-prefix = "TOACODEC";
++			resets = <&clkc_audio AUD_RESET_TOACODEC>;
++			status = "disabled";
++		};
++
+ 		tohdmitx: audio-controller@744 {
+ 			compatible = "amlogic,g12a-tohdmitx";
+ 			reg = <0x0 0x744 0x0 0x4>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+index 169ea283d4ee..b0fb25892964 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -10,6 +10,7 @@
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/gpio/meson-g12a-gpio.h>
+ #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
++#include <dt-bindings/sound/meson-g12a-toacodec.h>
+ 
+ / {
+ 	compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b";
+@@ -24,6 +25,20 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
++	dio2133: audio-amplifier-0 {
++		compatible = "simple-audio-amplifier";
++		enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
++		VCC-supply = <&vcc_5v>;
++		sound-name-prefix = "AMP";
++	};
++
++	spdif_dit: audio-codec-1 {
++		#sound-dai-cells = <0>;
++		compatible = "linux,spdif-dit";
++		status = "okay";
++		sound-name-prefix = "DIT";
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x0 0x0 0x0 0x40000000>;
+@@ -209,11 +224,13 @@
+ 	sound {
+ 		compatible = "amlogic,axg-sound-card";
+ 		model = "G12B-ODROID-N2";
+-		audio-aux-devs = <&tdmout_b>;
++		audio-aux-devs = <&tdmout_b>, <&dio2133>;
+ 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
+ 				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
+-				"TDM_B Playback", "TDMOUT_B OUT";
++				"TDM_B Playback", "TDMOUT_B OUT",
++				"AMP INL", "ACODEC LOLP",
++				"AMP INR", "ACODEC LORP";
+ 
+ 		assigned-clocks = <&clkc CLKID_MPLL2>,
+ 				  <&clkc CLKID_MPLL0>,
+@@ -251,14 +268,21 @@
+ 			};
+ 		};
+ 
+-		/* hdmi glue */
+ 		dai-link-4 {
+ 			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+ 
+-			codec {
++			codec@0 {
+ 				sound-dai = <&hdmi_tx>;
+ 			};
+ 		};
++
++		dai-link-5 {
++			sound-dai = <&toacodec TOACODEC_OUT>;
++
++			codec@0 {
++				sound-dai = <&acodec>;
++			};
++		};
+ 	};
+ };
+ 
+@@ -484,6 +508,14 @@
+ 	status = "okay";
+ };
+ 
++&toacodec {
++	status = "okay";
++};
++
++&acodec {
++	status = "okay";
++};
++
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch

@@ -1,36 +0,0 @@
-From 258f03fa4fd897a61b5861df1f809e234711dd49 Mon Sep 17 00:00:00 2001
-Message-Id: <258f03fa4fd897a61b5861df1f809e234711dd49.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Tue, 15 Sep 2020 17:24:31 +0200
-Subject: [PATCH 2/7] dt-bindings: arm: amlogic: add support for the ODROID-N2+
-
-HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports
-higher cpu clock speeds than the original ODROID-N2.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Acked-by: Rob Herring <robh@kernel.org>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Link: https://lore.kernel.org/r/20200915152432.30616-3-narmstrong@baylibre.com
----
- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 5eba9f48823e..12ba8d074370 100644
---- a/Documentation/devicetree/bindings/arm/amlogic.yaml
-+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -153,6 +153,7 @@ properties:
-               - azw,gtking
-               - azw,gtking-pro
-               - hardkernel,odroid-n2
-+              - hardkernel,odroid-n2-plus
-               - khadas,vim3
-               - ugoos,am6
-           - const: amlogic,s922x
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch

@@ -1,78 +0,0 @@
-From 6cfaddae585e5a87c5253c932b8d58e153159f6b Mon Sep 17 00:00:00 2001
-Message-Id: <6cfaddae585e5a87c5253c932b8d58e153159f6b.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Tue, 15 Sep 2020 17:24:32 +0200
-Subject: [PATCH 3/7] arm64: dts: meson: add support for the ODROID-N2+
-
-HardKernel ODROID-N2+ uses an Amlogic S922X rev. C chip capable of higher
-clock speeds than the original ODROID-N2.
-
-The rev. C support a slighly higher VDDCPU_A & VDDCPU_B voltages and supports
-the same OPPs as the Amlogic A311D SoC from the same G12B family.
-
-Suggested-by: Dongjin Kim <tobetter@hardkernel.com>
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Link: https://lore.kernel.org/r/20200915152432.30616-4-narmstrong@baylibre.com
----
- arch/arm64/boot/dts/amlogic/Makefile          |  1 +
- .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 +++++++++++++++++++
- 2 files changed, 32 insertions(+)
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-
-diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 4e2239ffcaa5..b0b3d6791499 100644
---- a/arch/arm64/boot/dts/amlogic/Makefile
-+++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
-+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-new file mode 100644
-index 000000000000..5de2815ba99d
---- /dev/null
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-@@ -0,0 +1,31 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2019 BayLibre, SAS
-+ * Author: Neil Armstrong <narmstrong@baylibre.com>
-+ */
-+
-+/dts-v1/;
-+
-+/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
-+#include "meson-g12b-a311d.dtsi"
-+#include "meson-g12b-odroid-n2.dtsi"
-+
-+/ {
-+	compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
-+	model = "Hardkernel ODROID-N2Plus";
-+};
-+
-+&vddcpu_a {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_AO_cd 1 1500 0>;
-+};
-+
-+&vddcpu_b {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_AO_cd 1 1500 0>;
-+};
-+
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-odroid-n2-plus-fix-vddcpu_a-pwm.patch

@@ -1,42 +0,0 @@
-From 47f804dc970e2b1f71f1f032a0da2ef3b8315be0 Mon Sep 17 00:00:00 2001
-Message-Id: <47f804dc970e2b1f71f1f032a0da2ef3b8315be0.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Fri, 23 Oct 2020 11:41:39 +0200
-Subject: [PATCH 4/7] arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm
-
-On the odroid N2 plus, cpufreq is not available due to an error on the cpu
-regulators. vddcpu a and b get the same PWM. The one provided to vddcpu A
-is incorrect. Because vddcpu B PWM is busy the regulator cannot register:
-
-> pwm-regulator regulator-vddcpu-b: Failed to get PWM: -16
-
-Like on the odroid n2, use PWM A out of GPIOE_2 for vddcpu A to fix the
-problem
-
-Fixes: 98d24896ee11 ("arm64: dts: meson: add support for the ODROID-N2+")
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Acked-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Link: https://lore.kernel.org/r/20201023094139.809379-1-jbrunet@baylibre.com
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-index 5de2815ba99d..ce1198ad34e4 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-@@ -19,7 +19,7 @@ &vddcpu_a {
- 	regulator-min-microvolt = <680000>;
- 	regulator-max-microvolt = <1040000>;
- 
--	pwms = <&pwm_AO_cd 1 1500 0>;
-+	pwms = <&pwm_ab 0 1500 0>;
- };
- 
- &vddcpu_b {
--- 
-2.29.2
-

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

@@ -1,52 +0,0 @@
-From 2c15ad491233a80d61c811a944b86067e2e74686 Mon Sep 17 00:00:00 2001
-Message-Id: <2c15ad491233a80d61c811a944b86067e2e74686.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Mon, 16 Nov 2020 23:11:02 +0100
-Subject: [PATCH 5/7] arm64: dts: meson: add RTC to ODROID-N2 boards
-
-All ODROID-N2 boards come with a NXP PCF8563TS RTC connected to I2C bus
-3. This is the RTC which is connected to the on-board RTC backup battery.
-Use it as primary RTC.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi     | 14 ++++++++++++++
- 1 file changed, 14 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 6982632ae646..40390feba053 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -13,6 +13,8 @@ / {
- 	aliases {
- 		serial0 = &uart_AO;
- 		ethernet0 = &ethmac;
-+		rtc0 = &board_rtc;
-+		rtc1 = &vrtc;
- 	};
- 
- 	dioo2133: audio-amplifier-0 {
-@@ -471,6 +473,18 @@ hdmi_tx_tmds_out: endpoint {
- 	};
- };
- 
-+&i2c3 {
-+	status = "okay";
-+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-+	pinctrl-names = "default";
-+	clock-frequency = <400000>;
-+
-+	board_rtc: rtc@51 {
-+		compatible = "nxp,pcf8563";
-+		reg = <0x51>;
-+	};
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-fix-PHY-deassert-timi.patch

@@ -1,41 +0,0 @@
-From 35d2de7b27bc3f4bc2d977fb6b7671d9ba889496 Mon Sep 17 00:00:00 2001
-Message-Id: <35d2de7b27bc3f4bc2d977fb6b7671d9ba889496.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 1 Dec 2020 00:32:23 +0100
-Subject: [PATCH 6/7] arm64: dts: meson: g12b: odroid-n2: fix PHY deassert
- timing requirements
-
-According to the datasheet (Rev. 1.9) the RTL8211F requires at least
-72ms "for internal circuits settling time" before accessing the PHY
-egisters. This fixes an issue where the Ethernet link doesn't come up
-when using ip link set down/up:
-  [   29.360965] meson8b-dwmac ff3f0000.ethernet eth0: Link is Down
-  [   34.569012] meson8b-dwmac ff3f0000.ethernet eth0: PHY [0.0:00] driver [RTL8211F Gigabit Ethernet] (irq=31)
-  [   34.676732] meson8b-dwmac ff3f0000.ethernet: Failed to reset the dma
-  [   34.678874] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
-  [   34.687850] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_open: Hw setup failed
-
-Fixes: 658e4129bb81 ("arm64: dts: meson: g12b: odroid-n2: add the Ethernet PHY reset line")
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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 40390feba053..445d90d25aa3 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -415,7 +415,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
- 
- 		interrupt-parent = <&gpio_intc>;
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-fix-PHY-deassert-timing-requirements.patch

@@ -1,152 +0,0 @@
-From 40e8e7e28c44993e352195b359c4d4540bfb2105 Mon Sep 17 00:00:00 2001
-Message-Id: <40e8e7e28c44993e352195b359c4d4540bfb2105.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 1 Dec 2020 00:32:23 +0100
-Subject: [PATCH 7/7] arm64: dts: meson: fix PHY deassert timing requirements
-
-According to the datasheet (Rev. 1.9) the RTL8211F requires at least
-72ms "for internal circuits settling time" before accessing the PHY
-egisters. This fixes an issue seen on ODROID-C2 where the Ethernet
-link doesn't come up when using ip link set down/up:
-  [ 6630.714855] meson8b-dwmac c9410000.ethernet eth0: Link is Down
-  [ 6630.785775] meson8b-dwmac c9410000.ethernet eth0: PHY [stmmac-0:00] driver [RTL8211F Gigabit Ethernet] (irq=36)
-  [ 6630.893071] meson8b-dwmac c9410000.ethernet: Failed to reset the dma
-  [ 6630.893800] meson8b-dwmac c9410000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
-  [ 6630.902835] meson8b-dwmac c9410000.ethernet eth0: stmmac_open: Hw setup failed
-
-Fixes: f29cabf240ed ("arm64: dts: meson: use the generic Ethernet PHY reset GPIO bindings")
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts   | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi     | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts   | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts        | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts    | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-index 7be3e354093b..de27beafe9db 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -165,7 +165,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 70fcfb7b0683..50de1d01e565 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -200,7 +200,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-index 222ee8069cfa..9b0b81f191f1 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-@@ -126,7 +126,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-index ad812854a107..a350fee1264d 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-@@ -147,7 +147,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-index b08c4537f260..b2ab05c22090 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-@@ -82,7 +82,7 @@ external_phy: ethernet-phy@0 {
- 
- 		/* External PHY reset is shared with internal PHY Led signal */
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-index bff8ec2c1c70..e38d9e50caa7 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-@@ -194,7 +194,7 @@ external_phy: ethernet-phy@0 {
- 		reg = <0>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-index 83eca3af44ce..dfa7a37a1281 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-@@ -112,7 +112,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 	};
- };
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-index ea45ae0c71b7..8edbfe040805 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-@@ -64,7 +64,7 @@ external_phy: ethernet-phy@0 {
- 
- 		/* External PHY reset is shared with internal PHY Led signal */
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-index c89c9f846fb1..dde7cfe12cff 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-@@ -114,7 +114,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 	};
- };
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/uboot/0001-ARM-meson-isolate-loading-of-socinfo.patch

@@ -1,51 +0,0 @@
-From f9877c2895d6c05710a828d0cd46d9f25626b070 Mon Sep 17 00:00:00 2001
-Message-Id: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Mon, 31 Aug 2020 13:40:18 +0200
-Subject: [PATCH 1/4] ARM: meson: isolate loading of socinfo
-
-Move loading of socinfo into a separate function so the value can be
-reused later.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/mach-meson/board-info.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
-index 3abb27e03b..c585b12ca5 100644
---- a/arch/arm/mach-meson/board-info.c
-+++ b/arch/arm/mach-meson/board-info.c
-@@ -126,7 +126,7 @@ static void print_board_model(void)
- 	printf("Model: %s\n", model ? model : "Unknown");
- }
- 
--int show_board_info(void)
-+static unsigned int get_socinfo(void)
- {
- 	struct regmap *regmap;
- 	int nodeoffset, ret;
-@@ -158,8 +158,20 @@ int show_board_info(void)
- 		return 0;
- 	}
- 
-+	return socinfo;
-+}
-+
-+int show_board_info(void)
-+{
-+	unsigned int socinfo;
-+
- 	/* print board information */
- 	print_board_model();
-+
-+	socinfo = get_socinfo();
-+	if (!socinfo)
-+		return 0;
-+
- 	printf("SoC:   Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n",
- 	       socinfo_to_soc_id(socinfo),
- 	       socinfo_to_package_id(socinfo),
--- 
-2.30.0
-

buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch

@@ -0,0 +1,55 @@
+From b93c598b1acfe59ffac342d114483af8a45a78ac Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Sat, 1 Feb 2020 20:55:39 +0000
+Subject: [PATCH 1/1] Amlogic w400: read ethaddr from efuse
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ board/amlogic/w400/w400.c | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c
+index e60dc3a622..d4028c6a39 100644
+--- a/board/amlogic/w400/w400.c
++++ b/board/amlogic/w400/w400.c
+@@ -6,13 +6,36 @@
+ 
+ #include <common.h>
+ #include <dm.h>
+-#include <env_internal.h>
++#include <env.h>
+ #include <asm/io.h>
++#include <asm/arch/sm.h>
+ #include <asm/arch/eth.h>
+ 
++#define EFUSE_MAC_OFFSET	20
++#define EFUSE_MAC_SIZE		12
++
+ int misc_init_r(void)
+ {
++	u8 mac_addr[6];
++	char efuse_mac_addr[EFUSE_MAC_SIZE], buff[3];
++	ssize_t len;
++
+ 	meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
+ 
++	if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
++		len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
++					  efuse_mac_addr, EFUSE_MAC_SIZE);
++		if (len != EFUSE_MAC_SIZE)
++			return 0; 
++
++		for (int i = 0; i < 6; i++){
++			buff[0] = efuse_mac_addr[i * 2];
++			buff[1] = efuse_mac_addr[i * 2 + 1];
++			mac_addr[i] = simple_strtoul(buff, NULL, 16);
++		}
++		if(is_valid_ethaddr(mac_addr))
++			eth_env_set_enetaddr("ethaddr", mac_addr);
++	}
++
+ 	return 0;
+ }
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/uboot/0002-meson-Add-board_rev-to-env.patch

@@ -1,82 +0,0 @@
-From 31e32295dc261032d7f5540a0b7f79a4f5a5b807 Mon Sep 17 00:00:00 2001
-Message-Id: <31e32295dc261032d7f5540a0b7f79a4f5a5b807.1609421746.git.stefan@agner.ch>
-In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 4 Aug 2020 13:50:57 +0000
-Subject: [PATCH 2/4] meson: Add board_rev to env
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/include/asm/arch-meson/boot.h |  4 ++++
- arch/arm/mach-meson/board-info.c       | 12 ++++++++++++
- board/amlogic/odroid-n2/odroid-n2.c    |  5 +++++
- 3 files changed, 21 insertions(+)
-
-diff --git a/arch/arm/include/asm/arch-meson/boot.h b/arch/arm/include/asm/arch-meson/boot.h
-index a90fe55081..c67d12d06c 100644
---- a/arch/arm/include/asm/arch-meson/boot.h
-+++ b/arch/arm/include/asm/arch-meson/boot.h
-@@ -7,6 +7,8 @@
- #ifndef __MESON_BOOT_H__
- #define __MESON_BOOT_H__
- 
-+#include <linux/types.h>
-+
- /* Boot device */
- #define BOOT_DEVICE_RESERVED    0
- #define BOOT_DEVICE_EMMC        1
-@@ -17,4 +19,6 @@
- 
- int meson_get_boot_device(void);
- 
-+int meson_get_soc_rev(char *buff, size_t buff_len);
-+
- #endif /* __MESON_BOOT_H__ */
-diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
-index c585b12ca5..9dbb997281 100644
---- a/arch/arm/mach-meson/board-info.c
-+++ b/arch/arm/mach-meson/board-info.c
-@@ -182,3 +182,15 @@ int show_board_info(void)
- 
- 	return 0;
- }
-+
-+int meson_get_soc_rev(char *buff, size_t buff_len)
-+{
-+	unsigned int socinfo;
-+
-+	socinfo = get_socinfo();
-+	if (!socinfo)
-+		return -1;
-+
-+	/* Write SoC info */
-+	return snprintf(buff, buff_len, "%x", socinfo_to_minor(socinfo));
-+}
-diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
-index caf7fd6810..c2a191ba6a 100644
---- a/board/amlogic/odroid-n2/odroid-n2.c
-+++ b/board/amlogic/odroid-n2/odroid-n2.c
-@@ -12,6 +12,7 @@
- #include <asm/io.h>
- #include <asm/arch/sm.h>
- #include <asm/arch/eth.h>
-+#include <asm/arch/boot.h>
- 
- #define EFUSE_MAC_OFFSET	20
- #define EFUSE_MAC_SIZE		12
-@@ -23,6 +24,10 @@ int misc_init_r(void)
- 	char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
- 	ssize_t len;
- 
-+	if (meson_get_soc_rev(tmp, sizeof(tmp)) > 0) {
-+		env_set("board_rev", tmp);
-+	}
-+
- 	meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
- 
- 	if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
--- 
-2.30.0
-

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

@@ -1,29 +0,0 @@
-From 01ba1339ffd095b146b9d9d772aea6f2b3594a06 Mon Sep 17 00:00:00 2001
-Message-Id: <01ba1339ffd095b146b9d9d772aea6f2b3594a06.1609421746.git.stefan@agner.ch>
-In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Mon, 2 Sep 2019 15:42:04 +0200
-Subject: [PATCH 3/4] HACK: mmc: meson-gx: limit to 24MHz
-
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- drivers/mmc/meson_gx_mmc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
-index 719dd1e5e5..dd3dd7c08c 100644
---- a/drivers/mmc/meson_gx_mmc.c
-+++ b/drivers/mmc/meson_gx_mmc.c
-@@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev)
- 	cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
- 			MMC_MODE_HS_52MHz | MMC_MODE_HS;
- 	cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
--	cfg->f_max = 100000000; /* 100 MHz */
-+	cfg->f_max = SD_EMMC_CLKSRC_24M;
- 	cfg->b_max = 511; /* max 512 - 1 blocks */
- 	cfg->name = dev->name;
- 
--- 
-2.30.0
-

buildroot-external/board/hardkernel/patches/uboot/0004-pinctrl-meson-fix-bit-manipulation-of-pin-bias-confi.patch

@@ -1,43 +0,0 @@
-From 26e152c0929702a9dfca4a8967601b59de77a57d Mon Sep 17 00:00:00 2001
-Message-Id: <26e152c0929702a9dfca4a8967601b59de77a57d.1609421746.git.stefan@agner.ch>
-In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Mon, 14 Dec 2020 19:39:07 +0100
-Subject: [PATCH 4/4] pinctrl: meson: fix bit manipulation of pin bias
- configuration
-
-This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.
-
-Fixes: c4c726c26b ("pinctrl: meson: add pinconf support")
-Reported-by: Anton Arapov <arapov@gmail.com>
-Reported-by: Otto Meier <gf435@gmx.net>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-(cherry picked from commit 5ccd5d2cc98224108ae9fb09593a862c9caa5e80)
----
- drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
-index d4539b02d8..5065b62436 100644
---- a/drivers/pinctrl/meson/pinctrl-meson.c
-+++ b/drivers/pinctrl/meson/pinctrl-meson.c
-@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
- 	}
- 
- 	/* othewise, enable the bias and select level */
--	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
-+	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
- 	ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
- 	if (ret)
- 		return ret;
- 
- 	clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
--			param == PIN_CONFIG_BIAS_PULL_UP);
-+			(param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
- 
- 	return 0;
- }
--- 
-2.30.0
-

buildroot-external/board/intel/nuc/hassos-hook.sh

@@ -15,6 +15,6 @@ function hassos_pre_image() {
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }
 

buildroot-external/board/intel/nuc/kernel.config

@@ -4,8 +4,6 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_BLK_DEV_NVME=y
 
-# CONFIG_E1000E is not set
-
 CONFIG_IGB=y
 
 CONFIG_IWLWIFI=m
@@ -16,9 +14,12 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_X86_INTEL_LPSS=y
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_CORE=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_I915=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m

buildroot-external/board/intel/ova/hassos-hook.sh

@@ -22,18 +22,18 @@ function hassos_post_image() {
     # Virtual Disk images
     convert_disk_image_virtual
 
-    convert_disk_image_xz vmdk
-    convert_disk_image_xz vhdx
-    convert_disk_image_xz vdi
-    convert_disk_image_xz qcow2
+    convert_disk_image_gz vmdk
+    convert_disk_image_gz vhdx
+    convert_disk_image_gz vdi
+    convert_disk_image_gz qcow2
 
     # OVA
     mkdir -p "${OVA_DATA}"
     rm -f "${HDD_OVA}"
 
-    cp -a "${BOARD_DIR}/home-assistant.ovf" "${OVA_DATA}/home-assistant.ovf"
+    cp -a ${BOARD_DIR}/home-assistant.ovf "${OVA_DATA}/home-assistant.ovf"
     qemu-img convert -O vmdk -o subformat=streamOptimized "${HDD_IMG}" "${OVA_DATA}/home-assistant.vmdk"
-    (cd "${OVA_DATA}" || exit 1; sha256sum --tag home-assistant.* >home-assistant.mf)
+    (cd "${OVA_DATA}"; sha256sum --tag home-assistant.* >home-assistant.mf)
     tar -C "${OVA_DATA}" --owner=root --group=root -cf "${HDD_OVA}" home-assistant.ovf home-assistant.vmdk home-assistant.mf
 
     # Cleanup

buildroot-external/board/intel/ova/home-assistant.ovf

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine" xmlns:vmw="http://www.vmware.com/schema/ovf">
+<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
   <References>
     <File ovf:id="file1" ovf:href="home-assistant.vmdk"/>
   </References>
   <DiskSection>
     <Info>List of the virtual disks used in the package</Info>
-    <Disk ovf:capacity="34359738368" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
+    <Disk ovf:capacity="6442450944" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
   </DiskSection>
   <NetworkSection>
     <Info>Logical networks used in the package</Info>
@@ -13,13 +13,12 @@
       <Description>Logical network used by this appliance.</Description>
     </Network>
   </NetworkSection>
-  <VirtualSystem ovf:id="HomeAssistant">
+  <VirtualSystem ovf:id="Home Assistant">
     <Info>A virtual machine</Info>
-    <Name>Home Assistant</Name>
     <ProductSection>
       <Info>Meta-information about the installed software</Info>
-      <Product>Home Assistant Operating System</Product>
-      <ProductUrl>https://www.home-assistant.io</ProductUrl>
+      <Product>Operating-System</Product>
+      <ProductUrl>https://home-assistant.io</ProductUrl>
     </ProductSection>
     <OperatingSystemSection ovf:id="100" vmw:osType="other4xLinux64Guest">
       <Info>The kind of installed guest operating system</Info>
@@ -89,13 +88,6 @@
         <rasd:ResourceSubType>E1000</rasd:ResourceSubType>
         <rasd:ResourceType>10</rasd:ResourceType>
       </Item>
-      <Item ovf:required="false">
-        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-        <rasd:ElementName>Audio</rasd:ElementName>
-        <rasd:InstanceID>11</rasd:InstanceID>
-        <rasd:ResourceSubType>vmware.soundcard.hdaudio</rasd:ResourceSubType>
-        <rasd:ResourceType>1</rasd:ResourceType>
-      </Item>
       <vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="efi"/>
       <vmw:ExtraConfig ovf:required="false" vmw:key="cpuid.coresPerSocket" vmw:value="2"/>
       <vmw:ExtraConfig ovf:required="false" vmw:key="svga.present" vmw:value="TRUE"/>
@@ -128,11 +120,11 @@
           </Controllers>
         </USB>
         <Network>
-          <Adapter slot="0" enabled="true" type="virtio">
+          <Adapter slot="0" enabled="true" type="82540EM">
             <BridgedInterface />
           </Adapter>
         </Network>
-        <AudioAdapter controller="HDA" enabled="true"/>
+        <AudioAdapter driver="Null" enabled="false"/>
         <RTC localOrUTC="UTC"/>
       </Hardware>
       <StorageControllers>

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

@@ -20,11 +20,6 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_SCSI_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y
 
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-CONFIG_FUSION_SAS=y
-CONFIG_FUSION_MAX_SGE=128
-
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_BLK_DEV_NVME=y
@@ -42,10 +37,4 @@ CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV_STORAGE=y
 CONFIG_HYPERV_NET=y
 CONFIG_HYPERV_VSOCKETS=m
-CONFIG_PCI_HYPERV=m
-CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y
-
-CONFIG_IGBVF=m
-CONFIG_IXGBEVF=m
-CONFIG_I40EVF=m

buildroot-external/board/intel/ova/meta

@@ -5,6 +5,6 @@ BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
 BOOT_SPL=false
-DISK_SIZE=32
+DISK_SIZE=6
 SUPERVISOR_MACHINE=qemux86-64
 SUPERVISOR_ARCH=amd64

buildroot-external/board/intel/patches/dt-utils/0001-get-devicetree-from-file.patch

@@ -1,18 +1,12 @@
-From 4e9abe7945370765a9e8e88b01a7ef5f266bf7fd Mon Sep 17 00:00:00 2001
-Message-Id: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
+From 405590bdb7ae434798010458e810c415e4e99db4 Mon Sep 17 00:00:00 2001
 From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
 Date: Fri, 30 Jun 2017 16:53:34 +0200
-Subject: [PATCH dt-utils 1/3] barebox-state: get devicetree from file
+Subject: barebox-state: get devicetree from file
 
 Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
----
- src/barebox-state.c | 30 ++++++++++++++++++++++--------
- src/barebox-state.h |  2 +-
- src/keystore-blob.c |  2 +-
- 3 files changed, 24 insertions(+), 10 deletions(-)
 
 diff --git a/src/barebox-state.c b/src/barebox-state.c
-index f8b8df6..76f9c41 100644
+index e68b8cb..3622e76 100644
 --- a/src/barebox-state.c
 +++ b/src/barebox-state.c
 @@ -308,7 +308,7 @@ static int state_set_var(struct state *state, const char *var, const char *val)
@@ -22,11 +16,11 @@ index f8b8df6..76f9c41 100644
 -struct state *state_get(const char *name, bool readonly, bool auth)
 +struct state *state_get(const char *name, const char *filename, bool readonly, bool auth)
  {
- 	struct device_node *root, *node;
+ 	struct device_node *root, *node, *partition_node;
  	char *path;
-@@ -317,11 +317,19 @@ struct state *state_get(const char *name, bool readonly, bool auth)
- 	const char *backend_type = NULL;
- 	struct state_variable *v;
+@@ -320,11 +320,19 @@ struct state *state_get(const char *name, bool readonly, bool auth)
+ 	off_t offset;
+ 	size_t size;
  
 -	root = of_read_proc_devicetree();
 -	if (IS_ERR(root)) {
@@ -49,7 +43,7 @@ index f8b8df6..76f9c41 100644
  	}
  
  	of_set_root_node(root);
-@@ -372,6 +380,7 @@ static struct option long_options[] = {
+@@ -387,6 +395,7 @@ static struct option long_options[] = {
  	{"get",		required_argument,	0,	'g' },
  	{"set",		required_argument,	0,	's' },
  	{"name",	required_argument,	0,	'n' },
@@ -57,7 +51,7 @@ index f8b8df6..76f9c41 100644
  	{"dump",	no_argument,		0,	'd' },
  	{"dump-shell",	no_argument,		0,	OPT_DUMP_SHELL },
  	{"verbose",	no_argument,		0,	'v' },
-@@ -387,6 +396,7 @@ static void usage(char *name)
+@@ -402,6 +411,7 @@ static void usage(char *name)
  "-g, --get <variable>                      get the value of a variable\n"
  "-s, --set <variable>=<value>              set the value of a variable\n"
  "-n, --name <name>                         specify the state to use (default=\"state\"). Multiple states are allowed.\n"
@@ -65,7 +59,7 @@ index f8b8df6..76f9c41 100644
  "-d, --dump                                dump the state\n"
  "--dump-shell                              dump the state suitable for shell sourcing\n"
  "-v, --verbose                             increase verbosity\n"
-@@ -424,12 +434,13 @@ int main(int argc, char *argv[])
+@@ -439,12 +449,13 @@ int main(int argc, char *argv[])
  	bool readonly = true;
  	int pr_level = 5;
  	int auth = 1;
@@ -80,7 +74,7 @@ index f8b8df6..76f9c41 100644
  		if (c < 0)
  			break;
  		switch (c) {
-@@ -475,6 +486,9 @@ int main(int argc, char *argv[])
+@@ -490,6 +501,9 @@ int main(int argc, char *argv[])
  			++nr_states;
  			break;
  		}
@@ -90,7 +84,7 @@ index f8b8df6..76f9c41 100644
  		case ':':
  		case '?':
  		default:
-@@ -515,7 +529,7 @@ int main(int argc, char *argv[])
+@@ -530,7 +544,7 @@ int main(int argc, char *argv[])
  	}
  
  	list_for_each_entry(state, &state_list.list, list) {
@@ -126,5 +120,4 @@ index 028dd8b..4572431 100644
  			return  PTR_ERR(tmp);
  		state = tmp;
 -- 
-2.29.2
-
+cgit v0.10.2

buildroot-external/board/intel/patches/dt-utils/0002-support-finding-devices-by-partuuid.patch

@@ -1,21 +1,15 @@
-From 4eb260d97419349320aa688866b4cf1eb177df70 Mon Sep 17 00:00:00 2001
-Message-Id: <4eb260d97419349320aa688866b4cf1eb177df70.1606682453.git.stefan@agner.ch>
-In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
-References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
+From 26148417fab419a0c7f301fb8f2be015324d5374 Mon Sep 17 00:00:00 2001
 From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
 Date: Fri, 30 Jun 2017 16:53:17 +0200
-Subject: [PATCH dt-utils 2/3] libdt: support finding devices by partuuid
+Subject: libdt: support finding devices by partuuid
 
 Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
----
- src/libdt.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
 
 diff --git a/src/libdt.c b/src/libdt.c
-index 4638678..b52f80c 100644
+index 3adeed2..2bc6cc1 100644
 --- a/src/libdt.c
 +++ b/src/libdt.c
-@@ -2416,6 +2416,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
+@@ -2393,6 +2393,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
  	 */
  	node = partition_node->parent;
  
@@ -35,5 +29,5 @@ index 4638678..b52f80c 100644
  	 * Respect flash "partitions" subnode. Use parent of parent in this
  	 * case.
 -- 
-2.29.2
+cgit v0.10.2
 

buildroot-external/board/intel/patches/dt-utils/0003-state-use-run-to-store-lockfile.patch

@@ -1,52 +0,0 @@
-From 665603ecadb8385dd6c18840d3b0120859a00369 Mon Sep 17 00:00:00 2001
-Message-Id: <665603ecadb8385dd6c18840d3b0120859a00369.1606682453.git.stefan@agner.ch>
-In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
-References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 13 Nov 2020 10:39:03 +0100
-Subject: [PATCH dt-utils 3/3] state: use /run to store lockfile
-
-The current location /var/lock is considered legacy (at least by
-systemd). Just use /run to store the lockfile and append the usual .lock
-suffix.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- src/barebox-state.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/barebox-state.c b/src/barebox-state.c
-index 76f9c41..53e5eb6 100644
---- a/src/barebox-state.c
-+++ b/src/barebox-state.c
-@@ -38,6 +38,8 @@
- #include <dt/dt.h>
- #include <state.h>
- 
-+#define BAREBOX_STATE_LOCKFILE "/run/barebox-state.lock"
-+
- struct state_variable;
- 
- static int __state_uint8_set(struct state_variable *var, const char *val);
-@@ -515,15 +517,15 @@ int main(int argc, char *argv[])
- 		++nr_states;
- 	}
- 
--	lock_fd = open("/var/lock/barebox-state", O_CREAT | O_RDWR, 0600);
-+	lock_fd = open(BAREBOX_STATE_LOCKFILE, O_CREAT | O_RDWR, 0600);
- 	if (lock_fd < 0) {
--		pr_err("Failed to open lock-file /var/lock/barebox-state\n");
-+		pr_err("Failed to open lock-file " BAREBOX_STATE_LOCKFILE "\n");
- 		exit(1);
- 	}
- 
- 	ret = flock(lock_fd, LOCK_EX);
- 	if (ret < 0) {
--		pr_err("Failed to lock /var/lock/barebox-state: %m\n");
-+		pr_err("Failed to lock " BAREBOX_STATE_LOCKFILE ": %m\n");
- 		close(lock_fd);
- 		exit(1);
- 	}
--- 
-2.29.2
-

buildroot-external/board/intel/patches/linux/0001-loop-Only-change-blocksize-when-needed.patch

@@ -0,0 +1,46 @@
+From 7e81f99afd91c937f0e66dc135e26c1c4f78b003 Mon Sep 17 00:00:00 2001
+From: Martijn Coenen <maco@android.com>
+Date: Tue, 10 Mar 2020 14:12:30 +0100
+Subject: [PATCH] loop: Only change blocksize when needed.
+
+Return early in loop_set_block_size() if the requested block size is
+identical to the one we already have; this avoids expensive calls to
+freeze the block queue.
+
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Martijn Coenen <maco@android.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ drivers/block/loop.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index 739b372a5112..93b8d6047c14 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -1539,16 +1539,16 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg)
+ 	if (arg < 512 || arg > PAGE_SIZE || !is_power_of_2(arg))
+ 		return -EINVAL;
+ 
+-	if (lo->lo_queue->limits.logical_block_size != arg) {
+-		sync_blockdev(lo->lo_device);
+-		kill_bdev(lo->lo_device);
+-	}
++	if (lo->lo_queue->limits.logical_block_size == arg)
++		return 0;
++
++	sync_blockdev(lo->lo_device);
++	kill_bdev(lo->lo_device);
+ 
+ 	blk_mq_freeze_queue(lo->lo_queue);
+ 
+ 	/* kill_bdev should have truncated all the pages */
+-	if (lo->lo_queue->limits.logical_block_size != arg &&
+-			lo->lo_device->bd_inode->i_mapping->nrpages) {
++	if (lo->lo_device->bd_inode->i_mapping->nrpages) {
+ 		err = -EAGAIN;
+ 		pr_warn("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n",
+ 			__func__, lo->lo_number, lo->lo_file_name,
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/boot-env.txt

@@ -9,9 +9,6 @@ kernel=u-boot.bin
 # uncomment for aarch64 bit support
 #arm_64bit=1
 
-# uncomment to enable primary UART console
-#enable_uart=1
-
 # uncomment if you get no picture on HDMI for a default "safe" mode
 #hdmi_safe=1
 
@@ -49,8 +46,8 @@ kernel=u-boot.bin
 # uncomment for composite PAL
 #sdtv_mode=2
 
-# Uncomment to disable continous SD-card poll (for USB SSD)
-#dtparam=sd_poll_once=on
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
 
 # Uncomment some or all of these to enable the optional hardware interfaces
 #dtparam=i2c_arm=on

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

@@ -13,19 +13,14 @@ function hassos_pre_image() {
 
     # Firmware
     if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
-        cp "${BINARIES_DIR}/rpi-firmware/fixup.dat" "${BOOT_DATA}/fixup4.dat" 
-        cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf"
+        cp -t "${BOOT_DATA}" \
+        "${BINARIES_DIR}/rpi-firmware/fixup4.dat" \
+        "${BINARIES_DIR}/rpi-firmware/start4.elf"
     else
         cp -t "${BOOT_DATA}" \
-            "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-            "${BINARIES_DIR}/rpi-firmware/start.elf" \
-            "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
-    fi
-
-    # EEPROM update for Raspberry Pi 4/Compute Module 4
-    if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
+        "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
+        "${BINARIES_DIR}/rpi-firmware/start.elf" \
+        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
     fi
 
     # Set cmd options
@@ -39,6 +34,6 @@ function hassos_pre_image() {
 
 
 function hassos_post_image() {
-    convert_disk_image_xz
+    convert_disk_image_gz
 }
 

buildroot-external/board/raspberrypi/kernel.config

@@ -1,3 +0,0 @@
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_PGTABLE_MAPPING is not set

buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-arm-bcm-Convert-BCM2835-firmware-binding.patch

@@ -1,87 +0,0 @@
-From 625000fe2a9c1f78099895bf14c2f9753e359fba Mon Sep 17 00:00:00 2001
-Message-Id: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Mon, 15 Jun 2020 10:40:41 +0200
-Subject: [PATCH 1/7] dt-bindings: arm: bcm: Convert BCM2835 firmware binding
- to YAML
-
-Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
-Verified with dt_binding_check and dtbs_check.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://lore.kernel.org/r/5bc0b9be8544b07300fccab4d4f26e5e5d8e62b2.1592210452.git-series.maxime@cerno.tech
-Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-(cherry picked from commit d4c708c032df3d95de297232e20041737e99d126)
----
- .../arm/bcm/raspberrypi,bcm2835-firmware.txt  | 14 --------
- .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 35 +++++++++++++++++++
- 2 files changed, 35 insertions(+), 14 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
- create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-
-diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
-deleted file mode 100644
-index 6824b3180ffb..000000000000
---- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--Raspberry Pi VideoCore firmware driver
--
--Required properties:
--
--- compatible:		Should be "raspberrypi,bcm2835-firmware"
--- mboxes:		Phandle to the firmware device's Mailbox.
--			  (See: ../mailbox/mailbox.txt for more information)
--
--Example:
--
--firmware {
--	compatible = "raspberrypi,bcm2835-firmware";
--	mboxes = <&mailbox>;
--};
-diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-new file mode 100644
-index 000000000000..cec540c052b6
---- /dev/null
-+++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-@@ -0,0 +1,35 @@
-+# SPDX-License-Identifier: GPL-2.0
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Raspberry Pi VideoCore firmware driver
-+
-+maintainers:
-+  - Eric Anholt <eric@anholt.net>
-+  - Stefan Wahren <wahrenst@gmx.net>
-+
-+properties:
-+  compatible:
-+    items:
-+      - const: raspberrypi,bcm2835-firmware
-+      - const: simple-bus
-+
-+  mboxes:
-+    $ref: '/schemas/types.yaml#/definitions/phandle'
-+    description: |
-+      Phandle to the firmware device's Mailbox.
-+      (See: ../mailbox/mailbox.txt for more information)
-+
-+required:
-+  - compatible
-+  - mboxes
-+
-+examples:
-+  - |
-+    firmware {
-+        compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
-+        mboxes = <&mailbox>;
-+    };
-+...
--- 
-2.30.0
-

buildroot-external/board/raspberrypi/patches/linux/0002-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch

@@ -1,71 +0,0 @@
-From 47ebc13878c0bff61aeac05bc376a795b26553cd Mon Sep 17 00:00:00 2001
-Message-Id: <47ebc13878c0bff61aeac05bc376a795b26553cd.1611839042.git.stefan@agner.ch>
-In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
-References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 15 Jun 2020 10:40:42 +0200
-Subject: [PATCH 2/7] dt-bindings: clock: Add a binding for the RPi Firmware
- clocks
-
-The firmware running on the RPi VideoCore can be used to discover and
-change the various clocks running in the BCM2711. Since devices will
-need to use them through the DT, let's add a pretty simple binding.
-
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: linux-clk@vger.kernel.org
-Cc: devicetree@vger.kernel.org
-Reviewed-by: Stephen Boyd <sboyd@kernel.org>
-Reviewed-by: Rob Herring <robh+dt@kernel.org>
-Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://lore.kernel.org/r/f6105207e7ef5a5ea8d7a1774faf989d341a25f5.1592210452.git-series.maxime@cerno.tech
-Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-(cherry picked from commit 74a0caa5ef1c25905c4409b350ed9a8e0d9a3b74)
----
- .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 24 +++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-index cec540c052b6..b48ed875eb8e 100644
---- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-+++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-@@ -22,6 +22,25 @@ properties:
-       Phandle to the firmware device's Mailbox.
-       (See: ../mailbox/mailbox.txt for more information)
- 
-+  clocks:
-+    type: object
-+
-+    properties:
-+      compatible:
-+        const: raspberrypi,firmware-clocks
-+
-+      "#clock-cells":
-+        const: 1
-+        description: >
-+          The argument is the ID of the clocks contained by the
-+          firmware messages.
-+
-+    required:
-+      - compatible
-+      - "#clock-cells"
-+
-+    additionalProperties: false
-+
- required:
-   - compatible
-   - mboxes
-@@ -31,5 +50,10 @@ examples:
-     firmware {
-         compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
-         mboxes = <&mailbox>;
-+
-+        firmware_clocks: clocks {
-+            compatible = "raspberrypi,firmware-clocks";
-+            #clock-cells = <1>;
-+        };
-     };
- ...
--- 
-2.30.0
-