Merge pull request #589 from home-assistant/dev

Release 4.3

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+<!-- READ THIS FIRST:
+- If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
+- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/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: ha su logs
+-->
+
+**Journal logs:**
+<!--
+- use this command: journalctl
+-->
+
+**Kernel logs:**
+<!--
+- use this command: dmesg
+-->
+
+**Description of problem:**

Documentation/bluetooth.md

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

Documentation/boards/hardkernel/odroid-n2.md

@@ -0,0 +1,14 @@
+# 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/orangepi.md

@@ -1,20 +0,0 @@
-# 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/build.md

@@ -1,21 +0,0 @@
-# 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,7 +3,7 @@
 ## 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`. 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` (in all capitals). Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
 
 ```text
 network/
@@ -19,12 +19,12 @@ hassos-xy.raucb
 - 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 `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant].
 - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
 
-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.
+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.*
 
 ## Local
 
@@ -57,4 +57,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
 [network.md]: network.md
 [hassos-release]: https://github.com/home-assistant/hassos/releases/
-[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
+[debug-homeassistant]: https://developers.home-assistant.io/docs/en/hassio_debugging.html

Documentation/development.md

@@ -5,7 +5,6 @@
 `BOOT_SYS`:
 - efi
 - hyprid
-- spl
 - mbr
 
 HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
@@ -13,6 +12,12 @@ boot drive. Is that not possible, you can use MBR for your device, they work als
 
 Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
 
+`BOOT_SPL`:
+- true
+- false
+
+Enable SPL update handling.
+
 `BOOTLOADER`:
 - uboot
 - barebox

Documentation/getting_started_development.md

@@ -101,6 +101,6 @@ $ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive
 
 This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
 
-After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
+After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS.
 
 Happy hacking! :)

Documentation/kernel.md

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

Documentation/network.md

@@ -1,5 +1,6 @@
 # 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
@@ -74,10 +75,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 comma is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
+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.
 
 ## Tips
 
@@ -105,12 +106,12 @@ powersave=0
 Log into the HASSOS base system via a console:
 
 ```
-Welcome to HassOS
-Hassio login:
+Welcome to Home Assistant
+homeassistant login:
 ```
 Login as `root` (no password needed)
 
-At the `hassio >` prompt, type `login` (as instructed).
+At the `ha >` prompt, type `login` (as instructed).
 
 From here you will use the `nmcli` configuration tool.
 

README.md

@@ -7,9 +7,9 @@ Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for D
 
 - Barebox as bootloader on EFI
 - U-Boot as bootloader on IoT
+- Linux/Buildroot LTS
 - RAUC for OTA updates
 - SquashFS LZ4 as filesystem
-- Docker 18.09.0
+- Docker-CE
 - AppArmor protected
 - ZRAM LZ4 for /tmp, /var, swap
-- Run every supervisor

azure-pipelines-ci.yml

@@ -10,9 +10,9 @@ pr:
 
 variables:
   - name: versionHadolint
-    value: 'v1.16.3'
+    value: 'v1.17.2'
   - name: versionShellCheck
-    value: 'v0.6.0'
+    value: 'v0.7.0'
 
 jobs:
 

azure-pipelines-release.yml

@@ -11,9 +11,9 @@ pr: none
 
 variables:
   - name: versionGHR
-    value: 'v0.12.1'
+    value: 'v0.13.0'
   - group: github
-  - group: hassos
+  - group: rauc
 
 jobs:
 
@@ -46,10 +46,10 @@ jobs:
         board: 'intel_nuc'
       OdroidC2:
         board: 'odroid_c2'
+      OdroidN2:
+        board: 'odroid_n2'
       OdroidXU4:
         board: 'odroid_xu4'
-      OrangePiPrime:
-        board: 'opi_prime'
       RaspberryPi:
         board: 'rpi'
       RaspberryPi0-W:

buildroot-external/board/asus/tinker/meta

@@ -3,5 +3,6 @@ BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=spl
+BOOT_SYS=hyprid
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x8000

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

@@ -1,5 +1,3 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_DM_VIDEO=y
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y

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=true
 #hpd=false
+hpd=true
 
 # 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/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=mbr
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x2000

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

@@ -1,50 +0,0 @@
-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 "${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}"
+setenv bootargs_odroidc2 "no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}"
 
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
@@ -38,7 +38,6 @@ usb start
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb
-#fdt addr ${fdt_addr_r}
 
 # logical volumes get numbered after physical ones.
 # 1. boot

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

@@ -1,8 +1,6 @@
-# CONFIG_USB_STORAGE is not set
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_USB_STORAGE is not set
 CONFIG_USB=y
 CONFIG_CMD_USB=y
 CONFIG_DM_USB=y
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y

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

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

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

@@ -0,0 +1,25 @@
+#!/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

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

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

@@ -1,51 +1,56 @@
 
-part start mmc ${devnum} 6 mmc_env
+###########################################
+
+part start mmc ${devnum} 9 mmc_env
 mmc dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
-    env import -c ${ramdisk_addr_r} 0x8000;"
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
+    env import -c ${ramdisk_addr_r} 0x2000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
-    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"
+    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"
 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
 
-if test "${i2c0_enable}" != "false"; then
-  fdt set /soc/i2c@1c2ac00 status "okay"
-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 "${i2c1_enable}" != "false"; then
-  fdt set /soc/i2c@1c2b000 status "okay"
-fi
+# HassOS bootargs
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
 
-if test "${i2c2_enable}" != "false"; then
-  fdt set /soc/i2c@1c2b400 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"
 
+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
+
+# 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
@@ -54,15 +59,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}:2 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
+      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_a} rauc.slot=A ${cmdline}"
     fi
   elif test "x${BOOT_SLOT}" = "xB"; then
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:4 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
+      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
+      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_b} rauc.slot=B ${cmdline}"
     fi
   fi
 done

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

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

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

@@ -1,7 +1,6 @@
 
 macaddr=00:1e:06:61:7a:39
 vout=hdmi
-vout=hdmi
 # - DVI Mode (disables sound over HDMI as per DVI compat)
 # vout=dvi
 
@@ -16,7 +15,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,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=mbr
+BOOT_SPL=true
 BOOT_ENV_SIZE=0x4000

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

@@ -1,13 +0,0 @@
-diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
-index d0ae8c5315048..3ccf2c5be034c 100755
---- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
-+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
-@@ -402,7 +402,7 @@
- 	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>;
-+	samsung,read-strobe-delay = <150>;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd &sd0_rclk>;
- 	bus-width = <8>;

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

@@ -7,14 +7,11 @@ 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;"
 
 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;"
 

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

@@ -1,6 +1,4 @@
-# CONFIG_USB_STORAGE is not set
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y
+# CONFIG_USB_STORAGE is not set
 CONFIG_DISPLAY_BOARDINFO=y

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

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

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

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

@@ -0,0 +1,92 @@
+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/hardkernel/patches/linux/0004-meson-g12-odroid-n2_s922x-compatible.patch

@@ -0,0 +1,29 @@
+From 409a0daa72f6fc1652e17cfea7ea1055e9c483c9 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 21 Oct 2019 16:29:02 +0200
+Subject: [PATCH] arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x
+ compatible
+
+This fixes the following DT schemas check errors:
+meson-g12b-odroid-n2.dt.yaml: /: compatible: ['hardkernel,odroid-n2', 'amlogic,g12b'] is not valid under any of the given schemas
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+index 42f15405750cd..0e54c1dc2842b 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -12,7 +12,7 @@
+ #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+ 
+ / {
+-	compatible = "hardkernel,odroid-n2", "amlogic,g12b";
++	compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b";
+ 	model = "Hardkernel ODROID-N2";
+ 
+ 	aliases {

buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-specify-suspend-OPP.patch

@@ -0,0 +1,60 @@
+From d80b817e975c0911f130d502292b209f34ea1e2c Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Tue, 27 Aug 2019 12:03:07 +0200
+Subject: [PATCH 171/200] FROMLIST: arm64: dts: meson-g12b: specify suspend OPP
+
+Tag the 1,2GHz OPPs as suspend OPP to be set before going in suspend mode.
+
+It has been reported that using various OPPs can lead to error or
+resume with a different OPP from the ROM, thus use this safe OPP as
+it is the default OPP used by the BL2 boot firmware on the 2 clusters.
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 2 ++
+ arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+index d61f43052a34..00ea181bc018 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+@@ -39,6 +39,7 @@
+ 		opp-1200000000 {
+ 			opp-hz = /bits/ 64 <1200000000>;
+ 			opp-microvolt = <781000>;
++			opp-suspend;
+ 		};
+ 
+ 		opp-1398000000 {
+@@ -99,6 +100,7 @@
+ 		opp-1200000000 {
+ 			opp-hz = /bits/ 64 <1200000000>;
+ 			opp-microvolt = <751000>;
++			opp-suspend;
+ 		};
+ 
+ 		opp-1398000000 {
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+index 046cc332d07f..d68323c6c780 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+@@ -39,6 +39,7 @@
+ 		opp-1200000000 {
+ 			opp-hz = /bits/ 64 <1200000000>;
+ 			opp-microvolt = <731000>;
++			opp-suspend;
+ 		};
+ 
+ 		opp-1398000000 {
+@@ -99,6 +100,7 @@
+ 		opp-1200000000 {
+ 			opp-hz = /bits/ 64 <1200000000>;
+ 			opp-microvolt = <771000>;
++			opp-suspend;
+ 		};
+ 
+ 		opp-1398000000 {
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12-add-a-g12-layer.patch

@@ -0,0 +1,60 @@
+From 9ed437d69b49bd9ad39db7b6d69b60dfc47cac69 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 5 Sep 2019 14:59:54 +0200
+Subject: [PATCH] arm64: dts: meson: g12: add a g12 layer
+
+While the sm1 is very close to the g12a/b family, somethings apply
+differently on the g12a/b and not the sm1. This introduce a new layer
+of dtsi for part which apply to the g12a and g12b but not the sm1.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi  | 7 +++++++
+ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 2 +-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+new file mode 100644
+index 000000000000..1e30061fb2a7
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -0,0 +1,7 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2019 BayLibre, SAS
++ * Author: Jerome Brunet <jbrunet@baylibre.com>
++ */
++
++#include "meson-g12-common.dtsi"
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+index eb5d177d7a99..69339d69dfd4 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+@@ -3,7 +3,7 @@
+  * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
+  */
+ 
+-#include "meson-g12-common.dtsi"
++#include "meson-g12.dtsi"
+ #include <dt-bindings/power/meson-g12a-power.h>
+ 
+ / {
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+index 5628ccd54531..eefac0ef092b 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+@@ -4,7 +4,7 @@
+  * Author: Neil Armstrong <narmstrong@baylibre.com>
+  */
+ 
+-#include "meson-g12-common.dtsi"
++#include "meson-g12.dtsi"
+ #include <dt-bindings/power/meson-g12a-power.h>
+ 
+ / {
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-g12-factor-the-power-domain.patch

@@ -0,0 +1,95 @@
+From 2871626ba6e61e1ace43db491f766d39e6eacd5a Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 5 Sep 2019 14:59:55 +0200
+Subject: [PATCH] arm64: dts: meson: g12: factor the power domain.
+
+The power domain declared in the g12a and g12b dtsi are the same.
+Move the declaration of these power domains in the g12 common dtsi.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi  | 13 +++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 -------------
+ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 12 ------------
+ 3 files changed, 13 insertions(+), 25 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 1e30061fb2a7..ac5833781611 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -5,3 +5,16 @@
+  */
+ 
+ #include "meson-g12-common.dtsi"
++#include <dt-bindings/power/meson-g12a-power.h>
++
++&ethmac {
++	power-domains = <&pwrc PWRC_G12A_ETH_ID>;
++};
++
++&vpu {
++	power-domains = <&pwrc PWRC_G12A_VPU_ID>;
++};
++
++&sd_emmc_a {
++	amlogic,dram-access-quirk;
++};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+index 69339d69dfd4..07450c4babfc 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+@@ -4,7 +4,6 @@
+  */
+ 
+ #include "meson-g12.dtsi"
+-#include <dt-bindings/power/meson-g12a-power.h>
+ 
+ / {
+ 	compatible = "amlogic,g12a";
+@@ -110,15 +109,3 @@
+ 		};
+ 	};
+ };
+-
+-&ethmac {
+-	power-domains = <&pwrc PWRC_G12A_ETH_ID>;
+-};
+-
+-&vpu {
+-	power-domains = <&pwrc PWRC_G12A_VPU_ID>;
+-};
+-
+-&sd_emmc_a {
+-	amlogic,dram-access-quirk;
+-};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+index eefac0ef092b..a9e1db0f1158 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+@@ -5,7 +5,6 @@
+  */
+ 
+ #include "meson-g12.dtsi"
+-#include <dt-bindings/power/meson-g12a-power.h>
+ 
+ / {
+ 	compatible = "amlogic,g12b";
+@@ -102,14 +101,3 @@
+ 	compatible = "amlogic,g12b-clkc";
+ };
+ 
+-&ethmac {
+-	power-domains = <&pwrc PWRC_G12A_ETH_ID>;
+-};
+-
+-&vpu {
+-	power-domains = <&pwrc PWRC_G12A_VPU_ID>;
+-};
+-
+-&sd_emmc_a {
+-	amlogic,dram-access-quirk;
+-};
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-meson-g12-move-audio-bus-out-of-g12-common.patch

@@ -0,0 +1,707 @@
+From 0f674df0c260d363d2f25efea17f07b73d287565 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 5 Sep 2019 14:59:56 +0200
+Subject: [PATCH] arm64: dts: meson: g12: move audio bus out of g12-common
+
+The base address of the audio bus and pdm device are different
+between the g12 and sm1 SoC families. Overwriting the reg property
+only would leave with confusing node names on the sm1.
+
+Move the audio related devices to the g12 dtsi. The appropriate nodes
+will be created for the sm1 later on.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 320 -----------------
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi    | 324 ++++++++++++++++++
+ 2 files changed, 324 insertions(+), 320 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index 0ee8a369c547..95e9cf405fe9 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -5,13 +5,10 @@
+ 
+ #include <dt-bindings/phy/phy.h>
+ #include <dt-bindings/gpio/gpio.h>
+-#include <dt-bindings/clock/axg-audio-clkc.h>
+ #include <dt-bindings/clock/g12a-clkc.h>
+ #include <dt-bindings/clock/g12a-aoclkc.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+-#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
+-#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
+ #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
+ 
+ / {
+@@ -19,39 +16,6 @@
+ 	#address-cells = <2>;
+ 	#size-cells = <2>;
+ 
+-	tdmif_a: audio-controller-0 {
+-		compatible = "amlogic,axg-tdm-iface";
+-		#sound-dai-cells = <0>;
+-		sound-name-prefix = "TDM_A";
+-		clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_A_SCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
+-		clock-names = "mclk", "sclk", "lrclk";
+-		status = "disabled";
+-	};
+-
+-	tdmif_b: audio-controller-1 {
+-		compatible = "amlogic,axg-tdm-iface";
+-		#sound-dai-cells = <0>;
+-		sound-name-prefix = "TDM_B";
+-		clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_B_SCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
+-		clock-names = "mclk", "sclk", "lrclk";
+-		status = "disabled";
+-	};
+-
+-	tdmif_c: audio-controller-2 {
+-		compatible = "amlogic,axg-tdm-iface";
+-		#sound-dai-cells = <0>;
+-		sound-name-prefix = "TDM_C";
+-		clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_C_SCLK>,
+-			 <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
+-		clock-names = "mclk", "sclk", "lrclk";
+-		status = "disabled";
+-	};
+-
+ 	efuse: efuse {
+ 		compatible = "amlogic,meson-gxbb-efuse";
+ 		clocks = <&clkc CLKID_EFUSE>;
+@@ -1457,290 +1421,6 @@
+ 				};
+ 			};
+ 
+-			pdm: audio-controller@40000 {
+-				compatible = "amlogic,g12a-pdm",
+-					     "amlogic,axg-pdm";
+-				reg = <0x0 0x40000 0x0 0x34>;
+-				#sound-dai-cells = <0>;
+-				sound-name-prefix = "PDM";
+-				clocks = <&clkc_audio AUD_CLKID_PDM>,
+-					 <&clkc_audio AUD_CLKID_PDM_DCLK>,
+-					 <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
+-				clock-names = "pclk", "dclk", "sysclk";
+-				status = "disabled";
+-			};
+-
+-			audio: bus@42000 {
+-				compatible = "simple-bus";
+-				reg = <0x0 0x42000 0x0 0x2000>;
+-				#address-cells = <2>;
+-				#size-cells = <2>;
+-				ranges = <0x0 0x0 0x0 0x42000 0x0 0x2000>;
+-
+-				clkc_audio: clock-controller@0 {
+-					status = "disabled";
+-					compatible = "amlogic,g12a-audio-clkc";
+-					reg = <0x0 0x0 0x0 0xb4>;
+-					#clock-cells = <1>;
+-					#reset-cells = <1>;
+-
+-					clocks = <&clkc CLKID_AUDIO>,
+-						 <&clkc CLKID_MPLL0>,
+-						 <&clkc CLKID_MPLL1>,
+-						 <&clkc CLKID_MPLL2>,
+-						 <&clkc CLKID_MPLL3>,
+-						 <&clkc CLKID_HIFI_PLL>,
+-						 <&clkc CLKID_FCLK_DIV3>,
+-						 <&clkc CLKID_FCLK_DIV4>,
+-						 <&clkc CLKID_GP0_PLL>;
+-					clock-names = "pclk",
+-						      "mst_in0",
+-						      "mst_in1",
+-						      "mst_in2",
+-						      "mst_in3",
+-						      "mst_in4",
+-						      "mst_in5",
+-						      "mst_in6",
+-						      "mst_in7";
+-
+-					resets = <&reset RESET_AUDIO>;
+-				};
+-
+-				toddr_a: audio-controller@100 {
+-					compatible = "amlogic,g12a-toddr",
+-						     "amlogic,axg-toddr";
+-					reg = <0x0 0x100 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "TODDR_A";
+-					interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
+-					resets = <&arb AXG_ARB_TODDR_A>;
+-					status = "disabled";
+-				};
+-
+-				toddr_b: audio-controller@140 {
+-					compatible = "amlogic,g12a-toddr",
+-						     "amlogic,axg-toddr";
+-					reg = <0x0 0x140 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "TODDR_B";
+-					interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
+-					resets = <&arb AXG_ARB_TODDR_B>;
+-					status = "disabled";
+-				};
+-
+-				toddr_c: audio-controller@180 {
+-					compatible = "amlogic,g12a-toddr",
+-						     "amlogic,axg-toddr";
+-					reg = <0x0 0x180 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "TODDR_C";
+-					interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
+-					resets = <&arb AXG_ARB_TODDR_C>;
+-					status = "disabled";
+-				};
+-
+-				frddr_a: audio-controller@1c0 {
+-					compatible = "amlogic,g12a-frddr",
+-						     "amlogic,axg-frddr";
+-					reg = <0x0 0x1c0 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "FRDDR_A";
+-					interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
+-					resets = <&arb AXG_ARB_FRDDR_A>;
+-					status = "disabled";
+-				};
+-
+-				frddr_b: audio-controller@200 {
+-					compatible = "amlogic,g12a-frddr",
+-						     "amlogic,axg-frddr";
+-					reg = <0x0 0x200 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "FRDDR_B";
+-					interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
+-					resets = <&arb AXG_ARB_FRDDR_B>;
+-					status = "disabled";
+-				};
+-
+-				frddr_c: audio-controller@240 {
+-					compatible = "amlogic,g12a-frddr",
+-						     "amlogic,axg-frddr";
+-					reg = <0x0 0x240 0x0 0x2c>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "FRDDR_C";
+-					interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
+-					resets = <&arb AXG_ARB_FRDDR_C>;
+-					status = "disabled";
+-				};
+-
+-				arb: reset-controller@280 {
+-					status = "disabled";
+-					compatible = "amlogic,meson-axg-audio-arb";
+-					reg = <0x0 0x280 0x0 0x4>;
+-					#reset-cells = <1>;
+-					clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
+-				};
+-
+-				tdmin_a: audio-controller@300 {
+-					compatible = "amlogic,g12a-tdmin",
+-						     "amlogic,axg-tdmin";
+-					reg = <0x0 0x300 0x0 0x40>;
+-					sound-name-prefix = "TDMIN_A";
+-					resets = <&clkc_audio AUD_RESET_TDMIN_A>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				tdmin_b: audio-controller@340 {
+-					compatible = "amlogic,g12a-tdmin",
+-						     "amlogic,axg-tdmin";
+-					reg = <0x0 0x340 0x0 0x40>;
+-					sound-name-prefix = "TDMIN_B";
+-					resets = <&clkc_audio AUD_RESET_TDMIN_B>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				tdmin_c: audio-controller@380 {
+-					compatible = "amlogic,g12a-tdmin",
+-						     "amlogic,axg-tdmin";
+-					reg = <0x0 0x380 0x0 0x40>;
+-					sound-name-prefix = "TDMIN_C";
+-					resets = <&clkc_audio AUD_RESET_TDMIN_C>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				tdmin_lb: audio-controller@3c0 {
+-					compatible = "amlogic,g12a-tdmin",
+-						     "amlogic,axg-tdmin";
+-					reg = <0x0 0x3c0 0x0 0x40>;
+-					sound-name-prefix = "TDMIN_LB";
+-					resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				spdifin: audio-controller@400 {
+-					compatible = "amlogic,g12a-spdifin",
+-						     "amlogic,axg-spdifin";
+-					reg = <0x0 0x400 0x0 0x30>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "SPDIFIN";
+-					interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
+-					clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
+-						 <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
+-					clock-names = "pclk", "refclk";
+-					status = "disabled";
+-				};
+-
+-				spdifout: audio-controller@480 {
+-					compatible = "amlogic,g12a-spdifout",
+-						     "amlogic,axg-spdifout";
+-					reg = <0x0 0x480 0x0 0x50>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "SPDIFOUT";
+-					clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
+-						 <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
+-					clock-names = "pclk", "mclk";
+-					status = "disabled";
+-				};
+-
+-				tdmout_a: audio-controller@500 {
+-					compatible = "amlogic,g12a-tdmout";
+-					reg = <0x0 0x500 0x0 0x40>;
+-					sound-name-prefix = "TDMOUT_A";
+-					resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				tdmout_b: audio-controller@540 {
+-					compatible = "amlogic,g12a-tdmout";
+-					reg = <0x0 0x540 0x0 0x40>;
+-					sound-name-prefix = "TDMOUT_B";
+-					resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				tdmout_c: audio-controller@580 {
+-					compatible = "amlogic,g12a-tdmout";
+-					reg = <0x0 0x580 0x0 0x40>;
+-					sound-name-prefix = "TDMOUT_C";
+-					resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
+-					clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
+-						 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
+-					clock-names = "pclk", "sclk", "sclk_sel",
+-						      "lrclk", "lrclk_sel";
+-					status = "disabled";
+-				};
+-
+-				spdifout_b: audio-controller@680 {
+-					compatible = "amlogic,g12a-spdifout",
+-						     "amlogic,axg-spdifout";
+-					reg = <0x0 0x680 0x0 0x50>;
+-					#sound-dai-cells = <0>;
+-					sound-name-prefix = "SPDIFOUT_B";
+-					clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
+-						 <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
+-					clock-names = "pclk", "mclk";
+-					status = "disabled";
+-				};
+-
+-				tohdmitx: audio-controller@744 {
+-					compatible = "amlogic,g12a-tohdmitx";
+-					reg = <0x0 0x744 0x0 0x4>;
+-					#sound-dai-cells = <1>;
+-					sound-name-prefix = "TOHDMITX";
+-					status = "disabled";
+-				};
+-			};
+-
+ 			usb3_pcie_phy: phy@46000 {
+ 				compatible = "amlogic,g12a-usb3-pcie-phy";
+ 				reg = <0x0 0x46000 0x0 0x2000>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index ac5833781611..0d9df29994f3 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -5,7 +5,331 @@
+  */
+ 
+ #include "meson-g12-common.dtsi"
++#include <dt-bindings/clock/axg-audio-clkc.h>
+ #include <dt-bindings/power/meson-g12a-power.h>
++#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
++#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
++
++/ {
++	tdmif_a: audio-controller-0 {
++		compatible = "amlogic,axg-tdm-iface";
++		#sound-dai-cells = <0>;
++		sound-name-prefix = "TDM_A";
++		clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
++			 <&clkc_audio AUD_CLKID_MST_A_SCLK>,
++			 <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
++		clock-names = "mclk", "sclk", "lrclk";
++		status = "disabled";
++	};
++
++	tdmif_b: audio-controller-1 {
++		compatible = "amlogic,axg-tdm-iface";
++		#sound-dai-cells = <0>;
++		sound-name-prefix = "TDM_B";
++		clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
++			 <&clkc_audio AUD_CLKID_MST_B_SCLK>,
++			 <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
++		clock-names = "mclk", "sclk", "lrclk";
++		status = "disabled";
++	};
++
++	tdmif_c: audio-controller-2 {
++		compatible = "amlogic,axg-tdm-iface";
++		#sound-dai-cells = <0>;
++		sound-name-prefix = "TDM_C";
++		clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
++			 <&clkc_audio AUD_CLKID_MST_C_SCLK>,
++			 <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
++		clock-names = "mclk", "sclk", "lrclk";
++		status = "disabled";
++	};
++};
++
++&apb {
++	pdm: audio-controller@40000 {
++		compatible = "amlogic,g12a-pdm",
++			     "amlogic,axg-pdm";
++		reg = <0x0 0x40000 0x0 0x34>;
++		#sound-dai-cells = <0>;
++		sound-name-prefix = "PDM";
++		clocks = <&clkc_audio AUD_CLKID_PDM>,
++			 <&clkc_audio AUD_CLKID_PDM_DCLK>,
++			 <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
++		clock-names = "pclk", "dclk", "sysclk";
++		status = "disabled";
++	};
++
++	audio: bus@42000 {
++		compatible = "simple-bus";
++		reg = <0x0 0x42000 0x0 0x2000>;
++		#address-cells = <2>;
++		#size-cells = <2>;
++		ranges = <0x0 0x0 0x0 0x42000 0x0 0x2000>;
++
++		clkc_audio: clock-controller@0 {
++			status = "disabled";
++			compatible = "amlogic,g12a-audio-clkc";
++			reg = <0x0 0x0 0x0 0xb4>;
++			#clock-cells = <1>;
++			#reset-cells = <1>;
++
++			clocks = <&clkc CLKID_AUDIO>,
++				 <&clkc CLKID_MPLL0>,
++				 <&clkc CLKID_MPLL1>,
++				 <&clkc CLKID_MPLL2>,
++				 <&clkc CLKID_MPLL3>,
++				 <&clkc CLKID_HIFI_PLL>,
++				 <&clkc CLKID_FCLK_DIV3>,
++				 <&clkc CLKID_FCLK_DIV4>,
++				 <&clkc CLKID_GP0_PLL>;
++			clock-names = "pclk",
++				      "mst_in0",
++				      "mst_in1",
++				      "mst_in2",
++				      "mst_in3",
++				      "mst_in4",
++				      "mst_in5",
++				      "mst_in6",
++				      "mst_in7";
++
++			resets = <&reset RESET_AUDIO>;
++		};
++
++		toddr_a: audio-controller@100 {
++			compatible = "amlogic,g12a-toddr",
++				     "amlogic,axg-toddr";
++			reg = <0x0 0x100 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "TODDR_A";
++			interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
++			resets = <&arb AXG_ARB_TODDR_A>;
++			status = "disabled";
++		};
++
++		toddr_b: audio-controller@140 {
++			compatible = "amlogic,g12a-toddr",
++				     "amlogic,axg-toddr";
++			reg = <0x0 0x140 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "TODDR_B";
++			interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
++			resets = <&arb AXG_ARB_TODDR_B>;
++			status = "disabled";
++		};
++
++		toddr_c: audio-controller@180 {
++			compatible = "amlogic,g12a-toddr",
++				     "amlogic,axg-toddr";
++			reg = <0x0 0x180 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "TODDR_C";
++			interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
++			resets = <&arb AXG_ARB_TODDR_C>;
++			status = "disabled";
++		};
++
++		frddr_a: audio-controller@1c0 {
++			compatible = "amlogic,g12a-frddr",
++				     "amlogic,axg-frddr";
++			reg = <0x0 0x1c0 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "FRDDR_A";
++			interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
++			resets = <&arb AXG_ARB_FRDDR_A>;
++			status = "disabled";
++		};
++
++		frddr_b: audio-controller@200 {
++			compatible = "amlogic,g12a-frddr",
++				     "amlogic,axg-frddr";
++			reg = <0x0 0x200 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "FRDDR_B";
++			interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
++			resets = <&arb AXG_ARB_FRDDR_B>;
++			status = "disabled";
++		};
++
++		frddr_c: audio-controller@240 {
++			compatible = "amlogic,g12a-frddr",
++				     "amlogic,axg-frddr";
++			reg = <0x0 0x240 0x0 0x2c>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "FRDDR_C";
++			interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
++			resets = <&arb AXG_ARB_FRDDR_C>;
++			status = "disabled";
++		};
++
++		arb: reset-controller@280 {
++			status = "disabled";
++			compatible = "amlogic,meson-axg-audio-arb";
++			reg = <0x0 0x280 0x0 0x4>;
++			#reset-cells = <1>;
++			clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
++		};
++
++		tdmin_a: audio-controller@300 {
++			compatible = "amlogic,g12a-tdmin",
++				     "amlogic,axg-tdmin";
++			reg = <0x0 0x300 0x0 0x40>;
++			sound-name-prefix = "TDMIN_A";
++			resets = <&clkc_audio AUD_RESET_TDMIN_A>;
++			clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
++				 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		tdmin_b: audio-controller@340 {
++			compatible = "amlogic,g12a-tdmin",
++				     "amlogic,axg-tdmin";
++			reg = <0x0 0x340 0x0 0x40>;
++			sound-name-prefix = "TDMIN_B";
++			resets = <&clkc_audio AUD_RESET_TDMIN_B>;
++			clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
++				 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		tdmin_c: audio-controller@380 {
++			compatible = "amlogic,g12a-tdmin",
++				     "amlogic,axg-tdmin";
++			reg = <0x0 0x380 0x0 0x40>;
++			sound-name-prefix = "TDMIN_C";
++			resets = <&clkc_audio AUD_RESET_TDMIN_C>;
++			clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
++				 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		tdmin_lb: audio-controller@3c0 {
++			compatible = "amlogic,g12a-tdmin",
++				     "amlogic,axg-tdmin";
++			reg = <0x0 0x3c0 0x0 0x40>;
++			sound-name-prefix = "TDMIN_LB";
++			resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
++			clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
++				 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		spdifin: audio-controller@400 {
++			compatible = "amlogic,g12a-spdifin",
++				     "amlogic,axg-spdifin";
++			reg = <0x0 0x400 0x0 0x30>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "SPDIFIN";
++			interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
++			clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
++				 <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
++			clock-names = "pclk", "refclk";
++			status = "disabled";
++		};
++
++		spdifout: audio-controller@480 {
++			compatible = "amlogic,g12a-spdifout",
++				     "amlogic,axg-spdifout";
++			reg = <0x0 0x480 0x0 0x50>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "SPDIFOUT";
++			clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
++				 <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
++			clock-names = "pclk", "mclk";
++			status = "disabled";
++		};
++
++		tdmout_a: audio-controller@500 {
++			compatible = "amlogic,g12a-tdmout";
++			reg = <0x0 0x500 0x0 0x40>;
++			sound-name-prefix = "TDMOUT_A";
++			resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
++			clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		tdmout_b: audio-controller@540 {
++			compatible = "amlogic,g12a-tdmout";
++			reg = <0x0 0x540 0x0 0x40>;
++			sound-name-prefix = "TDMOUT_B";
++			resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
++			clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		tdmout_c: audio-controller@580 {
++			compatible = "amlogic,g12a-tdmout";
++			reg = <0x0 0x580 0x0 0x40>;
++			sound-name-prefix = "TDMOUT_C";
++			resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
++			clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
++				 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
++			clock-names = "pclk", "sclk", "sclk_sel",
++				      "lrclk", "lrclk_sel";
++			status = "disabled";
++		};
++
++		spdifout_b: audio-controller@680 {
++			compatible = "amlogic,g12a-spdifout",
++				     "amlogic,axg-spdifout";
++			reg = <0x0 0x680 0x0 0x50>;
++			#sound-dai-cells = <0>;
++			sound-name-prefix = "SPDIFOUT_B";
++			clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
++				 <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
++			clock-names = "pclk", "mclk";
++			status = "disabled";
++		};
++
++		tohdmitx: audio-controller@744 {
++			compatible = "amlogic,g12a-tohdmitx";
++			reg = <0x0 0x744 0x0 0x4>;
++			#sound-dai-cells = <1>;
++			sound-name-prefix = "TOHDMITX";
++			status = "disabled";
++		};
++	};
++};
+ 
+ &ethmac {
+ 	power-domains = <&pwrc PWRC_G12A_ETH_ID>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-g12a-add-audio-devices-resets.patch

@@ -0,0 +1,121 @@
+From c725fb00dfe3409720be24fad54b9acde26c5f11 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Wed, 25 Sep 2019 11:33:58 +0200
+Subject: [PATCH] arm64: dts: meson: g12a: add audio devices resets
+
+Provide the reset lines coming from the audio clock controller to
+the audio devices of the g12 family
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 28 +++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 0d9df29994f3..3cf74fc96434 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -103,7 +103,9 @@
+ 			sound-name-prefix = "TODDR_A";
+ 			interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
+-			resets = <&arb AXG_ARB_TODDR_A>;
++			resets = <&arb AXG_ARB_TODDR_A>,
++				 <&clkc_audio AUD_RESET_TODDR_A>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -115,7 +117,9 @@
+ 			sound-name-prefix = "TODDR_B";
+ 			interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
+-			resets = <&arb AXG_ARB_TODDR_B>;
++			resets = <&arb AXG_ARB_TODDR_B>,
++				 <&clkc_audio AUD_RESET_TODDR_B>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -127,7 +131,9 @@
+ 			sound-name-prefix = "TODDR_C";
+ 			interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
+-			resets = <&arb AXG_ARB_TODDR_C>;
++			resets = <&arb AXG_ARB_TODDR_C>,
++				 <&clkc_audio AUD_RESET_TODDR_C>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -139,7 +145,9 @@
+ 			sound-name-prefix = "FRDDR_A";
+ 			interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
+-			resets = <&arb AXG_ARB_FRDDR_A>;
++			resets = <&arb AXG_ARB_FRDDR_A>,
++				 <&clkc_audio AUD_RESET_FRDDR_A>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -151,7 +159,9 @@
+ 			sound-name-prefix = "FRDDR_B";
+ 			interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
+-			resets = <&arb AXG_ARB_FRDDR_B>;
++			resets = <&arb AXG_ARB_FRDDR_B>,
++				 <&clkc_audio AUD_RESET_FRDDR_B>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -163,7 +173,9 @@
+ 			sound-name-prefix = "FRDDR_C";
+ 			interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
+-			resets = <&arb AXG_ARB_FRDDR_C>;
++			resets = <&arb AXG_ARB_FRDDR_C>,
++				 <&clkc_audio AUD_RESET_FRDDR_C>;
++			reset-names = "arb", "rst";
+ 			status = "disabled";
+ 		};
+ 
+@@ -249,6 +261,7 @@
+ 			clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
+ 				 <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
+ 			clock-names = "pclk", "refclk";
++			resets = <&clkc_audio AUD_RESET_SPDIFIN>;
+ 			status = "disabled";
+ 		};
+ 
+@@ -261,6 +274,7 @@
+ 			clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
+ 				 <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
+ 			clock-names = "pclk", "mclk";
++			resets = <&clkc_audio AUD_RESET_SPDIFOUT>;
+ 			status = "disabled";
+ 		};
+ 
+@@ -318,6 +332,7 @@
+ 			clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
+ 				 <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
+ 			clock-names = "pclk", "mclk";
++			resets = <&clkc_audio AUD_RESET_SPDIFOUT_B>;
+ 			status = "disabled";
+ 		};
+ 
+@@ -326,6 +341,7 @@
+ 			reg = <0x0 0x744 0x0 0x4>;
+ 			#sound-dai-cells = <1>;
+ 			sound-name-prefix = "TOHDMITX";
++			resets = <&clkc_audio AUD_RESET_TOHDMITX>;
+ 			status = "disabled";
+ 		};
+ 	};
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0011-arm64-dts-meson-Link-nvmem-and-secure-monitor-nodes.patch

@@ -0,0 +1,54 @@
+From de82e74a9f2631e6718ab6a90e0dfbbcd7d952b4 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <ccaione@baylibre.com>
+Date: Wed, 31 Jul 2019 09:23:38 +0100
+Subject: [PATCH] arm64: dts: meson: Link nvmem and secure-monitor nodes
+
+The former is going to use the latter to retrieve the efuses data.
+
+Signed-off-by: Carlo Caione <ccaione@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 1 +
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi         | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+index bb4a2acb9970..04803c3bccfa 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+@@ -117,6 +117,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
+ 		read-only;
++		secure-monitor = <&sm>;
+ 	};
+ 
+ 	psci {
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index 95e9cf405fe9..0f6ec1704343 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -22,6 +22,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
+ 		read-only;
++		secure-monitor = <&sm>;
+ 	};
+ 
+ 	psci {
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+index 6733050d735f..e5a601e75ef2 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+@@ -161,6 +161,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
+ 		read-only;
++		secure-monitor = <&sm>;
+ 
+ 		sn: sn@14 {
+ 			reg = <0x14 0x10>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0012-arm64-dts-meson-g12a-Add-PCIe-node.patch

@@ -0,0 +1,82 @@
+From 1f8607d597635c283e397e87575b49184874d507 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 16 Sep 2019 14:50:21 +0200
+Subject: [PATCH] arm64: dts: meson-g12a: Add PCIe node
+
+This adds the Amlogic G12A PCI Express controller node, also
+using the USB3+PCIe Combo PHY.
+
+The PHY mode selection is static, thus the USB3+PCIe Combo PHY
+phandle would need to be removed from the USB control node if the
+shared differential lines are used for PCIe instead of USB3.
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Andrew Murray <andrew.murray@arm.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 33 +++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    |  4 +++
+ 2 files changed, 37 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index 0f6ec1704343..f76773cabdb1 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -60,6 +60,39 @@
+ 		#size-cells = <2>;
+ 		ranges;
+ 
++		pcie: pcie@fc000000 {
++			compatible = "amlogic,g12a-pcie", "snps,dw-pcie";
++			reg = <0x0 0xfc000000 0x0 0x400000
++			       0x0 0xff648000 0x0 0x2000
++			       0x0 0xfc400000 0x0 0x200000>;
++			reg-names = "elbi", "cfg", "config";
++			interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
++			#interrupt-cells = <1>;
++			interrupt-map-mask = <0 0 0 0>;
++			interrupt-map = <0 0 0 0 &gic GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
++			bus-range = <0x0 0xff>;
++			#address-cells = <3>;
++			#size-cells = <2>;
++			device_type = "pci";
++			ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000
++				  0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
++
++			clocks = <&clkc CLKID_PCIE_PHY
++				  &clkc CLKID_PCIE_COMB
++				  &clkc CLKID_PCIE_PLL>;
++			clock-names = "general",
++				      "pclk",
++				      "port";
++			resets = <&reset RESET_PCIE_CTRL_A>,
++				 <&reset RESET_PCIE_APB>;
++			reset-names = "port",
++				      "apb";
++			num-lanes = <1>;
++			phys = <&usb3_pcie_phy PHY_TYPE_PCIE>;
++			phy-names = "pcie";
++			status = "disabled";
++		};
++
+ 		ethmac: ethernet@ff3f0000 {
+ 			compatible = "amlogic,meson-axg-dwmac",
+ 				     "snps,dwmac-3.70a",
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+index 6152e928aef2..1fdc5af5ae23 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+@@ -139,6 +139,10 @@
+ 		     "amlogic,meson-gpio-intc";
+ };
+ 
++&pcie {
++	power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
++};
++
+ &pwrc {
+ 	compatible = "amlogic,meson-sm1-pwrc";
+ };
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0013-arm64-dts-meson-g12-add-support-for-simplefb.patch

@@ -0,0 +1,99 @@
+From 15767cfd81eb9ff2fb783d0c6f458b90efa7d4d3 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Thu, 3 Oct 2019 15:08:41 +0200
+Subject: [PATCH] arm64: dts: meson-g12: add support for simplefb
+
+SimpleFB allows transferring a framebuffer from the firmware/bootloader
+to the kernel, while making sure the related clocks and power supplies
+stay enabled.
+
+Add nodes for CVBS and HDMI Simple Framebuffers, based on the GXBB/GXL/GXM
+support at [1].
+
+[1] 03b370357907 ("arm64: dts: meson-gx: add support for simplef")
+
+Cc: Maxime Jourdan <mjourdan@baylibre.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 26 +++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi    |  8 ++++++
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    |  8 ++++++
+ 3 files changed, 42 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index f76773cabdb1..21c155f4508c 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -16,6 +16,32 @@
+ 	#address-cells = <2>;
+ 	#size-cells = <2>;
+ 
++	chosen {
++		#address-cells = <2>;
++		#size-cells = <2>;
++		ranges;
++
++		simplefb_cvbs: framebuffer-cvbs {
++			compatible = "amlogic,simple-framebuffer",
++				     "simple-framebuffer";
++			amlogic,pipeline = "vpu-cvbs";
++			clocks = <&clkc CLKID_HDMI>,
++				 <&clkc CLKID_HTX_PCLK>,
++				 <&clkc CLKID_VPU_INTR>;
++			status = "disabled";
++		};
++
++		simplefb_hdmi: framebuffer-hdmi {
++			compatible = "amlogic,simple-framebuffer",
++				    "simple-framebuffer";
++			amlogic,pipeline = "vpu-hdmi";
++			clocks = <&clkc CLKID_HDMI>,
++				 <&clkc CLKID_HTX_PCLK>,
++				 <&clkc CLKID_VPU_INTR>;
++			status = "disabled";
++		};
++	};
++
+ 	efuse: efuse {
+ 		compatible = "amlogic,meson-gxbb-efuse";
+ 		clocks = <&clkc CLKID_EFUSE>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 3cf74fc96434..1e0e056c3d62 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -358,3 +358,11 @@
+ &sd_emmc_a {
+ 	amlogic,dram-access-quirk;
+ };
++
++&simplefb_cvbs {
++	power-domains = <&pwrc PWRC_G12A_VPU_ID>;
++};
++
++&simplefb_hdmi {
++	power-domains = <&pwrc PWRC_G12A_VPU_ID>;
++};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+index 1fdc5af5ae23..f89d744c9648 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+@@ -147,6 +147,14 @@
+ 	compatible = "amlogic,meson-sm1-pwrc";
+ };
+ 
++&simplefb_cvbs {
++	power-domains = <&pwrc PWRC_SM1_VPU_ID>;
++};
++
++&simplefb_hdmi {
++	power-domains = <&pwrc PWRC_SM1_VPU_ID>;
++};
++
+ &vpu {
+ 	power-domains = <&pwrc PWRC_SM1_VPU_ID>;
+ };
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0014-arm64-dts-meson-g12-add-temperature-sensor.patch

@@ -0,0 +1,52 @@
+From 8656783f07613ad2a4e511e417c88c544e220113 Mon Sep 17 00:00:00 2001
+From: Guillaume La Roque <glaroque@baylibre.com>
+Date: Fri, 4 Oct 2019 11:01:10 +0200
+Subject: [PATCH] arm64: dts: meson: g12: add temperature sensor
+
+Add cpu and ddr temperature sensors for G12 Socs
+
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
+Tested-by: Christian Hewitt <christianshewitt@gmail.com>
+Tested-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index 21c155f4508c..f153194b9bf3 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -1380,6 +1380,26 @@
+ 				};
+ 			};
+ 
++			cpu_temp: temperature-sensor@34800 {
++				compatible = "amlogic,g12a-cpu-thermal",
++					     "amlogic,g12a-thermal";
++				reg = <0x0 0x34800 0x0 0x50>;
++				interrupts = <GIC_SPI 35 IRQ_TYPE_EDGE_RISING>;
++				clocks = <&clkc CLKID_TS>;
++				#thermal-sensor-cells = <0>;
++				amlogic,ao-secure = <&sec_AO>;
++			};
++
++			ddr_temp: temperature-sensor@34c00 {
++				compatible = "amlogic,g12a-ddr-thermal",
++					     "amlogic,g12a-thermal";
++				reg = <0x0 0x34c00 0x0 0x50>;
++				interrupts = <GIC_SPI 36 IRQ_TYPE_EDGE_RISING>;
++				clocks = <&clkc CLKID_TS>;
++				#thermal-sensor-cells = <0>;
++				amlogic,ao-secure = <&sec_AO>;
++			};
++
+ 			usb2_phy0: phy@36000 {
+ 				compatible = "amlogic,g12a-usb2-phy";
+ 				reg = <0x0 0x36000 0x0 0x2000>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0015-arm64-dts-meson-g12-Add-minimal-thermal-zone.patch

@@ -0,0 +1,105 @@
+From e7251ed74ef79b80fc5e77636832be7baf1f40a6 Mon Sep 17 00:00:00 2001
+From: Guillaume La Roque <glaroque@baylibre.com>
+Date: Fri, 4 Oct 2019 11:01:11 +0200
+Subject: [PATCH] arm64: dts: meson: g12: Add minimal thermal zone
+
+Add minimal thermal zone for two temperature sensor
+One is located close to the DDR and the other one is
+located close to the PLLs (between the CPU and GPU)
+
+Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
+Tested-by: Christian Hewitt <christianshewitt@gmail.com>
+Tested-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index f153194b9bf3..a063d49b9cb1 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -10,6 +10,7 @@
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
++#include <dt-bindings/thermal/thermal.h>
+ 
+ / {
+ 	interrupt-parent = <&gic>;
+@@ -119,6 +120,61 @@
+ 			status = "disabled";
+ 		};
+ 
++		thermal-zones {
++			cpu_thermal: cpu-thermal {
++				polling-delay = <1000>;
++				polling-delay-passive = <100>;
++				thermal-sensors = <&cpu_temp>;
++
++				trips {
++					cpu_passive: cpu-passive {
++						temperature = <85000>; /* millicelsius */
++						hysteresis = <2000>; /* millicelsius */
++						type = "passive";
++					};
++
++					cpu_hot: cpu-hot {
++						temperature = <95000>; /* millicelsius */
++						hysteresis = <2000>; /* millicelsius */
++						type = "hot";
++					};
++
++					cpu_critical: cpu-critical {
++						temperature = <110000>; /* millicelsius */
++						hysteresis = <2000>; /* millicelsius */
++						type = "critical";
++					};
++				};
++			};
++
++			ddr_thermal: ddr-thermal {
++				polling-delay = <1000>;
++				polling-delay-passive = <100>;
++				thermal-sensors = <&ddr_temp>;
++
++				trips {
++					ddr_passive: ddr-passive {
++						temperature = <85000>; /* millicelsius */
++						hysteresis = <2000>; /* millicelsius */
++						type = "passive";
++					};
++
++					ddr_critical: ddr-critical {
++						temperature = <110000>; /* millicelsius */
++						hysteresis = <2000>; /* millicelsius */
++						type = "critical";
++					};
++				};
++
++				cooling-maps {
++					map {
++						trip = <&ddr_passive>;
++						cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++					};
++				};
++			};
++		};
++
+ 		ethmac: ethernet@ff3f0000 {
+ 			compatible = "amlogic,meson-axg-dwmac",
+ 				     "snps,dwmac-3.70a",
+@@ -2169,6 +2225,7 @@
+ 			assigned-clock-rates = <0>, /* Do Nothing */
+ 					       <800000000>,
+ 					       <0>; /* Do Nothing */
++			#cooling-cells = <2>;
+ 		};
+ 	};
+ 
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0016-arm64-dts-meson-Add-capacity-dmips-mhz-attributes-to.patch

@@ -0,0 +1,83 @@
+From 6eeaf4d2452ec8b1ece58776812140734fc2e088 Mon Sep 17 00:00:00 2001
+From: Frank Hartung <supervisedthinking@gmail.com>
+Date: Sat, 14 Sep 2019 06:49:40 +0400
+Subject: [PATCH] arm64: dts: meson: Add capacity-dmips-mhz attributes to G12B
+
+Meson G12B SoCs (S922X and A311D) are a big-little design where not all CPUs
+are equal; the A53s cores are weaker than the A72s.
+
+Include capacity-dmips-mhz properties to tell the OS there is a difference
+in processing capacity. The dmips values are based on similar submissions for
+other A53/A72 SoCs: HiSilicon 3660 [1] and Rockchip RK3399 [2].
+
+This change is particularly beneficial for use-cases like retro gaming where
+emulators often run on a single core. The OS now chooses an A72 core instead
+of an A53 core.
+
+[1] https://lore.kernel.org/patchwork/patch/862742/
+[2] https://patchwork.kernel.org/patch/10836577/
+
+Signed-off-by: Frank Hartung <supervisedthinking@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+index a9e1db0f1158..b3f9e3a02963 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+@@ -48,6 +48,7 @@
+ 			compatible = "arm,cortex-a53";
+ 			reg = <0x0 0x0>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <592>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+@@ -56,6 +57,7 @@
+ 			compatible = "arm,cortex-a53";
+ 			reg = <0x0 0x1>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <592>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+@@ -64,6 +66,7 @@
+ 			compatible = "arm,cortex-a73";
+ 			reg = <0x0 0x100>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <1024>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+@@ -72,6 +75,7 @@
+ 			compatible = "arm,cortex-a73";
+ 			reg = <0x0 0x101>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <1024>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+@@ -80,6 +84,7 @@
+ 			compatible = "arm,cortex-a73";
+ 			reg = <0x0 0x102>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <1024>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+@@ -88,6 +93,7 @@
+ 			compatible = "arm,cortex-a73";
+ 			reg = <0x0 0x103>;
+ 			enable-method = "psci";
++			capacity-dmips-mhz = <1024>;
+ 			next-level-cache = <&l2>;
+ 		};
+ 
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0017-arm64-dts-meson-g12a-fix-gpu-irq-order.patch

@@ -0,0 +1,37 @@
+From 711f9cb1f13aff940cd0a469dcb1a041330af019 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 21 Oct 2019 16:29:00 +0200
+Subject: [PATCH] arm64: dts: meson-g12a: fix gpu irq order
+
+This fixes the following DT schemas check errors:
+meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:0: 'job' was expected
+meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:2: 'gpu' was expected
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index a063d49b9cb1..7fabc8d9654a 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -2204,10 +2204,10 @@
+ 			compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost";
+ 			reg = <0x0 0xffe40000 0x0 0x40000>;
+ 			interrupt-parent = <&gic>;
+-			interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
++			interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
+ 				     <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
+-				     <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+-			interrupt-names = "gpu", "mmu", "job";
++				     <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "job", "mmu", "gpu";
+ 			clocks = <&clkc CLKID_MALI>;
+ 			resets = <&reset RESET_DVALIN_CAPB3>, <&reset RESET_DVALIN>;
+ 
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0019-arm64-dts-meson-odroid-c2-p5v0-is-the-main-5V-power-.patch

@@ -0,0 +1,43 @@
+From fcf19f29d79dfe4edce0376dd027ea7a5456ea32 Mon Sep 17 00:00:00 2001
+From: Anand Moon <linux.amoon@gmail.com>
+Date: Mon, 2 Sep 2019 05:49:33 +0000
+Subject: [PATCH] arm64: dts: meson: odroid-c2: p5v0 is the main 5V power input
+
+As per the schematic Monolithic Power Systems MP2161GJ-C499
+supply a fixed output voltage of 5.0V. This supplies linked
+to VDD_EE, HDMI_P5V0, USB_POWER, VCCK, VDDIO_AO1V8, VDDIO_AO3V3,
+VDD3V3, DDR3_1V5 according to the schematics.
+
+Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Neil Armstrong <narmstrong@baylibre.com>
+Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Anand Moon <linux.amoon@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 6039adda12ee..0cb5831d9daf 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -50,6 +50,15 @@
+ 		};
+ 	};
+ 
++	p5v0: regulator-p5v0 {
++		compatible = "regulator-fixed";
++
++		regulator-name = "P5V0";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		regulator-always-on;
++	};
++
+ 	tflash_vdd: regulator-tflash_vdd {
+ 		/*
+ 		 * signal name from schematics: TFLASH_VDD_EN
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0020-arm64-dts-meson-odroid-c2-Add-missing-linking-regula.patch

@@ -0,0 +1,42 @@
+From 47a8bddb6df98cc4062661fe68ad5d4382337d0e Mon Sep 17 00:00:00 2001
+From: Anand Moon <linux.amoon@gmail.com>
+Date: Mon, 2 Sep 2019 05:49:34 +0000
+Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing linking regulator
+ to usb bus
+
+Add missing linking regulator node to usb bus for power usb devices.
+
+Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Neil Armstrong <narmstrong@baylibre.com>
+Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Anand Moon <linux.amoon@gmail.com>
+[ khilman: minor typo fixup ]
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 0cb5831d9daf..e2ce767a4324 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -36,8 +36,15 @@
+ 		regulator-min-microvolt = <5000000>;
+ 		regulator-max-microvolt = <5000000>;
+ 
++		/*
++		 * signal name from schematics: PWREN
++		 */
+ 		gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
+ 		enable-active-high;
++		/*
++		 * signal name from schematics: USB_POWER
++		 */
++		vin-supply = <&p5v0>;
+ 	};
+ 
+ 	leds {
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0022-arm64-dts-meson-odroid-c2-Add-missing-regulator-link.patch

@@ -0,0 +1,64 @@
+From 60c5abf6a8f54dee2ccb94a7ec58f73883e6c56d Mon Sep 17 00:00:00 2001
+From: Anand Moon <linux.amoon@gmail.com>
+Date: Tue, 1 Oct 2019 07:38:59 +0000
+Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
+ P5V0 regulator
+
+As per schematics VDDIO_AO18, VDDIO_AO3V3/VDD3V3 DDR3_1V5/DDR_VDDC:
+fixed regulator output which is supplied by P5V0.
+
+Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Anand Moon <linux.amoon@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-gxbb-odroidc2.dts  | 30 +++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index e739f10f9442..5adecdf3b175 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -111,6 +111,36 @@
+ 		regulator-max-microvolt = <3300000>;
+ 	};
+ 
++	vddio_ao1v8: regulator-vddio-ao1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDIO_AO1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		regulator-always-on;
++		/* U17 RT9179GB */
++		vin-supply = <&p5v0>;
++	};
++
++	vddio_ao3v3: regulator-vddio-ao3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDIO_AO3V3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		regulator-always-on;
++		/* U11 MP2161GJ-C499 */
++		vin-supply = <&p5v0>;
++	};
++
++	ddr3_1v5: regulator-ddr3_1v5 {
++		compatible = "regulator-fixed";
++		regulator-name = "DDR3_1V5";
++		regulator-min-microvolt = <1500000>;
++		regulator-max-microvolt = <1500000>;
++		regulator-always-on;
++		/* U15 MP2161GJ-C499 */
++		vin-supply = <&p5v0>;
++	};
++
+ 	emmc_pwrseq: emmc-pwrseq {
+ 		compatible = "mmc-pwrseq-emmc";
+ 		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0023-arm64-dts-meson-odroid-c2-Add-missing-regulator-link.patch

@@ -0,0 +1,73 @@
+From df39b5239d696e1fc9a88103f69c2d3696bdb0bc Mon Sep 17 00:00:00 2001
+From: Anand Moon <linux.amoon@gmail.com>
+Date: Tue, 1 Oct 2019 07:39:00 +0000
+Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
+ VDDIO_AO3V3 regulator
+
+As per schematics TFLASH_VDD, TF_IO, VCC3V3 fixed regulator output which
+is supplied by VDDIO_AO3V3.
+
+While here, move the comment name with the signal name in the
+schematics above the gpio property to make it consistent with other
+regulators.
+
+Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Anand Moon <linux.amoon@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 5adecdf3b175..2fcd512373a3 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -67,17 +67,19 @@
+ 	};
+ 
+ 	tflash_vdd: regulator-tflash_vdd {
+-		/*
+-		 * signal name from schematics: TFLASH_VDD_EN
+-		 */
+ 		compatible = "regulator-fixed";
+ 
+ 		regulator-name = "TFLASH_VDD";
+ 		regulator-min-microvolt = <3300000>;
+ 		regulator-max-microvolt = <3300000>;
+ 
++		/*
++		 * signal name from schematics: TFLASH_VDD_EN
++		 */
+ 		gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>;
+ 		enable-active-high;
++		/* U16 RT9179GB */
++		vin-supply = <&vddio_ao3v3>;
+ 	};
+ 
+ 	tf_io: gpio-regulator-tf_io {
+@@ -95,6 +97,8 @@
+ 
+ 		states = <3300000 0>,
+ 			 <1800000 1>;
++		/* U12/U13 RT9179GB */
++		vin-supply = <&vddio_ao3v3>;
+ 	};
+ 
+ 	vcc1v8: regulator-vcc1v8 {
+@@ -102,6 +106,9 @@
+ 		regulator-name = "VCC1V8";
+ 		regulator-min-microvolt = <1800000>;
+ 		regulator-max-microvolt = <1800000>;
++		regulator-always-on;
++		/* U18 RT9179GB */
++		vin-supply = <&vddio_ao3v3>;
+ 	};
+ 
+ 	vcc3v3: regulator-vcc3v3 {
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0024-arm64-dts-meson-odroid-c2-Add-missing-regulator-link.patch

@@ -0,0 +1,50 @@
+From 0ac0be655dbbedb50dd216a631213daab6e98d88 Mon Sep 17 00:00:00 2001
+From: Anand Moon <linux.amoon@gmail.com>
+Date: Tue, 1 Oct 2019 07:39:01 +0000
+Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
+ HDMI supply
+
+As per schematics HDMI_P5V0 is supplied by P5V0 so add missing link.
+
+Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Anand Moon <linux.amoon@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 2fcd512373a3..6ded279c40c8 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -66,6 +66,15 @@
+ 		regulator-always-on;
+ 	};
+ 
++	hdmi_p5v0: regulator-hdmi_p5v0 {
++		compatible = "regulator-fixed";
++		regulator-name = "HDMI_P5V0";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		/* AP2331SA-7 */
++		vin-supply = <&p5v0>;
++	};
++
+ 	tflash_vdd: regulator-tflash_vdd {
+ 		compatible = "regulator-fixed";
+ 
+@@ -220,6 +229,7 @@
+ 	status = "okay";
+ 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+ 	pinctrl-names = "default";
++	hdmi-supply = <&hdmi_p5v0>;
+ };
+ 
+ &hdmi_tx_tmds_port {
+-- 
+2.17.1
+

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

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

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

@@ -13,17 +13,12 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 
-CONFIG_SND_HDA=m
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_CORE=y
+CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-
-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_LE=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_SND_HDA_I915=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m

buildroot-external/board/intel/nuc/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
+BOOT_SPL=false
 DISK_SIZE=6

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

@@ -15,6 +15,7 @@ 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
 
@@ -22,6 +23,8 @@ 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

buildroot-external/board/intel/ova/meta

@@ -4,4 +4,5 @@ CHASSIS=vm
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
+BOOT_SPL=false
 DISK_SIZE=6

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

@@ -1,25 +0,0 @@
-#!/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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

buildroot-external/board/orangepi/prime/meta

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

@@ -1,8 +0,0 @@
-# CONFIG_USB_STORAGE 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
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y

buildroot-external/board/raspberrypi/rpi/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/rpi0-w/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/rpi2/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

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

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/rpi3/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

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

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/rpi4/meta

@@ -4,4 +4,5 @@ CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
 BOOT_SYS=hyprid
+BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000

buildroot-external/board/raspberrypi/uboot.config

@@ -1,6 +1,4 @@
 # 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

buildroot-external/bootloader/uboot.config

@@ -11,5 +11,7 @@ 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_ENV_IS_NOWHERE=Y
 # CONFIG_EFI_LOADER is not set
 CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_FILEENV=y

buildroot-external/busybox.config

@@ -320,7 +320,7 @@ CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
-CONFIG_UNAME_OSNAME="Hassio/OS"
+CONFIG_UNAME_OSNAME="HassOS"
 CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y

buildroot-external/configs/intel_nuc_defconfig

@@ -8,8 +8,8 @@ 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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -19,12 +19,13 @@ 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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18"
 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
@@ -88,7 +89,6 @@ BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"
 BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -96,13 +96,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/odroid_c2_defconfig

@@ -2,14 +2,14 @@ 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/odroid-c2/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18"
 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"
@@ -77,12 +77,12 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=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.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 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_4_19=y
+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,14 +90,15 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor: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_n2_defconfig

@@ -1,54 +1,33 @@
 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/orangepi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty0"
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # 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.88"
-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/orangepi/prime $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/hassos-hook.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.18"
+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_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
@@ -56,8 +35,6 @@ 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
@@ -71,6 +48,7 @@ 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
@@ -83,6 +61,7 @@ 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
@@ -95,22 +74,31 @@ 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+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="187"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
+BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-n2-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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor: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/odroid_xu4_defconfig

@@ -3,14 +3,14 @@ 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/odroid-xu4/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -80,14 +80,14 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=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.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 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_4_19=y
+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,13 +95,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/ova_defconfig

@@ -8,8 +8,8 @@ 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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -19,13 +19,13 @@ 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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18"
 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_4_19=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
@@ -79,7 +79,6 @@ BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"
 BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -87,13 +86,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi0_w_defconfig

@@ -10,8 +10,8 @@ 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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 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="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
 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_LZ4=y
@@ -80,7 +80,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 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
@@ -93,13 +93,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi2_defconfig

@@ -10,8 +10,8 @@ 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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2
 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="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
 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_LZ4=y
@@ -79,7 +79,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 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
@@ -92,13 +92,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -10,8 +10,8 @@ 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_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 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="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
 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_LZ4=y
@@ -80,7 +80,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 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
@@ -93,13 +93,13 @@ 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="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199"
 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="16"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y