Merge pull request #604 from home-assistant/dev

Release 4.4

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@
 **Supervisor logs:**
 <!--
 - Frontend -> Hass.io -> System
-- Or use this command: hassio su logs
+- Or use this command: ha su logs
 -->
 
 **Journal logs:**

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/nuc.md

@@ -17,6 +17,7 @@ Requirements:
 | Device | Quirks | 
 |--------|-----------|
 | Intel NUC5CPYH |  |
+| Intel NUC6CAYH |  |
 | Gigabyte GB-BPCE-3455 | needs 'nomodeset' in cmdline.txt if you want a console |
 
 

Documentation/configuration.md

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

@@ -5,10 +5,10 @@ Default Kernel tree: 5.4
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 5.4.11 |
-| Raspberry Pi | 4.19.93 |
+| Open Virtual Applicance | 5.4.24 |
+| Raspberry Pi | 4.19.106 |
 | Tinker Board | 4.19.88 |
-| Odroid-C2 | 5.4.11 |
-| Odroid-N2 | 5.4.11 |
-| Odroid-XU4 | 5.4.11 |
-| Intel NUC | 5.4.11 |
+| Odroid-C2 | 5.4.24 |
+| Odroid-N2 | 5.4.24 |
+| Odroid-XU4 | 5.4.24 |
+| Intel NUC | 5.4.24 |

Documentation/network.md

@@ -106,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-release.yml

@@ -13,7 +13,7 @@ variables:
   - name: versionGHR
     value: 'v0.13.0'
   - group: github
-  - group: hassos
+  - group: rauc
 
 jobs:
 
@@ -91,5 +91,5 @@ jobs:
         hassos:azure make $(board)
     displayName: 'Build $(board)'
   - script: |
-      ./ghr -t $(githubToken) $(Build.SourceBranchName) release/
+      ./ghr -t $(githubToken) -replace $(Build.SourceBranchName) release/
     displayName: 'Upload $(board)'

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/kernel.config

@@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features
@@ -2194,7 +2197,7 @@ CONFIG_FIXED_PHY=y
 # CONFIG_LXT_PHY is not set
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_GXL_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
@@ -2768,7 +2771,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_MESON is not set
+CONFIG_I2C_MESON=y
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -3412,6 +3415,7 @@ CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REGULATOR_VEXPRESS is not set
 CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 # CONFIG_LIRC is not set
@@ -3436,7 +3440,7 @@ CONFIG_RC_DEVICES=y
 # CONFIG_IR_MCEUSB is not set
 # CONFIG_IR_ITE_CIR is not set
 # CONFIG_IR_FINTEK is not set
-# CONFIG_IR_MESON is not set
+CONFIG_IR_MESON=m
 # CONFIG_IR_NUVOTON is not set
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
@@ -3458,7 +3462,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3574,6 +3578,10 @@ CONFIG_USB_GSPCA=m
 # Webcam, TV (analog/digital) USB devices
 #
 # CONFIG_VIDEO_EM28XX is not set
+
+#
+# USB HDMI CEC adapters
+#
 # CONFIG_MEDIA_PCI_SUPPORT is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
@@ -3586,6 +3594,11 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
+CONFIG_CEC_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_CROS_EC_CEC is not set
+CONFIG_VIDEO_MESON_AO_CEC=m
+# CONFIG_VIDEO_MESON_G12A_AO_CEC is not set
+# CONFIG_CEC_GPIO is not set
 
 #
 # Supported MMC/SDIO adapters
@@ -5719,8 +5732,8 @@ CONFIG_RAS=y
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_BCM_OCOTP=y
-# CONFIG_MESON_EFUSE is not set
+# CONFIG_NVMEM_BCM_OCOTP is not set
+CONFIG_MESON_EFUSE=y
 # CONFIG_MESON_MX_EFUSE is not set
 
 #

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/uboot-boot.ush

@@ -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/kernel.config

@@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features
@@ -2768,7 +2771,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_MESON is not set
+CONFIG_I2C_MESON=y
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -3412,6 +3415,7 @@ CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REGULATOR_VEXPRESS is not set
 CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 # CONFIG_LIRC is not set
@@ -3436,7 +3440,7 @@ CONFIG_RC_DEVICES=y
 # CONFIG_IR_MCEUSB is not set
 # CONFIG_IR_ITE_CIR is not set
 # CONFIG_IR_FINTEK is not set
-# CONFIG_IR_MESON is not set
+CONFIG_IR_MESON=m
 # CONFIG_IR_NUVOTON is not set
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
@@ -3458,7 +3462,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3574,6 +3578,10 @@ CONFIG_USB_GSPCA=m
 # Webcam, TV (analog/digital) USB devices
 #
 # CONFIG_VIDEO_EM28XX is not set
+
+#
+# USB HDMI CEC adapters
+#
 # CONFIG_MEDIA_PCI_SUPPORT is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
@@ -3586,6 +3594,11 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
+CONFIG_CEC_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_CROS_EC_CEC is not set
+CONFIG_VIDEO_MESON_AO_CEC=m
+CONFIG_VIDEO_MESON_G12A_AO_CEC=m
+# CONFIG_CEC_GPIO is not set
 
 #
 # Supported MMC/SDIO adapters
@@ -3870,7 +3883,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-# CONFIG_DRM_DW_HDMI_CEC is not set
+CONFIG_DRM_DW_HDMI_CEC=m
 # end of Display Interface Bridges
 
 CONFIG_DRM_ETNAVIV=m
@@ -4130,15 +4143,18 @@ CONFIG_SND_SOC=y
 #
 # ASoC support for Amlogic platforms
 #
-# CONFIG_SND_MESON_AXG_FRDDR is not set
-# CONFIG_SND_MESON_AXG_TODDR is not set
-# CONFIG_SND_MESON_AXG_TDMIN is not set
-# CONFIG_SND_MESON_AXG_TDMOUT is not set
-# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
-# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
-# CONFIG_SND_MESON_AXG_SPDIFIN is not set
-# CONFIG_SND_MESON_AXG_PDM is not set
-# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+CONFIG_SND_MESON_AXG_FIFO=y
+CONFIG_SND_MESON_AXG_FRDDR=y
+CONFIG_SND_MESON_AXG_TODDR=y
+CONFIG_SND_MESON_AXG_TDM_FORMATTER=y
+CONFIG_SND_MESON_AXG_TDM_INTERFACE=y
+CONFIG_SND_MESON_AXG_TDMIN=y
+CONFIG_SND_MESON_AXG_TDMOUT=y
+CONFIG_SND_MESON_AXG_SOUND_CARD=y
+CONFIG_SND_MESON_AXG_SPDIFOUT=y
+CONFIG_SND_MESON_AXG_SPDIFIN=y
+CONFIG_SND_MESON_AXG_PDM=y
+CONFIG_SND_MESON_G12A_TOHDMITX=y
 # end of ASoC support for Amlogic platforms
 
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
@@ -4196,7 +4212,7 @@ CONFIG_SND_SOC_AK4613=m
 # CONFIG_SND_SOC_CS53L30 is not set
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_HDMI_CODEC=y
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
 # CONFIG_SND_SOC_ES8316 is not set
@@ -4205,7 +4221,7 @@ CONFIG_SND_SOC_ES7241=m
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98357A=y
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
@@ -4232,7 +4248,7 @@ CONFIG_SND_SOC_PCM3168A_I2C=m
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SPDIF=y
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
@@ -5050,7 +5066,7 @@ CONFIG_COMMON_CLK_MESON_EE_CLKC=y
 CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
 CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
-# CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_AXG_AUDIO=y
 CONFIG_COMMON_CLK_G12A=y
 # end of Common Clock Framework
 
@@ -5654,7 +5670,7 @@ CONFIG_MESON_IRQ_GPIO=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_MESON=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=y
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -5719,8 +5735,8 @@ CONFIG_RAS=y
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_BCM_OCOTP=y
-# CONFIG_MESON_EFUSE is not set
+# CONFIG_NVMEM_BCM_OCOTP is not set
+CONFIG_MESON_EFUSE=y
 # CONFIG_MESON_MX_EFUSE is not set
 
 #

buildroot-external/board/hardkernel/odroid-n2/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-n2/uboot-boot.ush

@@ -40,7 +40,6 @@ usb start
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
-#fdt addr ${fdt_addr_r}
 
 # logical volumes get numbered after physical ones.
 # 1. boot

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

@@ -1,8 +1,3 @@
-# CONFIG_USB_STORAGE is not set
 CONFIG_DOS_PARTITION=y
 # 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
+# CONFIG_USB_STORAGE is not set

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/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/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/meta

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

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,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/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
 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
@@ -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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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

@@ -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,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
 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"
@@ -90,13 +90,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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_n2_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,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-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
 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"
@@ -90,13 +90,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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_xu4_defconfig

@@ -9,8 +9,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
@@ -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="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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,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/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
 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
@@ -86,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 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
@@ -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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 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
@@ -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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 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
@@ -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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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_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="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 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
@@ -93,13 +93,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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/rpi4_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/rpi4-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -94,13 +94,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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/rpi4_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/rpi4
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -94,13 +94,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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/rpi_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/rpi $
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
 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
@@ -92,13 +92,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 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="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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/tinker_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
@@ -97,13 +97,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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="21"
+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/kernel/device-support.config

@@ -8,6 +8,19 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_SERIAL_TI=m
+
 CONFIG_USB_ACM=m
 CONFIG_USB_USBNET=m
 
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_SND_USB_AUDIO=m
+
+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=y
+CONFIG_BT_HCIBTUSB_BCM=m
+CONFIG_BT_HCIBTUSB_RTL=m

buildroot-external/meta

@@ -1,5 +1,5 @@
 VERSION_MAJOR=4
-VERSION_BUILD=0
+VERSION_BUILD=4
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/ota/rauc-hook

@@ -31,5 +31,8 @@ fi
 ##
 # Fixups
 
+# Rename CLI Hass.io
+sed -i "s/hassio:172.30.32.2/supervisor:172.30.32.2/g" /mnt/data/hassos.json
+
 
 exit 0

buildroot-external/package/hardkernel-boot/Config.in

@@ -26,4 +26,9 @@ config BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2
 
 endchoice
 
+config BR2_PACKAGE_HARDKERNEL_BOOT_FIX_MAC
+	bool "Hardkernel fix mac"
+	help
+	  Install script to fix the mac address.
+
 endif

buildroot-external/package/hardkernel-boot/hardkernel-boot.mk

@@ -82,7 +82,11 @@ define HARDKERNEL_BOOT_BUILD_CMDS
 		--bl33 $(@D)/fip/bl33.bin.enc \
 		--ddrfw1 $(@D)/fip/g12b/ddr4_1d.fw \
 		--ddrfw2 $(@D)/fip/g12b/ddr4_2d.fw \
+		--ddrfw3 $(@D)fip/g12b/ddr3_1d.fw \
 		--ddrfw4 $(@D)/fip/g12b/piei.fw \
+		--ddrfw5 $(@D)/fip/g12b/lpddr4_1d.fw \
+		--ddrfw6 $(@D)/fip/g12b/lpddr4_2d.fw \
+		--ddrfw7 $(@D)/fip/g12b/diag_lpddr4.fw \
 		--ddrfw8 $(@D)/fip/g12b/aml_ddr.fw \
 		--level v3
 

buildroot-external/package/hassos/builder/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
     && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
     && apt-get update && apt-get install -y --no-install-recommends \
-        docker-ce=5:18.09.6~3-0~ubuntu-bionic \
+        docker-ce=5:19.03.5~3-0~ubuntu-bionic \
     && rm -rf /var/lib/apt/lists/*
 
 COPY hostapp.sh /usr/bin/

buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk

@@ -103,7 +103,7 @@ define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 $(QEMU_GUEST_AGENT_PKGDIR)/qemu-guest.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/qemu-guest.service
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/qemu-guest.service \
+	ln -fs /usr/lib/systemd/system/qemu-guest.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/qemu-guest.service
 endef
 

buildroot-external/rootfs-overlay/usr/sbin/hassos-config

@@ -96,7 +96,7 @@ fi
 ##
 # Firmware update / Only USB
 UPTIME=$(awk '{printf "%0.f", $1}' /proc/uptime)
-if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ "${UPTIME}" -ge "180" ]; then
+if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ "${UPTIME}" -ge "300" ]; then
     echo "[Info] Performe a firmware update"
 
     # shellcheck disable=SC2012

buildroot-external/scripts/hdd-image.sh

@@ -45,7 +45,7 @@ function size2sectors() {
 
 
 function get_boot_size() {
-    if [ "${BOOT_SYS}" == "spl" ]; then
+    if [ "${BOOT_SPL}" == "true" ]; then
         echo "${BOOT_SIZE[1]}"
     else
         echo "${BOOT_SIZE[0]}"
@@ -138,7 +138,7 @@ function _create_disk_gpt() {
     # Partition layout
 
     # SPL
-    if [ "${BOOT_SYS}" == "spl" ]; then
+    if [ "${BOOT_SPL}" == "true" ]; then
         sgdisk -j 16384 "${hdd_img}"
     fi
 
@@ -180,10 +180,13 @@ function _create_disk_gpt() {
     dd if="${overlay_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${overlay_offset}"
     dd if="${data_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${data_offset}"
 
-    # Fix boot
+    # Set Hyprid partition
     if [ "${BOOT_SYS}" == "hyprid" ]; then
         _fix_disk_hyprid
-    elif [ "${BOOT_SYS}" == "spl" ]; then
+    fi
+
+    # Write SPL
+    if [ "${BOOT_SPL}" == "true" ]; then
         _fix_disk_spl_gpt
     fi
 }
@@ -255,8 +258,10 @@ function _create_disk_mbr() {
     dd if="${overlay_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${overlay_offset}"
     dd if="${data_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${data_offset}"
 
-    # Wripte SPL
-    _fix_disk_spl_mbr
+    # Write SPL
+    if [ "${BOOT_SPL}" == "true" ]; then
+        _fix_disk_spl_mbr
+    fi
 }
 
 

buildroot-external/scripts/ota.sh

@@ -23,7 +23,7 @@ function create_ota_update() {
     cp -f "${kernel}" "${rauc_folder}/kernel.ext4"
     cp -f "${boot}" "${rauc_folder}/boot.vfat"
     cp -f "${rootfs}" "${rauc_folder}/rootfs.img"
-    cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/rauc-hook" "${rauc_folder}/hook"
+    cp -f "${BR2_EXTERNAL_HASSOS_PATH}/ota/rauc-hook" "${rauc_folder}/hook"
 
     (
         echo "[update]"
@@ -41,7 +41,7 @@ function create_ota_update() {
     ) > "${rauc_folder}/manifest.raucm"
 
     # SPL
-    if [ "${BOOT_SYS}" == "spl" ]; then
+    if [ "${BOOT_SPL}" == "true" ]; then
         cp -f "${spl}" "${rauc_folder}/spl.img"
 
         (

buildroot-external/scripts/rauc.sh

@@ -27,7 +27,7 @@ function _write_rauc_boot() {
     ) >> "${TARGET_DIR}/etc/rauc/system.conf"
 
     # SPL
-    if ! [[ "${BOOT_SYS}" =~ (spl|mbr) ]]; then
+    if ! [ "${BOOT_SPL}" == "true" ]; then
         return 0
     fi
 
@@ -69,9 +69,9 @@ function write_rauc_config() {
 
 function install_rauc_certs() {
     if [ "${DEPLOYMENT}" == "production" ]; then
-        cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/rel-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem"
+        cp "${BR2_EXTERNAL_HASSOS_PATH}/ota/rel-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem"
     else
-        cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/dev-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem"
+        cp "${BR2_EXTERNAL_HASSOS_PATH}/ota/dev-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem"
     fi
 }
 
@@ -87,6 +87,6 @@ function install_bootloader_config() {
     # Fix MBR
     if [ "${BOOT_SYS}" == "mbr" ]; then
         mkdir -p "${TARGET_DIR}/usr/lib/udev/rules.d"
-	cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-part.rules" "${TARGET_DIR}/usr/lib/udev/rules.d/"
+	    cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-part.rules" "${TARGET_DIR}/usr/lib/udev/rules.d/"
     fi
 }

buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch

@@ -38,7 +38,7 @@ index 9988dda717..3eae7e270b 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256	f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74  rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz
-+sha256	088d094618924a90f65bb511808bbeb921e0769c878fa7baa9626954206f61a2  rpi-firmware-62a0d75b67484cb306a2a6f8fa954d9644868169.tar.gz
++sha256	32ef9f8dadbc05f3a1da3e9819f261e911f52cd05c4830a34361d989660f23b5  rpi-firmware-bf83b506b4a6f9e592e711d02871a278fad5bd1e.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 630bc670ca..fd2970333e 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -48,7 +48,7 @@ index 630bc670ca..fd2970333e 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d
-+RPI_FIRMWARE_VERSION = 62a0d75b67484cb306a2a6f8fa954d9644868169
++RPI_FIRMWARE_VERSION = bf83b506b4a6f9e592e711d02871a278fad5bd1e
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256	088d094618924a90f65bb511808bbeb921e0769c878fa7baa9626954206f61a2  rpi-firmware-62a0d75b67484cb306a2a6f8fa954d9644868169.tar.gz
+sha256	32ef9f8dadbc05f3a1da3e9819f261e911f52cd05c4830a34361d989660f23b5  rpi-firmware-bf83b506b4a6f9e592e711d02871a278fad5bd1e.tar.gz

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 62a0d75b67484cb306a2a6f8fa954d9644868169
+RPI_FIRMWARE_VERSION = bf83b506b4a6f9e592e711d02871a278fad5bd1e
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom