Supervisor: update Hass.io to 150

* Update CLI v9 with armv7

* Update rpi2_defconfig

.github/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-<!-- 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/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 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.
--->
-
-**HassOS release with the issue:**
-<!--
-- Frontend -> Developer tools -> Info
-- Or use this command: hass --version
--->
-
-**Supervisor logs:**
-<!--
-- Frontend -> Hass.io -> System
-- Or use this command: hassio su logs
--->
-
-**Journal logs:**
-<!--
-- use this command: journalctl
--->
-
-**Kernel logs:**
-<!--
-- use this command: dmesg
--->
-
-**Description of problem:**

.github/release-drafter.yml

@@ -1,17 +0,0 @@
-categories:
-  - title: 'HassOS Core'
-    label: 'os'
-  - title: 'Build'
-    label: 'build'
-  - title: 'Raspberry Pi'
-    label: 'board/raspberrypi'
-  - title: 'Open Virtual Appliance'
-    label: 'board/ova'
-  - title: 'Intel-Nuc'
-    label: 'board/intel-nuc'
-  - title: 'Hardkernel'
-    label: 'board/hardkernel'
-template: |
-  ## Changes
-
-  $CHANGES

.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.hadolint.yaml

@@ -1,2 +0,0 @@
-ignored:
-  - DL3008

.travis.yml

@@ -0,0 +1,25 @@
+language: bash
+
+sudo: required
+service: docker
+
+addons:
+  apt:
+    packages:
+     - docker-ce
+
+before_install:
+  - shopt -s globstar
+  - docker pull koalaman/shellcheck
+
+script:
+ - docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*
+ - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*
+
+matrix:
+  fast_finish: true

Dockerfile

@@ -1,24 +1,20 @@
 FROM ubuntu:18.04
 
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
 # Docker
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y \
         apt-transport-https \
         ca-certificates \
         curl \
-        gpg-agent \
         software-properties-common \
+    && rm -rf /var/lib/apt/lists/* \
     && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
     && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    && apt-get update && apt-get install -y --no-install-recommends \
-        docker-ce \
+    && apt-get update && apt-get install -y docker-ce \
     && rm -rf /var/lib/apt/lists/*
 
 # Build Tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev sudo \
+RUN apt-get update && apt-get install -y \
+        wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
         git make g++ file perl bash binutils locales qemu-utils bison flex \
     && rm -rf /var/lib/apt/lists/*
 

Documentation/boards/hardkernel/odroid-n2.md

@@ -1,14 +0,0 @@
-# Odroid-N2
-
-## eMMC
-
-eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
-
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
-eg. `console=ttyAML0,115200n8 console=tty0`
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-n2/hardware/expansion_connectors).

Documentation/boards/hardkernel/odroid-xu4.md

@@ -1,27 +0,0 @@
-# Odroid-XU4
-
-## eMMC
-
-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.
-eg. `console=tty1 console=ttySAC2,115200`
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-xu4/hardware/expansion_connectors).

Documentation/boards/orangepi.md

@@ -0,0 +1,20 @@
+# Raspberry PI
+
+Supported Hardware:
+
+| Device | Board | 
+|--------|-----------|
+| Orange Pi Prime | opi-prime |
+
+## Serial console
+
+The serial port on the Orange Pi Prime is a 3 pin header located between the
+power and reset buttons. The pins are labelled away from the board edge. Flow
+control must be disabled in order to send data. The serial specs are 3.3V TTL,
+115200,8,n,1
+
+## I2C
+
+Add `dtparam=i2c0=on` to `cmdline.txt`
+
+[config]: ../configuration.md#automatic

Documentation/boards/ova.md

@@ -1,18 +1,16 @@
-# 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:
+# OVA
 
+OVA stands for Open Virtual Appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
+until we have better OVF template to generate our OVA. This VMDK work with (maybe you need convert the disk):
 - HyperV
 - VirtualBox
-- VMware
+- VMware
+
+## Virtual Machine
+
+You can use this vmdk in a virtual machine with follow requirements:
+- OS: Linux 64bit
+- UEFI boot
+- min. 1GB RAM
+- 2x vcpu
+- 1x Network

Documentation/boards/raspberrypi.md

@@ -2,14 +2,13 @@
 
 Supported Hardware:
 
-| Device | Board |
+| 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
 
@@ -21,7 +20,7 @@ For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmd
 
 ## 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`.
+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:
 ```
@@ -29,19 +28,6 @@ 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`.

Documentation/boards/tinker.md

@@ -7,11 +7,11 @@ Supported Hardware:
 | Tinker RK3288 | tinker |
 | Tinker S RK3288 | tinker |
 
-## eMMC
+## 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.
+Actual we support only SD cards. The support for EMMC will follow.
 
 ## 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.
+For access to terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
 

Documentation/build.md

@@ -0,0 +1,21 @@
+# Building
+
+Running `sudo ./enter.sh` will get you into the build Docker container.   
+`make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
+
+## Scripts
+
+
+
+## Helpers
+
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-menuconfig`
+
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external savedefconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-update-defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-update-defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-update-config`

Documentation/configuration.md

@@ -3,28 +3,26 @@
 ## Automatic
 
 You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
-Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG` (in all capitals). Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
+Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
 
 ```text
 network/
 modules/
-modprobe/
 udev/
 authorized_keys
 timesyncd.conf
 hassos-xy.raucb
 ```
 
-- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
+- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. 
 - The `modules` folder is for modules-load configuration files.
-- The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
 - The `udev` folder is for udev rules files.
 - The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
 - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
-- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
+- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page. 
 
-You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later over the
-API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be insterted to the device during this setup process and can be disconnected afterwards.*
+You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
+API/UI or by calling `systemctl restart hassos-config` on the host.
 
 ## Local
 
@@ -34,7 +32,7 @@ You can edit or create a `cmdline.txt` in your boot partition. That will be read
 
 ### Kernel-Module
 
-The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. You can add the modules configuration files in `/etc/modprobe.d` that is also persistent.
+The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules].
 
 ### Udev rules
 

Documentation/kernel.md

@@ -1,14 +1,12 @@
 
 # Kernel Version
 
-Default Kernel tree: 5.4
-
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 5.4.11 |
-| Raspberry Pi | 4.19.93 |
-| Tinker Board | 4.19.88 |
-| Odroid-C2 | 5.4.11 |
-| Odroid-N2 | 5.4.11 |
-| Odroid-XU4 | 5.4.11 |
-| Intel NUC | 5.4.11 |
+| Open Virtual Applicance | 4.19.20 |
+| Raspberry Pi | 4.14.98 |
+| Tinker Board | 4.19.20 |
+| Odroid-C2 | 4.19.15 |
+| Odroid-XU4 | 4.19.15 |
+| Orangepi-Prime | 4.19.13 |
+| Intel NUC | 4.14.82 |

Documentation/network.md

@@ -1,6 +1,5 @@
 # Network
 
-## Configure Network
 HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
 
 ## Configuration Examples
@@ -13,7 +12,7 @@ We have a preinstalled connection profile:
 
 ```ini
 [connection]
-id=my-network
+id=HassOS default
 uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
 type=802-3-ethernet
 
@@ -29,7 +28,7 @@ method=auto
 
 ```ini
 [connection]
-id=my-network
+id=hassos-network
 uuid=d55162b4-6152-4310-9312-8f4c54d86afa
 type=802-3-ethernet
 
@@ -45,7 +44,7 @@ method=auto
 
 ```ini
 [connection]
-id=my-network
+id=hassos-network
 uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
 type=802-11-wireless
 
@@ -75,10 +74,10 @@ Replace the following configuration:
 ```ini
 [ipv4]
 method=manual
-address=192.168.1.111/24;192.168.1.1
+address=192.168.1.111/24,192.168.1.1
 dns=8.8.8.8;8.8.4.4;
 ```
-For address, the value before the semicolon is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
+For address, the value before the comma is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
 
 ## Tips
 

README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://dev.azure.com/home-assistant/Hass.io/_apis/build/status/hassos?branchName=dev)](https://dev.azure.com/home-assistant/Hass.io/_build/latest?definitionId=13&branchName=dev)
-
 # HassOS
 Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and  security. You can update the system simple with OTA updates or offline updates.
 

azure-pipelines-ci.yml

@@ -1,49 +0,0 @@
-# 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: |
-      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/sbin/* \
-          buildroot-external/rootfs-overlay/usr/libexec/* \
-          buildroot-external/rootfs-overlay/usr/lib/rauc/*
-    displayName: 'Run ShellCheck'

azure-pipelines-release.yml

@@ -1,95 +0,0 @@
-# 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: hassos
-
-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) $(Build.SourceBranchName) release/
-    displayName: 'Upload $(board)'

buildroot-external/Config.in

@@ -4,4 +4,3 @@ 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"

buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch

@@ -0,0 +1,41 @@
+From b82f540967f6a732a22bbd236457b864951aeda7 Mon Sep 17 00:00:00 2001
+From: Myy <myy@miouyouyou.fr>
+Date: Sun, 14 May 2017 10:13:26 +0000
+Subject: [PATCH] clk: rockchip: rk3288: prefer vdpu for vcodec clock source
+
+Patch provided by Randy Li. The original commit message reads :
+
+_______________
+The RK3288 CRU system clock solution would suggest use
+the vdpu clock source for the VPU(aclk_vpu and hclk_vpu).
+
+Reading the registers of VPU(both VEPU and VDPU) would become all high
+when the vepu is used as the clock source. It may be a bug in the SoC,
+not sure whether it is fixed at RK3288W.
+
+Signed-off-by: Randy Li <ayaka@soulik.info>
+_______________
+
+This also resolves a freeze when loading the OOT Video Codec driver
+
+Signed-off-by: Myy <myy@miouyouyou.fr>
+---
+ drivers/clk/rockchip/clk-rk3288.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
+index 1227f74..f218256 100644
+--- a/drivers/clk/rockchip/clk-rk3288.c
++++ b/drivers/clk/rockchip/clk-rk3288.c
+@@ -215,7 +215,7 @@ PNAME(mux_hsadcout_p)	= { "hsadc_src", "ext_hsadc" };
+ PNAME(mux_edp_24m_p)	= { "ext_edp_24m", "xin24m" };
+ PNAME(mux_tspout_p)	= { "cpll", "gpll", "npll", "xin27m" };
+ 
+-PNAME(mux_aclk_vcodec_pre_p)	= { "aclk_vepu", "aclk_vdpu" };
++PNAME(mux_aclk_vcodec_pre_p)	= { "aclk_vdpu", "aclk_vepu" };
+ PNAME(mux_usbphy480m_p)		= { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
+ 				    "sclk_otgphy0_480m" };
+ PNAME(mux_hsicphy480m_p)	= { "cpll", "gpll", "usbphy480m_src" };
+-- 
+2.10.2
+

buildroot-external/board/asus/tinker/patches/linux/1008-rockchip-dwc2-usb-partial-power-down.patch

@@ -0,0 +1,44 @@
+From 04fbf78e4e569bf872f1ffcb0a6f9b89569dc913 Mon Sep 17 00:00:00 2001
+From: Hal Emmerich <hal@halemmerich.com>
+Date: Thu, 19 Jul 2018 21:48:08 -0500
+Subject: [PATCH] usb: dwc2: disable power_down on rockchip devices
+
+ The bug would let the usb controller enter partial power down,
+ which was formally known as hibernate, upon boot if nothing was plugged
+ in to the port. Partial power down couldn't be exited properly, so any
+ usb devices plugged in after boot would not be usable.
+
+ Before the name change, params.hibernation was false by default, so
+ _dwc2_hcd_suspend() would skip entering hibernation. With the
+ rename, _dwc2_hcd_suspend() was changed to use  params.power_down
+ to decide whether or not to enter partial power down.
+
+ Since params.power_down is non-zero by default, it needs to be set
+ to 0 for rockchip devices to restore functionality.
+
+ This bug was reported in the linux-usb thread:
+ REGRESSION: usb: dwc2: USB device not seen after boot
+
+ The commit that caused this regression is:
+ 6d23ee9caa6790aea047f9aca7f3c03cb8d96eb6
+
+Signed-off-by: Hal Emmerich <hal@halemmerich.com>
+---
+ drivers/usb/dwc2/params.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
+index f03e418..492607a 100644
+--- a/drivers/usb/dwc2/params.c
++++ b/drivers/usb/dwc2/params.c
+@@ -82,6 +82,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
+ 	p->host_perio_tx_fifo_size = 256;
+ 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
+ 		GAHBCFG_HBSTLEN_SHIFT;
++	p->power_down = 0;
+ }
+ 
+ static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
+-- 
+2.11.0
+

buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled

@@ -1,35 +0,0 @@
-From 8ca607f3fe77c80a3367d8363703d5dc1d6781d4 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 22:36:02 +0200
-Subject: [PATCH 22/28] ARM: DTS: rk3288-tinker.dts: Add the MIPI DSI node
-
-Taken from, and tested by @TonyMac32 .
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288-tinker.dts | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 67a3ce6f..6f4c0843 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -443,6 +443,15 @@
- 	sdcard-supply = <&vccio_sd>;
- };
- 
-+&mipi_dsi {
-+	status = "okay";
-+	mipi_panel: mipi-panel {
-+		compatible ="asus,tc358762";
-+		reg = <0x0 0>;
-+		status = "okay";
-+	};
-+};
-+
- &sdio0 {
- 	status = "okay";
- 	clock-frequency = <50000000>;
--- 
-2.11.0
-

buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch

@@ -0,0 +1,37 @@
+From 24d6638302b48328a58c13439276d4531af4ca7d Mon Sep 17 00:00:00 2001
+From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
+Date: Tue, 11 Sep 2018 01:39:32 +0900
+Subject: ASoC: rockchip: add missing INTERLEAVED PCM attribute
+
+This patch adds SNDRV_PCM_INFO_INTERLEAVED into PCM hardware info.
+
+Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ sound/soc/rockchip/rockchip_pcm.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+(limited to 'sound/soc/rockchip')
+
+Armbian Note: this patch has been backported from 4.20 to 4.19 due to break in rockchip HDMI/I2S audio. This
+can be safely removed once there is a new kernel bump.
+Origin: <https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/sound/soc/rockchip?h=linux-4.20.y&id=24d6638302b48328a58c13439276d4531af4ca7d>
+
+diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c
+index f77538319221..9e7b5fa4cf59 100644
+--- a/sound/soc/rockchip/rockchip_pcm.c
++++ b/sound/soc/rockchip/rockchip_pcm.c
+@@ -21,7 +21,8 @@ static const struct snd_pcm_hardware snd_rockchip_hardware = {
+ 	.info			= SNDRV_PCM_INFO_MMAP |
+ 				  SNDRV_PCM_INFO_MMAP_VALID |
+ 				  SNDRV_PCM_INFO_PAUSE |
+-				  SNDRV_PCM_INFO_RESUME,
++				  SNDRV_PCM_INFO_RESUME |
++				  SNDRV_PCM_INFO_INTERLEAVED,
+ 	.period_bytes_min	= 32,
+ 	.period_bytes_max	= 8192,
+ 	.periods_min		= 1,
+-- 
+cgit 1.2-0.3.lf.el7
+
+

buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch

@@ -1,13 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 958c0f3bf..59b8d8eac 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -70,7 +70,7 @@
- 	sound {
- 		compatible = "simple-audio-card";
- 		simple-audio-card,format = "i2s";
--		simple-audio-card,name = "rockchip,tinker-codec";
-+		simple-audio-card,name = "DW-I2S-HDMI";
- 		simple-audio-card,mclk-fs = <512>;
- 
- 		simple-audio-card,codec {

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

@@ -77,8 +77,8 @@ m_bpp=32
 # 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
+#hpd=false
 
 # Monitor output
 # Controls if HDMI PHY should output anything to the monitor

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

@@ -5,7 +5,7 @@ function hassos_pre_image() {
     local BOOT_DATA="$(path_boot_dir)"
     local BL1="${BINARIES_DIR}/bl1.bin.hardkernel"
     local UBOOT_GXBB="${BINARIES_DIR}/u-boot.gxbb"
-    local SPL_IMG="$(path_spl_img)"
+    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"
@@ -16,9 +16,9 @@ function hassos_pre_image() {
     # SPL
     create_spl_image
 
-    dd if="${BL1}" of="${SPL_IMG}" conv=notrunc bs=1 count=440
-    dd if="${BL1}" of="${SPL_IMG}" conv=notrunc bs=512 skip=1 seek=1
-    dd if="${UBOOT_GXBB}" of="${SPL_IMG}" conv=notrunc bs=512 seek=97
+    dd if="${BL1}" of="${spl_img}" conv=notrunc bs=1 count=440
+    dd if="${BL1}" of="${spl_img}" conv=notrunc bs=512 skip=1 seek=1
+    dd if="${UBOOT_GXBB}" of="${spl_img}" conv=notrunc bs=512 seek=97
 }
 
 

buildroot-external/board/hardkernel/odroid-c2/patches/linux/000-arm64_dts_meson_Fix_IRQ_trigger_type_for_macirq.patch

@@ -0,0 +1,50 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+index b160bd1084de..fffd55787981 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+@@ -461,7 +461,7 @@
+ 			compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
+ 			reg = <0x0 0xff3f0000 0x0 0x10000
+ 				0x0 0xff634540 0x0 0x8>;
+-			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
++			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+ 			interrupt-names = "macirq";
+ 			clocks = <&clkc CLKID_ETH>,
+ 				 <&clkc CLKID_FCLK_DIV2>,
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+index ed336c7a98a7..44c5c51ff1fa 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+@@ -467,7 +467,7 @@
+ 			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
+ 			reg = <0x0 0xc9410000 0x0 0x10000
+ 			       0x0 0xc8834540 0x0 0x4>;
+-			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
++			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+ 			interrupt-names = "macirq";
+ 			status = "disabled";
+ 		};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 00f7be6d83f7..2e1cd5e3a246 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -143,7 +143,6 @@
+ 			interrupt-parent = <&gpio_intc>;
+ 			/* MAC_INTR on GPIOZ_15 */
+ 			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+-			eee-broken-1000t;
+ 		};
+ 	};
+ };
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+index 70325b273bd2..ec09bb5792b7 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+@@ -142,7 +142,6 @@
+ 		eth_phy0: ethernet-phy@0 {
+ 			/* Realtek RTL8211F (0x001cc916) */
+ 			reg = <0>;
+-			eee-broken-1000t;
+ 		};
+ 	};
+ };

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

@@ -24,7 +24,7 @@ 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}"
+setenv bootargs_odroidc2 "${condev} no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes 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 cgroup_enable=memory"

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

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

@@ -1,25 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local UBOOT_G12B="${BINARIES_DIR}/u-boot.g12b"
-    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-g12b-odroid-n2.dtb" "${BOOT_DATA}/meson-g12b-odroid-n2.dtb"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-	dd if="${UBOOT_G12B}" of="${SPL_IMG}" conv=notrunc bs=512 seek=1
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
-

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

@@ -1,7 +0,0 @@
-BOARD_ID=odroid-n2
-BOARD_NAME="Hardkernel Odroid-N2"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_SYS=mbr
-BOOT_ENV_SIZE=0x2000

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

@@ -1,6 +1,7 @@
 
 macaddr=00:1e:06:61:7a:39
 vout=hdmi
+vout=hdmi
 # - DVI Mode (disables sound over HDMI as per DVI compat)
 # vout=dvi
 
@@ -15,7 +16,7 @@ disable_vu7=false
 # DRAM Frequency
 # Sets the LPDDR3 memory frequency
 # Supported values: 933 825 728 633 (MHZ)
-ddr_freq=825
+ddr_freq 825
 
 # External watchdog board enable
 external_watchdog=false

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

@@ -4,4 +4,4 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=mbr
-BOOT_ENV_SIZE=0x4000
+BOOT_ENV_SIZE=0x2000

buildroot-external/board/hardkernel/odroid-xu4/patches/linux/000-arm-exynos_change_the_default_dma_coherent_pool_size.patch

@@ -0,0 +1,42 @@
+diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
+index bf02dbd9ccda3..8029e21eee149 100644
+--- a/arch/arm/include/asm/dma-mapping.h
++++ b/arch/arm/include/asm/dma-mapping.h
+@@ -5,7 +5,9 @@
+ 
+ #include <linux/mm_types.h>
+ #include <linux/scatterlist.h>
++#include <linux/device.h>
+ #include <linux/dma-debug.h>
++#include <linux/dma-direction.h>
+ 
+ #include <asm/memory.h>
+ 
+diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
+index fd6da5419b510..5b3abc935e7fc 100644
+--- a/arch/arm/mach-exynos/firmware.c
++++ b/arch/arm/mach-exynos/firmware.c
+@@ -13,12 +13,14 @@
+ #include <linux/init.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/sizes.h>
+ 
+ #include <asm/cacheflush.h>
+ #include <asm/cputype.h>
+ #include <asm/firmware.h>
+ #include <asm/hardware/cache-l2x0.h>
+ #include <asm/suspend.h>
++#include <asm/dma-mapping.h>
+ 
+ #include "common.h"
+ #include "smc.h"
+@@ -225,6 +227,8 @@ void __init exynos_firmware_init(void)
+ 		outer_cache.write_sec = exynos_l2_write_sec;
+ 		outer_cache.configure = exynos_l2_configure;
+ 	}
++
++	init_dma_coherent_pool_size(SZ_1M);
+ }
+ 
+ #define REG_CPU_STATE_ADDR	(sysram_ns_base_addr + 0x28)

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

@@ -3,20 +3,15 @@
 
 part start mmc ${devnum} 9 mmc_env
 mmc dev ${devnum}
-
-# Note that import is performed twice for backwards compatability.
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mw.b ${ramdisk_addr_r} 0 0x4000; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \
-    env import -c ${ramdisk_addr_r} 0x2000 || \
-    env import -c ${ramdisk_addr_r} 0x4000;"
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
+    env import -c ${ramdisk_addr_r} 0x2000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
-    mw.b ${ramdisk_addr_r} 0 0x4000; \
-    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"
+    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"

buildroot-external/board/hardkernel/patches/README.md

@@ -1,3 +0,0 @@
-# Kernel
-https://github.com/akuster/meta-odroid
-https://github.com/superna9999/linux

buildroot-external/board/hardkernel/patches/linux/0001-exynos5422-odroidhc1.dts-fix-booting-from-mmc.patch

@@ -1,72 +0,0 @@
-From 7041ca0d550d3a9caed54857365cf504eaeea756 Mon Sep 17 00:00:00 2001
-From: Armin Kuster <akuster@mvista.com>
-Date: Fri, 23 Mar 2018 09:02:44 -0700
-Subject: [PATCH] exynos5422-odroidhc1.dts: fix booting from mmc
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
----
- arch/arm/boot/dts/exynos5422-odroidhc1.dts | 37 ++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
-index fb8e8ae..c7adecf 100644
---- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts
-+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
-@@ -11,6 +11,7 @@
- */
- 
- /dts-v1/;
-+#include <dt-bindings/input/input.h>
- #include "exynos5422-odroid-core.dtsi"
- 
- / {
-@@ -30,6 +31,14 @@
- 		};
- 	};
- 
-+        emmc_pwrseq: pwrseq {
-+                pinctrl-0 = <&emmc_nrst_pin>;
-+                pinctrl-names = "default";
-+                compatible = "mmc-pwrseq-emmc";
-+                reset-gpios = <&gpd1 0 GPIO_ACTIVE_LOW>;
-+        };
-+
-+
- 	thermal-zones {
- 		cpu0_thermal: cpu0-thermal {
- 			thermal-sensors = <&tmu_cpu0 0>;
-@@ -211,3 +220,31 @@
- &usbdrd_dwc3_1 {
- 	dr_mode = "host";
- };
-+
-+&mmc_0 {
-+        status = "okay";
-+        mmc-pwrseq = <&emmc_pwrseq>;
-+        card-detect-delay = <200>;
-+        samsung,dw-mshc-ciu-div = <3>;
-+        samsung,dw-mshc-sdr-timing = <0 4>;
-+        samsung,dw-mshc-ddr-timing = <0 2>;
-+        samsung,dw-mshc-hs400-timing = <0 2>;
-+        samsung,read-strobe-delay = <90>;
-+        pinctrl-names = "default";
-+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd &sd0_rclk>;
-+        bus-width = <8>;
-+        cap-mmc-highspeed;
-+        mmc-hs200-1_8v;
-+        mmc-hs400-1_8v;
-+        vmmc-supply = <&ldo18_reg>;
-+        vqmmc-supply = <&ldo3_reg>;
-+};
-+
-+&pinctrl_1 {
-+        emmc_nrst_pin: emmc-nrst {
-+                samsung,pins = "gpd1-0";
-+                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
-+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-+                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
-+        };
-+};
--- 
-2.7.4
-

buildroot-external/board/hardkernel/patches/linux/0002-dwc3-add-parkmode_disable_ss_quirk-for-G12A.patch

@@ -1,106 +0,0 @@
-From c669757a7564c19d042bc5ac18199bb6f3f4e928 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Fri, 27 Sep 2019 15:16:38 +0200
-Subject: [PATCH 1/1] dwc3: add parkmode_disable_ss_quirk for G12A
-
-Could you validate this fixes the following issue ?
-[  221.141621] xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command.
-[  221.157631] xhci-hcd xhci-hcd.0.auto: Host halt failed, -110
-[  221.157635] xhci-hcd xhci-hcd.0.auto: xHCI host controller not responding, assume dead
-[  221.159901] xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command.
-[  221.159961] hub 2-1.1:1.0: hub_ext_port_status failed (err = -22)
-[  221.160076] xhci-hcd xhci-hcd.0.auto: HC died; cleaning up
-[  221.165946] usb 2-1.1-port1: cannot reset (err = -22)
-
-Cc: Tim <elatllat@gmail.com>
-CC: Dongjin Kim <tobetter@gmail.com>
-Cc: Jianxin Pan <jianxin.pan@amlogic.com>
-CC: linux-amlogic@lists.infradead.org
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- Documentation/devicetree/bindings/usb/dwc3.txt    | 2 ++
- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
- drivers/usb/dwc3/core.c                           | 5 +++++
- drivers/usb/dwc3/core.h                           | 4 ++++
- 4 files changed, 12 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
-index 66780a47ad85..c977a3ba2f35 100644
---- a/Documentation/devicetree/bindings/usb/dwc3.txt
-+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
-@@ -75,6 +75,8 @@ Optional properties:
- 			from P0 to P1/P2/P3 without delay.
-  - snps,dis-tx-ipgap-linecheck-quirk: when set, disable u2mac linestate check
- 			during HS transmit.
-+ - snps,parkmode-disable-ss-quirk: when set, all SuperSpeed bus instances in
-+			park mode are disabled.
-  - snps,dis_metastability_quirk: when set, disable metastability workaround.
- 			CAUTION: use only if you are absolutely sure of it.
-  - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 852cf9cf121b..139f24975c0e 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-@@ -2401,6 +2401,7 @@
- 				dr_mode = "host";
- 				snps,dis_u2_susphy_quirk;
- 				snps,quirk-frame-length-adjustment;
-+				snps,parkmode-disable-ss-quirk;
- 			};
- 		};
- 
-diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
-index c9bb93a2c81e..f64dba17a50d 100644
---- a/drivers/usb/dwc3/core.c
-+++ b/drivers/usb/dwc3/core.c
-@@ -983,6 +983,9 @@ static int dwc3_core_init(struct dwc3 *dwc)
- 		if (dwc->dis_tx_ipgap_linecheck_quirk)
- 			reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS;
- 
-+		if (dwc->parkmode_disable_ss_quirk)
-+			reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
-+
- 		dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);
- 	}
- 
-@@ -1294,6 +1297,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
- 				"snps,dis-del-phy-power-chg-quirk");
- 	dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev,
- 				"snps,dis-tx-ipgap-linecheck-quirk");
-+	dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,
-+				"snps,parkmode-disable-ss-quirk");
- 
- 	dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,
- 				"snps,tx_de_emphasis_quirk");
-diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
-index 3dd783b889cb..ab071163b3b8 100644
---- a/drivers/usb/dwc3/core.h
-+++ b/drivers/usb/dwc3/core.h
-@@ -249,6 +249,7 @@
- #define DWC3_GUCTL_HSTINAUTORETRY	BIT(14)
- 
- /* Global User Control 1 Register */
-+#define DWC3_GUCTL1_PARKMODE_DISABLE_SS	BIT(17)
- #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS	BIT(28)
- #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW	BIT(24)
- 
-@@ -1022,6 +1023,8 @@ struct dwc3_scratchpad_array {
-  *			change quirk.
-  * @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate
-  *			check during HS transmit.
-+ * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed
-+ *			instances in park mode.
-  * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
-  * @tx_de_emphasis: Tx de-emphasis value
-  * 	0	- -6dB de-emphasis
-@@ -1211,6 +1214,7 @@ struct dwc3 {
- 	unsigned		dis_u2_freeclk_exists_quirk:1;
- 	unsigned		dis_del_phy_power_chg_quirk:1;
- 	unsigned		dis_tx_ipgap_linecheck_quirk:1;
-+	unsigned		parkmode_disable_ss_quirk:1;
- 
- 	unsigned		tx_de_emphasis_quirk:1;
- 	unsigned		tx_de_emphasis:2;
--- 
-2.17.1
-

buildroot-external/board/hardkernel/patches/linux/0003-mali_odroid-xu.patch

@@ -1,92 +0,0 @@
-ARM: dts: exynos5420: add mali dt bindings and enable mali on Odroid XU3/4
-
-Signed-off-by: memeka <mihailescu2m@gmail.com>
-
-https://github.com/hardkernel/linux/commit/27f16b364e195daefdb8839344c02870ceaf48f2#diff-80dd4bb1cf404a3774bbe37bcfe945c2
-
-Upstream-Status: Backport
-
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: kernel-source/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
-===================================================================
---- kernel-source.orig/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
-+++ kernel-source/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
-@@ -417,6 +417,11 @@
- 	vtmu-supply = <&ldo7_reg>;
- };
- 
-+&mali {
-+	mali-supply = <&buck4_reg>;
-+	status = "okay";
-+};
-+
- &rtc {
- 	status = "okay";
- 	clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
-Index: kernel-source/arch/arm/boot/dts/exynos5420.dtsi
-===================================================================
---- kernel-source.orig/arch/arm/boot/dts/exynos5420.dtsi
-+++ kernel-source/arch/arm/boot/dts/exynos5420.dtsi
-@@ -1317,6 +1317,61 @@
- 		};
- 	};
- 
-+	mali: mali@11800000 {
-+		compatible = "samsung,exynos5422-mali", "arm,malit6xx", "arm,mali-midgard";
-+		reg = <0x11800000 0x5000>;
-+		interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+		interrupt-names = "JOB", "MMU", "GPU";
-+
-+		clocks = <&clock CLK_FOUT_VPLL>, <&clock CLK_DOUT_ACLK_G3D>, <&clock CLK_G3D>;
-+		clock-names = "fout_vpll", "dout_aclk_g3d", "clk_mali";
-+
-+		operating-points-v2 = <&gpu_opp_table>;
-+
-+		status = "disabled";
-+
-+		power_model@0 {
-+			compatible = "arm,mali-simple-power-model";
-+			static-coefficient = <2427750>;
-+			dynamic-coefficient = <4687>;
-+			ts = <20000 2000 (-20) 2>;
-+			thermal-zone = "gpu-thermal";
-+		};
-+	};
-+
-+	gpu_opp_table: opp_table0 {
-+		compatible = "operating-points-v2";
-+
-+		opp@600000000 {
-+			opp-hz = /bits/ 64 <600000000>;
-+			opp-microvolt = <1150000>;
-+		};
-+		opp@543000000 {
-+			opp-hz = /bits/ 64 <543000000>;
-+			opp-microvolt = <1037500>;
-+		};
-+		opp@480000000 {
-+			opp-hz = /bits/ 64 <480000000>;
-+			opp-microvolt = <1000000>;
-+		};
-+		opp@420000000 {
-+			opp-hz = /bits/ 64 <420000000>;
-+			opp-microvolt = <962500>;
-+		};
-+		opp@350000000 {
-+			opp-hz = /bits/ 64 <350000000>;
-+			opp-microvolt = <912500>;
-+		};
-+		opp@266000000 {
-+			opp-hz = /bits/ 64 <266000000>;
-+			opp-microvolt = <862500>;
-+		};
-+		opp@177000000 {
-+			opp-hz = /bits/ 64 <177000000>;
-+			opp-microvolt = <812500>;
-+		};
-+	};
-+
- 	thermal-zones {
- 		cpu0_thermal: cpu0-thermal {
- 			thermal-sensors = <&tmu_cpu0>;

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

@@ -3,6 +3,8 @@ CONFIG_EFI_STUB=y
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+
 CONFIG_IGB=y
 
 CONFIG_IWLWIFI=m

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

@@ -1,30 +1,17 @@
 CONFIG_EFI_STUB=y
 
-CONFIG_VMXNET3=y
-CONFIG_VMWARE_PVSCSI=y
-CONFIG_VMWARE_VMCI_VSOCKETS=y
-CONFIG_VMWARE_VMCI=y
-CONFIG_VMWARE_BALLOON=y
-CONFIG_VMWARE_PVSCSI=y
-
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_MMIO=y
-CONFIG_SCSI_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y
 
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_VIRT_DRIVERS=y
 CONFIG_XEN=y
 
 CONFIG_HYPERVISOR_GUEST=y
@@ -34,5 +21,4 @@ CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV_STORAGE=y
 CONFIG_HYPERV_NET=y
-CONFIG_HYPERV_VSOCKETS=m
 CONFIG_FB_HYPERV=y

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

@@ -0,0 +1,25 @@
+#!/bin/bash
+# shellcheck disable=SC2155
+
+function hassos_pre_image() {
+    local BOOT_DATA="$(path_boot_dir)"
+    local SPL="${BINARIES_DIR}/sunxi-spl.bin"
+    local UBOOT="${BINARIES_DIR}/u-boot.itb"
+    local spl_img="$(path_spl_img)"
+
+    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
+    cp "${BINARIES_DIR}/sun50i-h5-orangepi-prime.dtb" "${BOOT_DATA}/sun50i-h5-orangepi-prime.dtb"
+    cp "${BOARD_DIR}/config.txt" "${BOOT_DATA}/config.txt"
+    touch "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${SPL}" of="${spl_img}" conv=notrunc bs=512 seek=16
+    dd if="${UBOOT}" of="${spl_img}" conv=notrunc bs=512 seek=80
+}
+
+
+function hassos_post_image() {
+    convert_disk_image_gz
+}

buildroot-external/board/orangepi/kernel.config

@@ -0,0 +1,3 @@
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+

buildroot-external/board/orangepi/patches/README.md

@@ -0,0 +1,5 @@
+## Kernel
+https://github.com/armbian/build/tree/master/patch/kernel/sunxi-next
+
+## u-boot
+https://github.com/armbian/build/tree/master/patch/u-boot/u-boot-sunxi

buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch

@@ -0,0 +1,41 @@
+From 55d3cc28b37000d1a3d7224c0ba4a808274e0b33 Mon Sep 17 00:00:00 2001
+From: Icenowy Zheng <icenowy@aosc.io>
+Date: Fri, 27 Oct 2017 17:25:00 +0800
+Subject: [PATCH 20/20] sunxi: call fdt_fixup_ethernet again to set macaddr for
+ more aliases
+
+Sometimes some ethernet aliases do not exist in U-Boot FDT but they
+exist in the FDT used to boot the system. In this situation
+setup_environment is called again in ft_board_setup to generate macaddr
+environment variable for them. However now the call to
+fdt_fixup_ethernet is moved before the call of ft_board_setup.
+
+Call fdt_fixup_ethernet again to add MAC addresses for the extra
+ethernet aliases.
+
+Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
+---
+ board/sunxi/board.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/board/sunxi/board.c b/board/sunxi/board.c
+index 192cf8ca45..0fe70f47cb 100644
+--- a/board/sunxi/board.c
++++ b/board/sunxi/board.c
+@@ -751,10 +751,12 @@ int ft_board_setup(void *blob, bd_t *bd)
+	int __maybe_unused r;
+
+	/*
+-	 * Call setup_environment again in case the boot fdt has
+-	 * ethernet aliases the u-boot copy does not have.
++	 * Call setup_environment and fdt_fixup_ethernet again
++	 * in case the boot fdt has ethernet aliases the u-boot
++	 * copy does not have.
+	 */
+	setup_environment(blob);
++	fdt_fixup_ethernet(blob);
+
+ #ifdef CONFIG_VIDEO_DT_SIMPLEFB
+	r = sunxi_simplefb_setup(blob);
+--
+2.13.6

buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch

@@ -0,0 +1,19 @@
+diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
+index 92c9d06054..cd16d69e30 100644
+--- a/drivers/video/sunxi/sunxi_display.c
++++ b/drivers/video/sunxi/sunxi_display.c
+@@ -1274,8 +1274,12 @@ void *video_hw_init(void)
+		ret = sunxi_hdmi_hpd_detect(hpd_delay);
+		if (ret) {
+			printf("HDMI connected: ");
+-			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0)
+-				mode = &custom;
++			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) {
++				if ((custom.xres <= 1920) && (custom.yres <= 1080))
++					mode = &custom;
++				else
++					mode = &res_mode_init[RES_MODE_1920x1080];
++			}
+		} else if (hpd) {
+			sunxi_hdmi_shutdown();
+			sunxi_display.monitor = sunxi_get_default_mon(false);

buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch

@@ -0,0 +1,13 @@
+diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
+index 103936d772..990cf2a8c0 100644
+--- a/configs/orangepi_prime_defconfig
++++ b/configs/orangepi_prime_defconfig
+@@ -1,7 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_SUNXI=y
+ CONFIG_MACH_SUN50I_H5=y
+-CONFIG_DRAM_CLK=672
++CONFIG_DRAM_CLK=624
+ CONFIG_DRAM_ZQ=3881977
+ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch

@@ -0,0 +1,27 @@
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index 64a190059a..bbec551cac 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
+@@ -503,6 +503,12 @@ extern int soft_i2c_gpio_scl;
+ #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+ #endif
+
++#ifdef CONFIG_MACH_SUN8I_H3
++#define INITRD_HIGH_ENV "initrd_high=0xFFFFFFFF\0"
++#else
++#define INITRD_HIGH_ENV
++#endif
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+	CONSOLE_ENV_SETTINGS \
+	MEM_LAYOUT_ENV_SETTINGS \
+@@ -512,7 +518,8 @@ extern int soft_i2c_gpio_scl;
+	SUNXI_MTDIDS_DEFAULT \
+	SUNXI_MTDPARTS_DEFAULT \
+	BOOTCMD_SUNXI_COMPAT \
+-	BOOTENV
++	BOOTENV \
++	INITRD_HIGH_ENV
+
+ #else /* ifndef CONFIG_SPL_BUILD */
+ #define CONFIG_EXTRA_ENV_SETTINGS

buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 0ed36cded..822ebb812 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -578,6 +578,8 @@ config ARCH_SUNXI
+	select CMD_GPIO
+	select CMD_MMC if MMC
+	select CMD_USB if DISTRO_DEFAULTS
++	select OF_LIBFDT
++	select OF_LIBFDT_OVERLAY
+	select DM
+	select DM_ETH
+	select DM_GPIO

buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch

@@ -0,0 +1,24 @@
+diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
+index 7ac8360..0484e7a 100644
+--- a/arch/arm/mach-sunxi/board.c
++++ b/arch/arm/mach-sunxi/board.c
+@@ -23,6 +23,7 @@
+ #include <asm/arch/timer.h>
+ #include <asm/arch/tzpc.h>
+ #include <asm/arch/mmc.h>
++#include <asm/arch/prcm.h>
+
+ #include <linux/compiler.h>
+
+@@ -65,6 +66,11 @@ struct mm_region *mem_map = sunxi_mem_map;
+
+ static int gpio_init(void)
+ {
++#if defined(CONFIG_MACH_SUNXI_H3_H5)
++	/* enable R_PIO GPIO access */
++	prcm_apb0_enable(PRCM_APB0_GATE_PIO);
++#endif
++
+ #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F)
+ #if defined(CONFIG_MACH_SUN4I) || \
+     defined(CONFIG_MACH_SUN7I) || \

buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch

@@ -0,0 +1,23 @@
+diff --git a/cmd/fdt.c b/cmd/fdt.c
+index d7654b2c4f..a71b7713a8 100644
+--- a/cmd/fdt.c
++++ b/cmd/fdt.c
+@@ -17,6 +17,7 @@
+ #include <fdt_support.h>
+ #include <mapmem.h>
+ #include <asm/io.h>
++#include <asm/unaligned.h>
+
+ #define MAX_LEVEL	32		/* how deeply nested we will go */
+ #define SCRATCHPAD	1024		/* bytes of scratchpad memory */
+@@ -781,7 +782,10 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
+			cp = newp;
+			tmp = simple_strtoul(cp, &newp, 0);
+			if (*cp != '?')
+-				*(fdt32_t *)data = cpu_to_fdt32(tmp);
++			{
++				tmp = cpu_to_fdt32(tmp);
++				put_unaligned(tmp, (fdt32_t *)data);
++			}
+			else
+				newp++;

buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch

@@ -0,0 +1,32 @@
+From 7f5071f906f79bdc99d6b4b0ccf0cb280abe740b Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman <megous@megous.com>
+Date: Tue, 20 Dec 2016 11:25:12 +0100
+Subject: [PATCH] sunxi: h3: Fix PLL1 setup to never use dividers
+
+Kernel would lower the divider on first CLK change and cause the
+lock up.
+---
+ arch/arm/mach-sunxi/clock_sun6i.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
+index 50fb302a19..91aa2a0478 100644
+--- a/arch/arm/mach-sunxi/clock_sun6i.c
++++ b/arch/arm/mach-sunxi/clock_sun6i.c
+@@ -94,11 +94,10 @@ void clock_set_pll1(unsigned int clk)
+	int k = 1;
+	int m = 1;
+
+-	if (clk > 1152000000) {
+-		k = 2;
+-	} else if (clk > 768000000) {
++	if (clk >= 1368000000) {
+		k = 3;
+-		m = 2;
++	} else if (clk >= 768000000) {
++		k = 2;
+	}
+
+	/* Switch to 24MHz clock while changing PLL1 */
+--
+2.11.0

buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch

@@ -0,0 +1,16 @@
+diff --git a/board/sunxi/board.c b/board/sunxi/board.c
+index 3cf3614..89cf7f5 100644
+--- a/board/sunxi/board.c
++++ b/board/sunxi/board.c
+@@ -478,6 +478,11 @@ void sunxi_board_init(void)
+	int power_failed = 0;
+	unsigned long ramsize;
+
++#ifdef CONFIG_MACH_SUN8I_H3
++	/* turn on power LED (PL10) on H3 boards */
++	gpio_direction_output(SUNXI_GPL(10), 1);
++#endif
++
+ #ifdef CONFIG_SY8106A_POWER
+	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
+ #endif

buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch

@@ -0,0 +1,42 @@
+diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
+index 15272c9..cedddc2 100644
+--- a/arch/arm/mach-sunxi/clock_sun6i.c
++++ b/arch/arm/mach-sunxi/clock_sun6i.c
+@@ -117,8 +117,8 @@ void clock_set_pll1(unsigned int clk)
+	sdelay(200);
+
+	/* Switch CPU to PLL1 */
+-	writel(AXI_DIV_3 << AXI_DIV_SHIFT |
+-	       ATB_DIV_2 << ATB_DIV_SHIFT |
++	writel(AXI_DIV_4 << AXI_DIV_SHIFT |
++	       ATB_DIV_4 << ATB_DIV_SHIFT |
+	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
+	       &ccm->cpu_axi_cfg);
+ }
+diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+index f2990db..b3a8575 100644
+--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
++++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+@@ -180,6 +180,7 @@ struct sunxi_ccm_reg {
+ #define CCM_PLL1_CTRL_N(n)		((((n) - 1) & 0x1f) << 8)
+ #define CCM_PLL1_CTRL_P(n)		(((n) & 0x3) << 16)
+ #define CCM_PLL1_CTRL_EN		(0x1 << 31)
++#define CCM_PLL1_CTRL_LOCK		(0x1 << 28)
+
+ #define CCM_PLL3_CTRL_M_SHIFT		0
+ #define CCM_PLL3_CTRL_M_MASK		(0xf << CCM_PLL3_CTRL_M_SHIFT)
+diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
+index cedddc2..3fe9305 100644
+--- a/arch/arm/mach-sunxi/clock_sun6i.c
++++ b/arch/arm/mach-sunxi/clock_sun6i.c
+@@ -114,7 +114,9 @@ void clock_set_pll1(unsigned int clk)
+	writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_P(p) |
+	       CCM_PLL1_CTRL_N(clk / (24000000 * k / m)) |
+	       CCM_PLL1_CTRL_K(k) | CCM_PLL1_CTRL_M(m), &ccm->pll1_cfg);
+-	sdelay(200);
++
++	while (!(readl(&ccm->pll1_cfg) & CCM_PLL1_CTRL_LOCK))
++		;
+
+	/* Switch CPU to PLL1 */
+	writel(AXI_DIV_4 << AXI_DIV_SHIFT |

buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled

@@ -0,0 +1,13 @@
+diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
+index 2309f59999..716e9c5e26 100644
+--- a/arch/arm/mach-sunxi/Kconfig
++++ b/arch/arm/mach-sunxi/Kconfig
+@@ -278,7 +278,7 @@ config DRAM_CLK
+	default 312 if MACH_SUN6I || MACH_SUN8I
+	default 360 if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || \
+		       MACH_SUN8I_V3S
+-	default 672 if MACH_SUN50I
++	default 648 if MACH_SUN50I || MACH_SUN50I_H5
+	---help---
+	Set the dram clock speed, valid range 240 - 480 (prior to sun9i),
+	must be a multiple of 24. For the sun9i (A80), the tested values

buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch

@@ -0,0 +1,11 @@
+diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
+index a4c3fb69e..47ce2e9e6 100644
+--- a/include/configs/sun8i.h
++++ b/include/configs/sun8i.h
+@@ -30,4 +30,6 @@
+  */
+ #include <configs/sunxi-common.h>
+
++#define CONFIG_MACH_TYPE	(0x1029)
++
+ #endif /* __CONFIG_H */

buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch

@@ -0,0 +1,62 @@
+diff --git a/cmd/Kconfig b/cmd/Kconfig
+index d6d130edfa..92795119ea 100644
+--- a/cmd/Kconfig
++++ b/cmd/Kconfig
+@@ -1029,6 +1029,7 @@ menu "Misc commands"
+ config CMD_BMP
+	bool "Enable 'bmp' command"
+	depends on LCD || DM_VIDEO || VIDEO
++	default y
+	help
+	  This provides a way to obtain information about a BMP-format iamge
+	  and to display it. BMP (which presumably stands for BitMaP) is a
+diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
+index 9ed6b9892c..75d5176edf 100644
+--- a/include/config_distro_bootcmd.h
++++ b/include/config_distro_bootcmd.h
+@@ -323,6 +323,15 @@
+	BOOTENV_SHARED_UBIFS \
+	BOOTENV_SHARED_EFI \
+	"boot_prefixes=/ /boot/\0" \
++	"splashpos=m,m\0" \
++	"splashimage=66000000\0" \
++	"loadsplash= " \
++		"for prefix in ${boot_prefixes}; do " \
++			"if test -e mmc 0 ${prefix}boot.bmp; then " \
++				"load mmc 0 ${splashimage} ${prefix}boot.bmp; " \
++				"bmp d ${splashimage}; " \
++			"fi; " \
++		"done\0" \
+	"boot_scripts=boot.scr.uimg boot.scr\0" \
+	"boot_script_dhcp=boot.scr.uimg\0" \
+	BOOTENV_BOOT_TARGETS \
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index 02d7be0849..cbdea20d08 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
+@@ -284,6 +284,16 @@ extern int soft_i2c_gpio_scl;
+
+ #endif /* CONFIG_VIDEO */
+
++#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
++#define CONFIG_VIDEO_LOGO
++#define CONFIG_SPLASH_SCREEN
++#define CONFIG_SPLASH_SCREEN_ALIGN
++#define CONFIG_BMP_16BPP
++#define CONFIG_BMP_24BPP
++#define CONFIG_BMP_32BPP
++#define CONFIG_VIDEO_BMP_RLE8
++#endif
++
+ /* Ethernet support */
+ #ifdef CONFIG_SUNXI_EMAC
+ #define CONFIG_PHY_ADDR		1
+@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl;
+
+ #ifdef CONFIG_USB_KEYBOARD
+ #define CONSOLE_STDIN_SETTINGS \
+-	"preboot=usb start\0" \
++	"preboot=run loadsplash; usb start\0" \
+	"stdin=serial,usbkbd\0"
+ #else
+ #define CONSOLE_STDIN_SETTINGS \

buildroot-external/board/orangepi/prime/config.txt

@@ -0,0 +1,3 @@
+i2c0_enable=true
+i2c1_enable=false
+i2c2_enable=false

buildroot-external/board/orangepi/prime/meta

@@ -0,0 +1,7 @@
+BOARD_ID=opi-prime
+BOARD_NAME="Orange Pi Prime"
+CHASSIS=embedded
+BOOTLOADER=uboot
+KERNEL_FILE=Image
+BOOT_SYS=spl
+BOOT_ENV_SIZE=0x8000

buildroot-external/board/orangepi/prime/uboot-boot.ush

@@ -1,57 +1,51 @@
 
-###########################################
-
-part start mmc ${devnum} 9 mmc_env
+part start mmc ${devnum} 6 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;"
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
+    env import -c ${ramdisk_addr_r} 0x8000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
+    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
+# HassOS bootargs
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory rootwait"
+
+# HassOS system A/B
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+
+# Load extraargs
+fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
+
+# Load device tree
+fatload mmc ${devnum}:1 ${fdt_addr_r} sun50i-h5-orangepi-prime.dtb
+fdt addr ${fdt_addr_r}
+
 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}"
+if test "${i2c0_enable}" != "false"; then
+  fdt set /soc/i2c@1c2ac00 status "okay"
+fi
 
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
+if test "${i2c1_enable}" != "false"; then
+  fdt set /soc/i2c@1c2b000 status "okay"
+fi
 
-# 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"
+if test "${i2c2_enable}" != "false"; then
+  fdt set /soc/i2c@1c2b400 status "okay"
+fi
 
-usb start
-
-# Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
-#fdt addr ${fdt_addr_r}
-
-# 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
@@ -60,15 +54,15 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       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}"
+      setenv load_kernel "ext4load mmc ${devnum}:2 ${kernel_addr_r} Image"
+      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 "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}"
+      setenv load_kernel "ext4load mmc ${devnum}:4 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done

buildroot-external/board/orangepi/prime/uboot.config

@@ -1,6 +1,6 @@
 # CONFIG_USB_STORAGE is not set
-CONFIG_DOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
+# CONFIG_DOS_PARTITIONcs not set
+CONFIG_EFI_PARTITION is not set
 CONFIG_USB=y
 CONFIG_CMD_USB=y
 CONFIG_DM_USB=y

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

@@ -7,28 +7,20 @@ function hassos_pre_image() {
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/u-boot.bin" \
         "${BINARIES_DIR}/boot.scr"
-    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
-    cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
-    cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
-
-    # Firmware
-    if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
-        cp -t "${BOOT_DATA}" \
-        "${BINARIES_DIR}/rpi-firmware/fixup4.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start4.elf"
-    else
-        cp -t "${BOOT_DATA}" \
+    cp -t "${BOOT_DATA}" \
+        "${BINARIES_DIR}"/*.dtb \
+        "${BINARIES_DIR}/rpi-firmware/bootcode.bin" \
         "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start.elf" \
-        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
-    fi
+        "${BINARIES_DIR}/rpi-firmware/start.elf"
+    cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
+    cp -f "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
 
     # Set cmd options
     echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
 
     # Enable 64bit support
-    if [[ "${BOARD_ID}" =~ "64" ]]; then
-        sed -i "s|#arm_64bit|arm_64bit|g" "${BOOT_DATA}/config.txt"
+    if [ "${BOARD_ID}" == "rpi3-64" ]; then
+        echo "arm_64bit=1" >> "${BOOT_DATA}/config.txt"
     fi
 }
 

buildroot-external/board/raspberrypi/kernel.config

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

buildroot-external/board/raspberrypi/patches/uboot/0001-raspberrypi-Disable-simple-framebuffer-support.patch

@@ -1,62 +0,0 @@
-From 68e65b1e3859d4baf41d1e5f6525ff7ace778ba1 Mon Sep 17 00:00:00 2001
-From: Florin Sarbu <florin@balena.io>
-Date: Thu, 12 Sep 2019 12:31:31 +0200
-Subject: [PATCH] raspberrypi: Disable simple framebuffer support
-
-On 4.19 kernels this u-boot driver clashes with bcm2708_fb.
-So let's disable it from here so that we have bcm2708_fb
-enabled in the kernel, just as Raspbian users might expect.
-See https://github.com/raspberrypi/linux/issues/3139
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Florin Sarbu <florin@balena.io>
----
- board/raspberrypi/rpi/rpi.c | 2 +-
- common/Makefile             | 2 +-
- include/configs/rpi.h       | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index 153a1fd..c7bd399 100644
---- a/board/raspberrypi/rpi/rpi.c
-+++ b/board/raspberrypi/rpi/rpi.c
-@@ -482,7 +482,7 @@ int ft_board_setup(void *blob, bd_t *bd)
- 	 * should be more intelligent, and e.g. only do this if no enabled DT
- 	 * node exists for the "real" graphics driver.
- 	 */
--	lcd_dt_simplefb_add_node(blob);
-+	//lcd_dt_simplefb_add_node(blob);
- 
- #ifdef CONFIG_EFI_LOADER
- 	/* Reserve the spin table */
-diff --git a/common/Makefile b/common/Makefile
-index 0de60b3..2848d98 100644
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -50,7 +50,7 @@ ifndef CONFIG_DM_VIDEO
- obj-$(CONFIG_LCD) += lcd.o lcd_console.o
- endif
- obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
--obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
-+//obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
- obj-$(CONFIG_LYNXKDI) += lynxkdi.o
- obj-$(CONFIG_MENU) += menu.o
- obj-$(CONFIG_UPDATE_TFTP) += update.o
-diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index a38bf20..e2760b0 100644
---- a/include/configs/rpi.h
-+++ b/include/configs/rpi.h
-@@ -60,8 +60,8 @@
- /* GPIO */
- #define CONFIG_BCM2835_GPIO
- /* LCD */
--#define CONFIG_LCD_DT_SIMPLEFB
--#define CONFIG_VIDEO_BCM2835
-+//#define CONFIG_LCD_DT_SIMPLEFB
-+//#define CONFIG_VIDEO_BCM2835
- 
- #ifdef CONFIG_CMD_USB
- #define CONFIG_TFTP_TSIZE
--- 
-2.7.4
-

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

@@ -1,82 +0,0 @@
-From 0f45c3f2f46b62f767ef225b258f927ad88ca360 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH 1/1] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- configs/rpi_0_w_defconfig   | 2 +-
- configs/rpi_2_defconfig     | 2 +-
- configs/rpi_3_32b_defconfig | 2 +-
- configs/rpi_3_defconfig     | 2 +-
- configs/rpi_defconfig       | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index fe5a7763a6..ed7f9381e9 100644
---- a/configs/rpi_0_w_defconfig
-+++ b/configs/rpi_0_w_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index bf331c0ad0..52e3c3b234 100644
---- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index c2417a0ec9..191962f0f7 100644
---- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 4fa682539c..03a2356d3d 100644
---- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index 2c04b3334e..bf00d8b669 100644
---- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
--- 
-2.17.1
-

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

@@ -1,21 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-	ALIASES=/proc/device-tree/aliases; \
-	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
-		echo 0;\
-	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
-		echo 1; \
-	else \
-		exit 1; \
-	fi\
-'", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-	ALIASES=/proc/device-tree/aliases; \
-	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
-		echo 0; \
-	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
-		echo 1; \
-	else \
-		exit 1; \
-	fi \
-'", SYMLINK+="serial%c"

buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.ush

@@ -1,16 +1,15 @@
 
-part start ${devtype} ${devnum} 6 dev_env
-${devtype} dev ${devnum}
-
+part start mmc ${devnum} 6 mmc_env
+mmc dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${dev_env} 0x20; \
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \
     env import -c ${ramdisk_addr_r} 0x4000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -38,14 +37,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:2 ${kernel_addr_r} Image"
+      setenv load_kernel "ext4load mmc 0:2 ${kernel_addr_r} Image"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_a} rauc.slot=A"
     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 "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:4 ${kernel_addr_r} Image"
+      setenv load_kernel "ext4load mmc 0:4 ${kernel_addr_r} Image"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_b} rauc.slot=B"
     fi
   fi

buildroot-external/board/raspberrypi/rpi4-64/meta

@@ -1,7 +0,0 @@
-BOARD_ID=rpi4-64
-BOARD_NAME="RaspberryPi 4 64bit"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_SYS=hyprid
-BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/rpi4/meta

@@ -1,7 +0,0 @@
-BOARD_ID=rpi4
-BOARD_NAME="RaspberryPi 4"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=zImage
-BOOT_SYS=hyprid
-BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/uboot-boot.ush

@@ -1,16 +1,15 @@
 
-part start ${devtype} ${devnum} 6 dev_env
-${devtype} dev ${devnum}
-
+part start mmc ${devnum} 6 mmc_env
+mmc dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${dev_env} 0x20; \
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \
     env import -c ${ramdisk_addr_r} 0x4000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -38,14 +37,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:2 ${kernel_addr_r} zImage"
+      setenv load_kernel "ext4load mmc 0:2 ${kernel_addr_r} zImage"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_a} rauc.slot=A"
     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 "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:4 ${kernel_addr_r} zImage"
+      setenv load_kernel "ext4load mmc 0:4 ${kernel_addr_r} zImage"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_b} rauc.slot=B"
     fi
   fi

buildroot-external/board/raspberrypi/uboot.config

@@ -1,8 +1,4 @@
+# CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_CMD_FILEENV=y
 CONFIG_ENV_IS_NOWHERE=Y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_FUNCTION_MASS_STORAGE=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_OHCI_HCD=y

buildroot-external/bootloader/uboot.config

@@ -3,7 +3,7 @@ CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_EXPERT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOOTDELAY=-2
+CONFIG_BOOTDELAY=2
 CONFIG_SYS_PROMPT="HassOS> "
 # CONFIG_ISO_PARTITION is not set
 CONFIG_EFI_PARTITION=y
@@ -11,5 +11,6 @@ CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
 # CONFIG_ENV_IS_IN_FAT is not set
 # CONFIG_ENV_IS_IN_EXT4 is not set
+CONFIG_CONSOLE_SCROLL_LINES=10
 # CONFIG_EFI_LOADER is not set
 CONFIG_CMD_SETEXPR=y

buildroot-external/configs/intel_nuc_defconfig

@@ -4,6 +4,7 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -19,16 +20,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.82"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -63,6 +62,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -77,8 +77,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -96,12 +94,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/odroid_c2_defconfig

@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -30,7 +30,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -56,6 +55,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -69,20 +69,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -90,15 +87,14 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -3,8 +3,9 @@ BR2_cortex_a7=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -19,10 +20,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
+#BR2_LINUX_KERNEL_CUSTOM_GIT=y
+#BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git"
+#BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.14.87-153"
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
+#BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -31,13 +36,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -59,6 +61,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,22 +75,19 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -95,12 +95,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/opi_prime_defconfig

@@ -1,9 +1,12 @@
 BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -11,30 +14,50 @@ BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="hassio"
 BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
+BR2_TARGET_GENERIC_GETTY_PORT="tty0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime/uboot-boot.ush"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime/uboot.config"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.13"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime"
+BR2_LINUX_KERNEL_LZ4=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/kernel.config"
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
-BR2_LINUX_KERNEL_LZ4=y
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-odroid-n2"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/hassos-hook.sh"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -48,7 +71,6 @@ BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_WIREGUARD=y
@@ -56,12 +78,12 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_NETWORK=y
-BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
@@ -69,36 +91,24 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
+BR2_PACKAGE_HOST_SWIG=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-n2-homeassistant"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
+BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_HARDKERNEL_BOOT=y
-BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y

buildroot-external/configs/ova_defconfig

@@ -19,16 +19,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.20"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -52,11 +50,11 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_QEMU_GUEST_AGENT=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RNG_TOOLS=y
@@ -67,8 +65,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -86,12 +82,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi0_w_defconfig

@@ -4,8 +4,9 @@ BR2_ARM_EABIHF=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -15,24 +16,23 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="877656cd145497db7c09a7de06ea85db98bd72a3"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,20 +73,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -93,12 +91,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi2_defconfig

@@ -4,8 +4,9 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -15,16 +16,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="877656cd145497db7c09a7de06ea85db98bd72a3"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
@@ -32,7 +33,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -58,6 +58,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -71,20 +72,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -92,12 +90,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_64_defconfig

@@ -4,8 +4,9 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -15,16 +16,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="877656cd145497db7c09a7de06ea85db98bd72a3"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -32,7 +33,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,20 +73,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot-boot.ush"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -93,12 +91,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_defconfig

@@ -4,8 +4,9 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -15,16 +16,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="877656cd145497db7c09a7de06ea85db98bd72a3"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -32,7 +33,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,20 +73,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -93,12 +91,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi4_64_defconfig

@@ -1,107 +0,0 @@
-BR2_aarch64=y
-BR2_cortex_a72=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="/cache/dl"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_7_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
-BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
-BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
-# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
-BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
-BR2_LINUX_KERNEL_LZ4=y
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
-BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_JQ=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_PI4=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
-BR2_PACKAGE_GPTFDISK=y
-BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_LIBDNET=y
-BR2_PACKAGE_LIBCGROUP=y
-BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_DHCP=y
-BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD=y
-BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_CLIENT is not set
-# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_DOCKER_CLI=y
-BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
-BR2_PACKAGE_RNG_TOOLS=y
-# BR2_PACKAGE_SYSTEMD_HWDB is not set
-# BR2_PACKAGE_SYSTEMD_NETWORKD is not set
-BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GPTFDISK=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi4_defconfig

@@ -1,107 +0,0 @@
-BR2_arm=y
-BR2_cortex_a72=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="/cache/dl"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_7_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_BINUTILS_ENABLE_LTO=y
-BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
-BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
-# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
-BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
-BR2_LINUX_KERNEL_LZ4=y
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
-BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_JQ=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
-BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_PI4=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
-BR2_PACKAGE_GPTFDISK=y
-BR2_PACKAGE_GPTFDISK_SGDISK=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_LIBDNET=y
-BR2_PACKAGE_LIBCGROUP=y
-BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_DHCP=y
-BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD=y
-BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_CLIENT is not set
-# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_NETWORK_MANAGER=y
-BR2_PACKAGE_TINI=y
-BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_DOCKER_CLI=y
-BR2_PACKAGE_RAUC=y
-BR2_PACKAGE_RAUC_NETWORK=y
-BR2_PACKAGE_RNG_TOOLS=y
-# BR2_PACKAGE_SYSTEMD_HWDB is not set
-# BR2_PACKAGE_SYSTEMD_NETWORKD is not set
-BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
-BR2_PACKAGE_UTIL_LINUX_PARTX=y
-BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GPTFDISK=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
-BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi_defconfig

@@ -4,8 +4,9 @@ BR2_ARM_EABIHF=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -15,16 +16,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="877656cd145497db7c09a7de06ea85db98bd72a3"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -32,7 +33,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -58,6 +58,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -71,20 +72,17 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -92,12 +90,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/tinker_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.20"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -32,7 +32,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
-BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -59,6 +58,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,8 +72,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -89,7 +87,6 @@ BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -97,12 +94,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="150"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
+BR2_PACKAGE_HASSOS_CLI_VERSION="9"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/kernel/device-support.config

@@ -1,13 +1,9 @@
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_ACM=m
-CONFIG_USB_USBNET=m
 

buildroot-external/kernel/hassos.config

@@ -4,8 +4,6 @@ CONFIG_CMDLINE=""
 CONFIG_ZRAM=y
 CONFIG_ZSMALLOC=y
 
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_BLOCK=y
 CONFIG_EXT4_FS=y
@@ -32,13 +30,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_BTRFS_FS is not set
 
-CONFIG_TUN=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-
-CONFIG_CIFS=m
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-CONFIG_CIFS_DFS_UPCALL=y

buildroot-external/meta

@@ -1,7 +1,7 @@
-VERSION_MAJOR=4
-VERSION_BUILD=0
+VERSION_MAJOR=2
+VERSION_BUILD=11
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

buildroot-external/misc/rauc-hook

@@ -31,5 +31,14 @@ fi
 ##
 # Fixups
 
+# timesyncd
+if [ -L /var/lib/systemd/timesync ]; then
+    rm -f /var/lib/systemd/timesync
+fi
+
+# u-boot first stage device tree
+if [ -e /usr/sbin/fw_setenv ]; then
+    fw_setenv fdt_addr
+fi
 
 exit 0

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+HCIATTACH=/usr/bin/hciattach
+SERIAL=`cat /proc/device-tree/serial-number | cut -c9-`
+B1=`echo $SERIAL | cut -c3-4`
+B2=`echo $SERIAL | cut -c5-6`
+B3=`echo $SERIAL | cut -c7-8`
+BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
+
+if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
+    if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
+        $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
+    else
+		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
+    fi
+else
+    $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+fi

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -11,28 +11,21 @@ BLUETOOTH_BCM43XX_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-bcm43xx
 BLUETOOTH_BCM43XX_SITE_METHOD = local
 
 define BLUETOOTH_BCM43XX_BUILD_CMDS
-	curl -L -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/fff76cb15527c435ce99a9787848eacd6288282c/broadcom/BCM43430A1.hcd
-	curl -L -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/fff76cb15527c435ce99a9787848eacd6288282c/broadcom/BCM4345C0.hcd
-	curl -L -o $(@D)/btuart https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/btuart
-	curl -L -o $(@D)/bthelper https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/bthelper
-	curl -L -o $(@D)/90-pi-bluetooth.rules https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/lib/udev/rules.d/90-pi-bluetooth.rules
+	curl -L -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM43430A1.hcd
+	curl -L -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM4345C0.hcd
 endef
 
 define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
+	$(INSTALL) -m 0755 $(@D)/bluetooth-bcm43xx $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
-	$(INSTALL) -m 0644 $(@D)/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/
 	ln -fs /usr/lib/systemd/system/bluetooth-bcm43xx.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/
 
-	$(INSTALL) -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 0755 $(@D)/btuart $(TARGET_DIR)/usr/bin/
-	$(INSTALL) -m 0755 $(@D)/bthelper $(TARGET_DIR)/usr/bin/
-
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
 	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
 
 	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/90-pi-bluetooth.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
 endef
 
 $(eval $(generic-package))

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.rules

@@ -0,0 +1,22 @@
+KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
+                echo 0;\
+        elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi\
+'", SYMLINK+="serial%c"
+
+KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
+                echo 0; \
+        elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi \
+'", SYMLINK+="serial%c"
+

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Bluetooth for BCM43xx
 Before=bluetooth.service
-Requires=dev-serial1.device
-After=dev-serial1.device
+After=dev-ttyAMA0.device
 ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/btuart
+ExecStart=/usr/sbin/bluetooth-bcm43xx
 
 [Install]
 WantedBy=hassos-hardware.target

buildroot-external/package/bluetooth-bcm43xx/bthelper@.service

@@ -1,8 +0,0 @@
-[Unit]
-Description=Raspberry Pi bluetooth helper
-Requires=bluetooth.service
-After=bluetooth.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/bthelper %I