Revert "Use Microsoft Basic Data instead of Microsoft Reserved Partition (#847 )" (#852 )

This reverts commit 31bb38ffd4.
Merge pull request #851 from home-assistant/dev
2020-09-07 09:22:23 +00:00 · 2020-09-06 22:28:36 +02:00 · 2020-09-06 22:18:19 +02:00 · 2020-09-06 22:17:13 +02:00 · 2020-09-06 11:57:17 +02:00 · 2020-09-06 11:22:43 +02:00
327 changed files with 5348 additions and 2836 deletions
--- a/Documentation/README.md
+++ b/Documentation/README.md
@@ -0,0 +1,13 @@
+# Developer Documentation
+
+## Contents
+
+- [Getting started](./getting_started_development.md) - the place for developers to begin
+- [Development](./development.md) - more details for developers
+- [Deployment](./deployment.md) - approach to git branching and releases
+- [Configuration](./configuration.md) - how users can configure HassOS
+- [Partition](./partition.md) - partition layout
+- [Network](./network.md) - approach to networking
+- [Bluetooth](./bluetooth.md) - approach to bluetooth
+- [Kernel](./kernel.md) - kernel versions
+- [Boards](./boards/README.md) - board specific documentation
--- a/Documentation/boards/README.md
+++ b/Documentation/boards/README.md
@@ -0,0 +1,53 @@
+# Boards
+
+## Overview
+
+The following boards/devices are supported:
+
+- Raspberry Pi
+  - Pi 4 Model B (1 GB, 2 GB and 4 GB model) 32-bit (recommended)
+  - Pi 4 Model B (1 GB, 2 GB and 4 GB model) 64-bit
+  - Pi 3 Model B and B+ 32-bit (recommended)
+  - Pi 3 Model B and B+ 64-bit
+  - Pi 2 (not recommended)
+  - Pi Zero-W (not recommended)
+  - Pi (not recommended)
+- Hardkernel
+  - Odroid-C2
+  - Odroid-N2
+  - Odroid-XU4
+- Intel NUC
+  - Intel NUC5CPYH
+  - Intel NUC6CAYH
+  - Intel NUC10I3FNK2
+  - Gigabyte GB-BPCE-3455
+  - Others recent Intel NUC computers are likely to work too, only those listed above have been tested.
+- Asus
+  - Tinker Board
+- Virtual appliance (x86_64/UEFI):
+  - VMDK
+  - OVA ?
+  - VHDX ?
+  - VDI ?
+  - QCOW2 ?
+
+Notes:
+  - see ? above: are these currently supported? see ova documentation which explains issues with previous OVA distribution)
+
+## Board specifics
+
+|Board|Build|Config|Docs|
+|-----|----|------|----|
+|Pi4B 32-bit |`make rpi4`      |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi4B 64-bit |`make rpi4_64`   |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi3B 32-bit |`make rpi3`      |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi3B 64-bit |`make rpi3_64`   |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi2         |`make rpi2`      |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi Zero     |`make rpi0_w`    |[rpi0_w](../../buildroot-external/configs/rpi0_w_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi          |`make rpi`       |[rpi](../../buildroot-external/configs/rpi_defconfig)|[raspberrypi](./raspberrypi/)|
+|Odroid-C2   |`make odroid_c2` |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-N2   |`make odroid_n2` |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-XU4  |`make odroid_xu4`|[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
+|NUC         |`make intel_nuc` |[intel_nuc](../../buildroot-external/configs/intel_nuc_defconfig)|[intel](./intel/)|
+|Tinker Board|`make tinker`    |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
+|OVA         |`make ova`       |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|
--- a/Documentation/boards/asus/README.md
+++ b/Documentation/boards/asus/README.md
@@ -0,0 +1,31 @@
+# Tinker Board
+
+## Supported Hardware
+
+| Device         | Release Date  | Support | Config   |
+|----------------|---------------|---------|----------|
+| Tinker RK3288  | April 2017    | yes     | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
+| Tinker S RK3288| January 2018  | yes     | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
+| Tinker Edge T  | November 2019 | no?     |          |
+| Tinker Edge R  | November 2019 | no?     |          |
+
+## eMMC
+
+eMMC support is provided with the same image. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB. Refer to the Tinkerboard documentation how-to flash using Micro-USB and UMS.
+
+The Home Assistant OS provided U-Boot does support UMS as well,
+however manual intervention is necessary:
+
+ 1. Set the jumper between Micro-USB and HDMI the maskrom mode
+ 2. Insert SD card and connect the board via Micro-USB to your PC
+ 3. Continusly press Ctrl+C to interrupt boot
+ 4. Set the jumper back to the park position
+ 5. Start UMS using:
+```
+ums 0 mmc 0
+```
+ 6. A mass storage device should appear. Flash Home Assistant OS to it.
+
+## Serial console
+
+To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
--- a/Documentation/boards/hardkernel/README.md
+++ b/Documentation/boards/hardkernel/README.md
@@ -0,0 +1,11 @@
+# ODROID
+
+## Supported Hardware
+
+| Device         | Release Date  | Support | Config    |
+|----------------|---------------|---------|-----------|
+| ODROID-XU4     | 2015          | yes     | [odroid_xu4](../../../buildroot-external/configs/odroid_xu4_defconfig)|
+| ODROID-C2      | 2016          | yes     | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
+| ODROID-N2      | 2019          | yes     | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
+
+See separate documentation for each board.
--- a/Documentation/boards/hardkernel/odroid-xu4.md
+++ b/Documentation/boards/hardkernel/odroid-xu4.md
@@ -1,22 +1,24 @@
-# Odroid-XU4
+# ODROID-XU4

 ## eMMC

-The Odroid XU4 has a hidden boot sector that is only visible on the Odroid itself (can't be written by a card reader). There are a couple possibilities:
-1) If the eMMC already had a working image before flashing HassOS:
-* It will be booting to uBoot (but no further). 
-    * If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
-    * If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
-* Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
-* Reboot with eMMC (don't forget to flip the boot switch to eMMC)
-2) Clean/wiped/corruped boot sector:
-* You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
-* Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..
+The ODROID XU4 uses the eMMC boot partition to boot from. Typically eMMC readers can't write to this eMMC boot partition. There are a couple of possibilities:
+
+1. **Working** e.g. the eMMC already had a working image before flashing HassOS:
+   - It will be booting to U-Boot (but no further).
+     - If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
+     - If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
+   - Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
+   - Reboot with eMMC (don't forget to flip the boot switch to eMMC)
+2. **Not Working** e.g. a clean/wiped/corruped eMMC boot partition:
+   - You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
+   - Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..

 If you are getting permissions issues when using the dd command, try disabling RO:
 `echo 0 > /sys/block/mmcblk0boot0/force_ro`
 to re-enable after running dd:
 `echo 1 > /sys/block/mmcblk0boot0/force_ro`
+
 ## Console

 By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter.
--- a/Documentation/boards/intel/README.md
+++ b/Documentation/boards/intel/README.md
@@ -1,9 +1,23 @@
 # Intel NUC

-This board configuration supports the Intel NUC mini PCs and compatibles. 
-Probably most recent computers will work.
+## Supported Hardware
+
+This board configuration supports the Intel NUC mini PCs and compatibles. It should work for most recent NUC computers and, because this is a UEFI based image, it should in fact work with for any x86-64 based computer with UEFI. Hardware it has been tested with is listed below.
+
+## Tested Hardware
+
+| Device                | Release Date | Support | Config      |
+|-----------------------|--------------|---------|-------------|
+| Intel NUC5CPYH        | Q3 2015      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
+| Intel NUC6CAYH        | Q4 2016      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
+| Intel NUC10i3FNK2     | Q4 2019      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
+| Gigabyte GB-BPCE-3455 | 2017         | yes*    | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
+
+\* needs 'nomodeset' in cmdline.txt if you want a console
+
+
+## Requirements

-Requirements:
 - x86-64 support
 - UEFI boot
 - SATA/AHCI storage
@@ -13,16 +27,6 @@ Requirements:
  - Realtek Gigabit NIC (r8169)
  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)

-## Tested Hardware
-
-| Device | Quirks | 
-|--------|-----------|
-| Intel NUC5CPYH |  |
-| Intel NUC6CAYH |  |
-| Intel NUC10I3FNK2 |  |
-| Gigabyte GB-BPCE-3455 | needs 'nomodeset' in cmdline.txt if you want a console |
-
-
 ## Wifi

 The following cards are supported:
@@ -50,4 +54,3 @@ Currently there is no shiny installation method. Checklist:
 - Copy or download the hassos image into your live environment
 - zcat the image to local harddisk
 - Reboot
-
--- a/Documentation/boards/ova.md
+++ b/Documentation/boards/ova.md
@@ -1,18 +0,0 @@
-# Virtual Machine
-
-Using this VMDK in a virtual machine requires the following:
-
- Operating system: Other 4.x or later Linux (64-bit)
- Enabled support for UEFI boot
- SATA disk controller
- Minimal of 1GB RAM
- At least 2x vCPU
- An assigned network
-
-# OVA (Open Virtual Appliance)
-
-Currently, we only publish a VMDK virtual disk, due to issues with our previous OVA distribution. We are currently investigating our options to bring back the OVA distribution. However, the VMDK works on the following hypervisors:
-
- HyperV
- VirtualBox
- VMware
--- a/Documentation/boards/ova/README.md
+++ b/Documentation/boards/ova/README.md
@@ -0,0 +1,22 @@
+# Virtual Machine
+
+## Supported Hypervisors
+
+| Hypervisor          | Vendor    | Support         | Config             |
+|---------------------|-----------|-----------------|--------------------|
+| HyperV              | Microsoft | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
+| VirtualBox          | Oracle    | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
+| VMware              | VMware    | yes, via VMDK   | [ova](../../../buildroot-external/configs/ova_defconfig)              |
+
+Currently we only publish a VMDK virtual disk due to issues with our previous OVA distribution. We are investigating our options to bring back the OVA distribution, however, the VMDK works for the hypervisors listed above.
+
+## Requirements
+
+Using this VMDK in a virtual machine requires the following:
+
+- Operating system: Other 4.x or later Linux (64-bit)
+- Enabled support for UEFI boot
+- SATA disk controller
+- Minimal of 1GB RAM
+- At least 2x vCPU
+- An assigned network
--- a/Documentation/boards/raspberrypi/README.md
+++ b/Documentation/boards/raspberrypi/README.md
@@ -1,15 +1,17 @@
 # Raspberry PI

-Supported Hardware:
+## Supported Hardware

-| Device | Board |
-|--------|-----------|
-| Raspberry Pi A+/B/B+| rpi |
-| Raspberry Pi Zero | rpi |
-| Raspberry Pi Zero W | rpi0-w |
-| Raspberry Pi 2 B | rpi2 |
-| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
-| Raspberry Pi 4 B | rpi4 / rpi4-64 |
+| Device              | Release Date  | Support         | Config             |
+|---------------------|---------------|-----------------|--------------------|
+| Raspberry Pi B/B+/A+|2012/2014/2014 | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig)              |
+| Raspberry Pi 2 B    |2015           | not recommended | [rpi2](../../../buildroot-external/configs/rpi2_defconfig)             |
+| Raspberry Pi Zero   |2015           | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig)              |
+| Raspberry Pi Zero W |2017           | not recommended | [rpi0_w](../../../buildroot-external/configs/rpi0_w_defconfig)           |
+| Raspberry Pi 3 B/B+ |2016/2018      | yes             | [rpi3](../../../buildroot-external/configs/rpi3_defconfig) / [rpi3_64](../../../buildroot-external/configs/rpi3_64_defconfig) |
+| Raspberry Pi 4 B    |2019           | yes*            | [rpi4](../../../buildroot-external/configs/rpi4_defconfig) / [rpi4_64](../../../buildroot-external/configs/rpi4_64_defconfig) |
+
+\*1,2 and 4 GiB versions of the Raspberry Pi 4 B are supported. Support for the 8 GiB version is coming soon is part of #740.

 ## Limitation 64bit

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

 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 5.4.53 |
+| Open Virtual Appliance | 5.4.63 |
 | Raspberry Pi | 4.19.127 |
 | Raspberry Pi 0-W | 4.19.127 |
 | Raspberry Pi 2 | 4.19.127 |
 | Raspberry Pi 3 | 4.19.127 |
 | Raspberry Pi 4 | 4.19.127 |
-| Tinker Board | 5.4.53 |
-| Odroid-C2 | 5.7.10 |
-| Odroid-N2 | 5.7.10 |
-| Odroid-XU4 | 5.7.10 |
-| Intel NUC | 5.4.53 |
+| Tinker Board | 5.4.63 |
+| Odroid-C2 | 5.7.19 |
+| Odroid-N2 | 5.7.19 |
+| Odroid-XU4 | 5.7.19 |
+| Intel NUC | 5.4.63 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@@ -1,6 +1,6 @@
 # Network

-HassOS uses NetworkManager to control the host network.
+Home Assistant Operating System uses NetworkManager to control the host network.

 ## Configure network

--- a/9
+++ b/9
@@ -7,6 +7,13 @@ DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
 TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
 TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))

+# Set O variable if not already done on the command line
+ifneq ("$(origin O)", "command line")
+O := $(BUILDROOT)/output
+else
+override O := $(BUILDROOT)/$(O)
+endif
+
 .NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all

 .PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
@@ -23,7 +30,7 @@ $(TARGETS_CONFIG): %-config:
 $(TARGETS): %: $(RELEASE_DIR) %-config
 	@echo "build $@"
 	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
-	cp -f $(BUILDROOT)/output/images/hassos_* $(RELEASE_DIR)/
+	cp -f $(O)/images/hassos_* $(RELEASE_DIR)/

 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
--- a/README.md
+++ b/README.md
@@ -1,18 +1,52 @@
-# Home Assistant Operating system
+# Home Assistant Operating System

-Home Assistant Operating System (HassOS) is based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of hardware. It is also available as virtual appliance for different virtualization solutions. The whole system is optimized for hosting [Home Assistant](https://www.home-assistant.io) and its features (to be precise, the [Add-ons](https://www.home-assistant.io/addons/)). You can update the system by using OTA updates or offline updates.
+Home Assistant Operating System (formerly HassOS) is an operating system optimized for hosting [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).

-This is an embedded Linux which works different than a normal Linux distribution. The system is designed to run with minimal I/O and is optimized for its tasks.
+Home Assistant Operating System uses Docker as Container engine. It by default deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [buildroot](https://buildroot.org/) and it is optimized for running Home Assistant, especially on single board compute (SBC) devices like the Pi, ODROID, NUC and Tinker Board (see supported hardware below).

-If you don't have experience with embedded systems, buildroot or the build process Linux distributions, then please read up on those topics. All provided documentation here is focusing on developers with a background on embedded systems or a strong understanding of the internal workings of operating systems.
+## Features

-## Focus
+- Lightweight and memory-efficient
+- Minimized I/O
+- Over The Air (OTA) updates
+- Offline updates
+- Modular using Docker

- Barebox as bootloader on EFI
- U-Boot as bootloader
- Linux/Buildroot LTS
- RAUC for OTA updates
- SquashFS LZ4 as filesystem
- Docker-CE
- AppArmor protected
- ZRAM LZ4 for `/tmp`, `/var` and swap
+## Supported hardware
+
+- Raspberry Pi
+- Hardkernel ODROID
+- Intel NUC
+- Asus Tinker Board
+- Virtual appliances
+
+See full list and specific models [here](./Documentation/boards/README.md)
+
+## Getting Started
+
+If you just want to use Home Assistant the official [getting started guide](https://www.home-assistant.io/getting-started/) and [installation instructions](https://www.home-assistant.io/hassio/installation/) take you through how to download Home Assistant Operating System and get it running on your machine.
+
+If you're interested in finding out more about Home Assistant Operating System and how it works read on...
+
+## HassOS components
+
+- **Bootloader:**
+  - [Barebox](https://barebox.org/) for devices that support EFI
+  - [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support EFI
+- **Operating System:**
+  - [Buildroot](https://buildroot.org/) LTS Linux
+- **File Systems:**
+  - [SquashFS](https://www.kernel.org/doc/Documentation/filesystems/squashfs.txt) for read-only file systems (using LZ4 compression)
+  - [ZRAM](https://www.kernel.org/doc/Documentation/blockdev/zram.txt) for `/tmp`, `/var` and swap (using LZ4 compression)
+- **Container Platform:**
+  - [Docker Engine](https://docs.docker.com/engine/) for running Home Assistant components in containers
+- **Updates:**
+  - [RAUC](https://rauc.io/) for Over The Air (OTA) and USB updates
+- **Security:**
+  - [AppArmor](https://apparmor.net/) Linux kernel security module
+
+If you don't have experience with these, embedded systems, buildroot or the build process for Linux distributions, then please read up on these topics. The rest of the documentation in this project is for developers and assumes you have experience of embedded systems or a strong understanding of the internal workings of operating systems.
+
+## Developer Documentation
+
+All developer documentation is in the [Documentation](./Documentation) directory.
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -46,8 +46,8 @@ jobs:
          scripts/*.sh \
          buildroot-external/scripts/*.sh \
          buildroot-external/board/**/*.sh \
+          buildroot-external/ota/rauc-hook \
          buildroot-external/rootfs-overlay/usr/bin/* \
          buildroot-external/rootfs-overlay/usr/sbin/* \
          buildroot-external/rootfs-overlay/usr/libexec/* \
-          buildroot-external/rootfs-overlay/usr/lib/rauc/*
    displayName: 'Run ShellCheck'
--- a/buildroot-external/board/asus/hassos-hook.sh
+++ b/buildroot-external/board/asus/hassos-hook.sh
@@ -7,20 +7,16 @@ function hassos_pre_image() {

    cp -t "${BOOT_DATA}" \
        "${BINARIES_DIR}/boot.scr" \
-        "${BINARIES_DIR}/rk3288-tinker.dtb"
+        "${BINARIES_DIR}/rk3288-tinker.dtb" \
+        "${BINARIES_DIR}/rk3288-tinker-s.dtb"

    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"

-    # Create boot binary
-    rm -f "${BINARIES_DIR}/idbloader.img"
-    mkimage -n rk3288 -T rksd -d "${BINARIES_DIR}/u-boot-tpl.bin" "${BINARIES_DIR}/idbloader.img"
-    cat "${BINARIES_DIR}/u-boot-spl.bin" >> "${BINARIES_DIR}/idbloader.img"
-
    # SPL
    create_spl_image

    dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=12288
+    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
 }


--- a/buildroot-external/board/asus/tinker/patches/linux/0001-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0001-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch
@@ -1,7 +1,8 @@
-From 2c2e60256f2cbb2fce50a6317f85b1500efd1a6c Mon Sep 17 00:00:00 2001
+From 2ae3821fd824560ef2db3c87cfbec985177911f6 Mon Sep 17 00:00:00 2001
+Message-Id: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599249626.git.stefan@agner.ch>
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:03:26 +0100
-Subject: [PATCH] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
+Subject: [PATCH 1/2] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins

 The most essential being the RTS pin, which is clearly needed to
 upload the initial configuration into the Realtek Bluetooth
@@ -39,24 +40,25 @@ echo 1 > value &&
 sleep 1

 Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+[move change to rk3288-tinker.dtsi]
+Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rk3288-tinker.dts | 6 ++++++
- 1 file changed, 6 insertions(+)
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)

-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index d4df13bed..b92e59c1e 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -73,3 +73,9 @@
- 	status = "okay";
- 	supports-sdio;
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index acfaa12ec239..284e7982925d 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -492,6 +492,8 @@ &tsadc {
 };
-+
-+&uart0 {
+ 
+ &uart0 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
-+};
-+
+ 	status = "okay";
+ };
+ 
 -- 
-2.16.4
+2.28.0

--- a/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
@@ -0,0 +1,55 @@
+From fc25c993bf2feb6e66d55bf03eb725ec688e47eb Mon Sep 17 00:00:00 2001
+Message-Id: <fc25c993bf2feb6e66d55bf03eb725ec688e47eb.1599250914.git.stefan@agner.ch>
+In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Mon, 5 Nov 2018 22:15:14 +0100
+Subject: [PATCH 2/3] ARM: DTS: rk3288-tinker: Defining the SPI interface
+
+Taken from, and tested by @TonyMac32 .
+
+Well, the original one was tested by him but I had to adapt the
+registers definitions to the new 64-bits LPAE-compliant syntax.
+
+Therefore that *might* break, along with a few other patches.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+[move change to rk3288-tinker.dtsi]
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index 284e7982925d..d6cc66ab5bb1 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -485,6 +485,25 @@ &sdio0 {
+ 	status = "okay";
+ };
+ 
+&spi2 {
+	max-freq = <50000000>;
+	status = "okay";
+
+	spidev@0 {
+		compatible = "rockchip,spi_tinker";
+		reg = <0x0 0>;
+		spi-max-frequency = <50000000>;
+		spi-cpha = <1>;
+	};
+
+	spidev@1 {
+		compatible = "rockchip,spi_tinker";
+		reg = <0x1>;
+		spi-max-frequency = <50000000>;
+		spi-cpha = <1>;
+	};
+};
+
+ &tsadc {
+ 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+ 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+-- 
+2.28.0
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
@@ -0,0 +1,41 @@
+From 3a9d71847ae869ffdb2b0818aa86a36d57d96331 Mon Sep 17 00:00:00 2001
+Message-Id: <3a9d71847ae869ffdb2b0818aa86a36d57d96331.1599250914.git.stefan@agner.ch>
+In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Fri, 4 Sep 2020 21:57:55 +0200
+Subject: [PATCH 3/3] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
+
+Enable I2C devices which are accessible via 40-pin header.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index d6cc66ab5bb1..7af5818ac77c 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -344,10 +344,18 @@ regulator-state-mem {
+ 	};
+ };
+ 
+&i2c1 {
+	status = "okay";
+};
+
+ &i2c2 {
+ 	status = "okay";
+ };
+ 
+&i2c4 {
+	status = "okay";
+};
+
+ &i2c5 {
+ 	status = "okay";
+ };
+-- 
+2.28.0
+
--- a/buildroot-external/board/asus/tinker/patches/linux/1-2-regulator-act8865-add-restart-handler-for-act8846.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1-2-regulator-act8865-add-restart-handler-for-act8846.patch
@@ -1,74 +0,0 @@
-Patches act8846 regulator providing the proper reset handle and exploit
-the SIPC bit in GLB_POWER_OFF register. Mainly used to reset some rockchip
-boards.
-
-Origin: <https://patchwork.kernel.org/patch/6409521/>
-
-diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
-index 2ff73d7..836d10b 100644
--- a/drivers/regulator/act8865-regulator.c
-+++ b/drivers/regulator/act8865-regulator.c
-@@ -27,6 +27,7 @@
- #include <linux/regulator/of_regulator.h>
- #include <linux/regmap.h>
- #include <dt-bindings/regulator/active-semi,8865-regulator.h>
-+#include <linux/reboot.h>
- 
- /*
-  * ACT8600 Global Register Map.
-@@ -133,6 +134,8 @@
- #define	ACT8865_VOLTAGE_NUM	64
- #define ACT8600_SUDCDC_VOLTAGE_NUM	255
- 
-+#define ACT8846_SIPC_MASK 0x01
-+
- struct act8865 {
- 	struct regmap *regmap;
- 	int off_reg;
-@@ -402,6 +405,22 @@ static void act8865_power_off(void)
- 	while (1);
- }
- 
-+static int act8846_power_cycle(struct notifier_block *this,
-+	unsigned long code, void *unused)
-+{
-+	struct act8865 *act8846;
-+
-+	act8846 = i2c_get_clientdata(act8865_i2c_client);
-+	regmap_write(act8846->regmap, ACT8846_GLB_OFF_CTRL, ACT8846_SIPC_MASK);
-+
-+	return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block act8846_restart_handler = {
-+	.notifier_call = act8846_power_cycle,
-+	.priority = 129,
-+};
-+
- static int act8865_pmic_probe(struct i2c_client *client,
- 			      const struct i2c_device_id *i2c_id)
- {
-@@ -484,6 +503,8 @@ static int act8865_pmic_probe(struct i2c_client *client,
- 	}
- 
- 	if (of_device_is_system_power_controller(dev->of_node)) {
-+		int ret;
-+
- 		if (!pm_power_off && (off_reg > 0)) {
- 			act8865_i2c_client = client;
- 			act8865->off_reg = off_reg;
-@@ -492,6 +513,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
- 		} else {
- 			dev_err(dev, "Failed to set poweroff capability, already defined\n");
- 		}
-+
-+		if (type == ACT8846) {
-+			act8865_i2c_client = client;
-+			ret = register_restart_handler(&act8846_restart_handler);
-+			if (ret)
-+				pr_err("%s: cannot register restart handler, %d\n",
-+					__func__, ret);
-+		}
- 	}
- 
- 	/* Finally register devices */
--- a/buildroot-external/board/asus/tinker/patches/linux/1001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch
@@ -1,35 +0,0 @@
-From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 21:09:50 +0200
-Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node
-
-Why is the MiQi the only one left without a working mali GPU node ?
-
-Seriously, is there a rk3288 chipset WITHOUT a mali GPU ? Couldn't
-they enable it once in the DTSI, instead of defining it as "disabled"
-and enabling it in every DTS file ?
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
-index 4d923aa6..3cd60674 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
-+++ b/arch/arm/boot/dts/rk3288-miqi.dts
-@@ -149,6 +149,11 @@
- 	status = "ok";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
- &hdmi {
- 	ddc-i2c-bus = <&i2c5>;
- 	status = "okay";
-- 
-2.11.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch
@@ -1,45 +0,0 @@
-From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@1wt.eu>
-Date: Tue, 2 Aug 2016 08:31:00 +0200
-Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range
- on MiQi board
-
-The board declared too narrow a voltage range for the CPU and GPU
-regulators, preventing it from using the full CPU frequency range.
-The regulators support 712500 to 1500000 microvolts.
-
-Signed-off-by: Willy Tarreau <w@1wt.eu>
-(cherry picked from commit 95330e63a9295a2632cee8cce5db80677f01857a)
---
- arch/arm/boot/dts/rk3288-miqi.dts | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
-index 3cd60674..a1c3cdaa 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
-+++ b/arch/arm/boot/dts/rk3288-miqi.dts
-@@ -168,8 +168,8 @@
- 		fcs,suspend-voltage-selector = <1>;
- 		reg = <0x40>;
- 		regulator-name = "vdd_cpu";
-		regulator-min-microvolt = <850000>;
-		regulator-max-microvolt = <1350000>;
-+		regulator-min-microvolt = <712500>;
-+		regulator-max-microvolt = <1500000>;
- 		regulator-always-on;
- 		regulator-boot-on;
- 		regulator-enable-ramp-delay = <300>;
-@@ -182,8 +182,8 @@
- 		fcs,suspend-voltage-selector = <1>;
- 		reg = <0x41>;
- 		regulator-name = "vdd_gpu";
-		regulator-min-microvolt = <850000>;
-		regulator-max-microvolt = <1350000>;
-+		regulator-min-microvolt = <712500>;
-+		regulator-max-microvolt = <1500000>;
- 		regulator-always-on;
- 		vin-supply = <&vcc_sys>;
- 	};
-- 
-2.11.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch
@@ -1,46 +0,0 @@
-From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001
-From: Myy <myy@miouyouyou.fr>
-Date: Sun, 12 Mar 2017 19:43:15 +0000
-Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition
-
-The MiQi board is sold with an enclosure in which a fan is connected
-to the second LED output, and configured by default in "heartbeat"
-mode so that it rotates slowly and increases when the CPU load
-increases, ensuring appropriate cooling by default. This LED output
-is called "Fan" in the original kernel and connected to GPIO18
-(gpiochip 0, pin 18). Here we called it "miqi:green:fan" to stay
-consistent with the kernel's naming conventions.
-
-It's worth noting that without this patch the fan doesn't work at
-all, risking to make the board overheat.
-
-Fixes: 162718c (v4.7)
-Cc: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Willy Tarreau <w@1wt.eu>
-
-Signed-off-by: Myy <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-miqi.dts | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
-index a1c3cdaa..0e383595 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
-+++ b/arch/arm/boot/dts/rk3288-miqi.dts
-@@ -67,6 +67,13 @@
- 	leds {
- 		compatible = "gpio-leds";
- 
-+		fan {
-+			gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
-+			label = "miqi:green:fan";
-+			linux,default-trigger = "heartbeat";
-+		};
-+
-+
- 		work {
- 			gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
- 			label = "miqi:green:user";
-- 
-2.11.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch
@@ -1,98 +0,0 @@
-From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 21:58:56 +0100
-Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
-
-Adding the appropriate nodes in order to exploit the WiFi capabilities
-of the board.
-Since these capabilities are provided through SDIO, and the SDIO
-nodes were not defined, these were added too.
-
-These seems to depend on each other so they are added in one big
-patch.
-
-Split if necessary.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 62 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 1e43527aa..d4df13bed 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -6,8 +6,70 @@
- /dts-v1/;
- 
- #include "rk3288-tinker.dtsi"
-+#include <dt-bindings/clock/rockchip,rk808.h>
- 
- / {
- 	model = "Rockchip RK3288 Asus Tinker Board";
- 	compatible = "asus,rk3288-tinker", "rockchip,rk3288";
-+
-+	/* This is essential to get SDIO devices working.
-+	   The Wifi depends on SDIO ! */
-+	sdio_pwrseq: sdio-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rk808 RK808_CLKOUT1>;
-+		clock-names = "ext_clock";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
-+
-+		/*
-+		 * On the module itself this is one of these (depending
-+		 * on the actual card populated):
-+		 * - SDIO_RESET_L_WL_REG_ON
-+		 * - PDN (power down when low)
-+		 */
-+		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	wireless-wlan {
-+		compatible = "wlan-platdata";
-+		rockchip,grf = <&grf>;
-+		sdio_vref = <1800>;
-+		status = "okay";
-+		wifi_chip_type = "8723bs";
-+		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
-+	};
-+};
-+
-+&io_domains {
-+	wifi-supply = <&vcc_18>;
-+};
-+
-+&pinctrl {
-+	sdio-pwrseq {
-+		wifi_enable_h: wifienable-h {
-+			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		chip_enable_h: chip-enable-h {
-+			rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&sdio0 {
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	cap-sdio-irq;
-+	clock-frequency = <50000000>;
-+	clock-freq-min-max = <200000 50000000>;
-+	disable-wp;
-+	keep-power-in-suspend;
-+	mmc-pwrseq = <&sdio_pwrseq>;
-+	non-removable;
-+	num-slots = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
-+	sd-uhs-sdr104;
-+	status = "okay";
-+	supports-sdio;
- };
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1017-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1017-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch
@@ -1,53 +0,0 @@
-From a72e0749acad92df7b854e38e97e1dc7b4799abe Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 22:11:24 +0100
-Subject: [PATCH] ARM: DTS: rk3288-tinker: Defined the I2C interfaces
-
-And all the hardware behind.
-
-Taken from @TonyMac32, Butchered by @Miouyouyou .
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-tinker.dts | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index b92e59c1e..96d05fc6b 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -40,6 +40,31 @@
- 	};
- };
- 
-+&i2c1 {
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	afc0:af-controller@0 {
-+		status = "okay";
-+		compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
-+		reg = <0x0 0x0c>;
-+	};
-+
-+	eeprom:m24c08@50 {
-+		compatible = "at,24c08";
-+		reg = <0x50>;
-+	};
-+};
-+
-+&i2c3 {
-+	status = "okay";
-+};
-+
-+&i2c4 {
-+	status = "okay";
-+};
-+
- &io_domains {
- 	wifi-supply = <&vcc_18>;
- };
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1018-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1018-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
@@ -1,50 +0,0 @@
-From b24b8f83e150811ad54ee2a4843e44cd1421fafa Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 22:15:14 +0100
-Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
-
-Taken from, and tested by @TonyMac32 .
-
-Well, the original one was tested by him but I had to adapt the
-registers definitions to the new 64-bits LPAE-compliant syntax.
-
-Therefore that *might* break, along with a few other patches.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-tinker.dts | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 96d05fc6b..17bfea298 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -99,6 +99,25 @@
- 	supports-sdio;
- };
- 
-+&spi2 {
-+	max-freq = <50000000>;
-+	status = "okay";
-+
-+	spidev@0 {
-+		compatible = "rockchip,spi_tinker";
-+		reg = <0x0 0>;
-+		spi-max-frequency = <50000000>;
-+		spi-cpha = <1>;
-+	};
-+
-+	spidev@1 {
-+		compatible = "rockchip,spi_tinker";
-+		reg = <0x1>;
-+		spi-max-frequency = <50000000>;
-+		spi-cpha = <1>;
-+	};
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1024-arm-dts-veyron-Added-a-flag-to-disable-cache-flush-d.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1024-arm-dts-veyron-Added-a-flag-to-disable-cache-flush-d.patch
@@ -1,32 +0,0 @@
-From 9177b30ab083dbda2bede3b3d61ef71ad4b1ffe0 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Thu, 1 Nov 2018 21:31:26 +0100
-Subject: [PATCH 2/2] arm: dts: veyron: Added a flag to disable cache flush
- during reset
-
-Flushing the MMC cache of ASUS Chromebooks during initialization or
-"recovery" generates 10 minutes hangup, according to @SolidHal.
-
-This is an adaptation of @SolidHal, in order to pinpoint the fix to
-Veyron Chromebooks, and avoiding issues other RK3288 boards.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-veyron.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
-index 2075120cf..fa4951fd7 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
-+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
-@@ -123,6 +123,7 @@
- 	mmc-hs200-1_8v;
- 	mmc-pwrseq = <&emmc_pwrseq>;
- 	non-removable;
-+	no-recovery-cache-flush;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
- };
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch
@@ -27,9 +27,9 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath
 
 	usb_anchor_urb(urb, &hif_dev->regout_submitted);
 	ret = usb_submit_urb(urb, GFP_KERNEL);
-@@ -723,11 +723,11 @@
- 			return;
- 		}
+@@ -735,11 +735,11 @@
+ 
+ 		rx_buf->skb = nskb;
 
 +		usb_fill_bulk_urb(urb, hif_dev->udev,
 +				 usb_rcvbulkpipe(hif_dev->udev,
@@ -38,7 +38,7 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath
 						 USB_REG_IN_PIPE),
 				 nskb->data, MAX_REG_IN_BUF_SIZE,
 +				 ath9k_hif_usb_reg_in_cb, nskb);
-				 ath9k_hif_usb_reg_in_cb, nskb, 1);
+-				 ath9k_hif_usb_reg_in_cb, rx_buf, 1);
 	}
 
 resubmit:
--- a/buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch
@@ -1,25 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index f88c913ff..7f04ccbdf 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -547,3 +547,20 @@
- &gpiomem {
-     status = "okay";
- };
-+
-+&emmc {
-+    bus-width = <8>;
-+    cap-mmc-highspeed;
-+    non-removable;
-+    pinctrl-names = "default";
-+    pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
-+    max-frequency = <150000000>;
-+    mmc-hs200-1_8v;
-+    mmc-ddr-1_8v;
-+    status = "okay";
-+};
-+
-+&hdmi {
-+    pinctrl-names = "default";
-+    pinctrl-0 = <&hdmi_cec_c0>;
-+};
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-device-tree.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-device-tree.patch
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-dts-makefile.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-dts-makefile.patch
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 37a3de760..6bcfceede 100644
--- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -832,6 +832,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
- 	rk3188-radxarock.dtb \
- 	rk3228-evb.dtb \
- 	rk3229-evb.dtb \
-+	rk3288-xt-q8l-v10.dtb \
- 	rk3229-xms6.dtb \
- 	rk3288-evb-act8846.dtb \
- 	rk3288-evb-rk808.dtb \
-
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-remote-keymap.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-remote-keymap.patch
@@ -1,103 +0,0 @@
-diff --git a/drivers/media/rc/keymaps/rc-xt-q8l-v10.c b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
-index e69de29..19c7d9e 100644
--- /dev/null
-+++ b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
-@@ -0,0 +1,76 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// rc-xt-q8l-v10.c - Keytable for xt-q8l-v10 tv box remote controller
-+//
-+// keymap imported from ir-keymaps.c
-+//
-+// Copyright (c) 2018 Paolo Sabatino
-+
-+#include <media/rc-map.h>
-+#include <linux/module.h>
-+
-+/*
-+
-+*/
-+
-+static struct rc_map_table xt_q8l_v10[] = {
-+	
-+	{ 0xcc1d11, KEY_ENTER },
-+	{ 0xcc1d00, KEY_POWER },
-+	{ 0xcc1d15, KEY_PLAYPAUSE },
-+	{ 0xcc1d16, KEY_STOP },
-+	{ 0xcc1d06, KEY_PREVIOUSSONG },
-+	{ 0xcc1d0a, KEY_NEXTSONG },
-+	{ 0xcc1d41, KEY_1 },
-+	{ 0xcc1d45, KEY_2 },
-+	{ 0xcc1d4d, KEY_3 },
-+	{ 0xcc1d42, KEY_4 },
-+	{ 0xcc1d46, KEY_5 },
-+	{ 0xcc1d4e, KEY_6 },
-+	{ 0xcc1d43, KEY_7 },
-+	{ 0xcc1d47, KEY_8 },
-+	{ 0xcc1d4f, KEY_9 },
-+	{ 0xcc1d49, KEY_0 },
-+	{ 0xcc1d4a, KEY_BACKSPACE },
-+	{ 0xcc1d48, KEY_F6 },
-+	{ 0xcc1d03, KEY_HOME },
-+	{ 0xcc1d0f, KEY_BACK },
-+	{ 0xcc1d40, KEY_MENU },
-+	{ 0xcc1d4c, KEY_TEXT },
-+	{ 0xcc1d10, KEY_LEFT },
-+	{ 0xcc1d12, KEY_RIGHT },
-+	{ 0xcc1d44, KEY_DOWN },
-+	{ 0xcc1d07, KEY_UP },
-+	{ 0xcc1d02, KEY_VOLUMEDOWN },
-+	{ 0xcc1d0c, KEY_MUTE },
-+	{ 0xcc1d0e, KEY_VOLUMEUP },
-+	{ 0xcc1d01, KEY_F1 },
-+	{ 0xcc1d05, KEY_F2 },
-+	{ 0xcc1d09, KEY_F3 },
-+	{ 0xcc1d0d, KEY_F4 },
-+	
-+};
-+
-+static struct rc_map_list xt_q8l_v10_map = {
-+	.map = {
-+		.scan     = xt_q8l_v10,
-+		.size     = ARRAY_SIZE(xt_q8l_v10),
-+		.rc_proto = RC_PROTO_NEC,	/* Legacy IR type */
-+		.name     = RC_MAP_XT_Q8L_V10,
-+	}
-+};
-+
-+static int __init init_rc_map_xt_q8l_v10(void)
-+{
-+	return rc_map_register(&xt_q8l_v10_map);
-+}
-+
-+static void __exit exit_rc_map_xt_q8l_v10(void)
-+{
-+	rc_map_unregister(&xt_q8l_v10_map);
-+}
-+
-+module_init(init_rc_map_xt_q8l_v10)
-+module_exit(exit_rc_map_xt_q8l_v10)
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Paolo Sabatino");
-diff --git a/include/media/rc-map.h b/include/media/rc-map.h
-index d621acadf..ad7abdb97 100644
--- a/include/media/rc-map.h
-+++ b/include/media/rc-map.h
-@@ -278,6 +278,7 @@ struct rc_map *rc_map_get(const char *name);
- #define RC_MAP_WINFAST_USBII_DELUXE      "rc-winfast-usbii-deluxe"
- #define RC_MAP_SU3000                    "rc-su3000"
- #define RC_MAP_XBOX_DVD                  "rc-xbox-dvd"
-+#define RC_MAP_XT_Q8L_V10                "rc-xt-q8l-v10"
- #define RC_MAP_X96MAX                    "rc-x96max"
- 
- /*
-diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
-index 5b1399af6..ec9ce1206 100644
--- a/drivers/media/rc/keymaps/Makefile
-+++ b/drivers/media/rc/keymaps/Makefile
-@@ -117,4 +117,5 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
- 			rc-winfast-usbii-deluxe.o \
- 			rc-su3000.o \
- 			rc-xbox-dvd.o \
-+			rc-xt-q8l-v10.o \
- 			rc-x96max.o \
--- a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
@@ -0,0 +1,37 @@
+From 74e929bc4713b76f58a8df82019d74078b4b8d0c Mon Sep 17 00:00:00 2001
+Message-Id: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 24 Apr 2020 12:41:50 +0000
+Subject: [PATCH 1/3] SPL: modify load address of U-Boot
+
+Default load address of U-Boot is at sector 16384, which is where HAOS
+has its first partition. Use 0x2000 (8192) instead.
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ configs/tinker-rk3288_defconfig   | 1 +
+ configs/tinker-s-rk3288_defconfig | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
+index 83c3450839..574a711a32 100644
+--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
+@@ -84,3 +84,4 @@ CONFIG_USB_ETHER_ASIX=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_CMD_DHRYSTONE=y
+ CONFIG_ERRNO_STR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
+diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
+index 4925b14821..df047785ea 100644
+--- a/configs/tinker-s-rk3288_defconfig
+++ b/configs/tinker-s-rk3288_defconfig
+@@ -90,3 +90,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_CMD_DHRYSTONE=y
+ CONFIG_ERRNO_STR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
+-- 
+2.28.0
+
--- a/buildroot-external/board/asus/tinker/patches/uboot/0001-TLP-Modify-entrypoint-for-u-boot.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0001-TLP-Modify-entrypoint-for-u-boot.patch
@@ -1,23 +0,0 @@
-From 17735a28503d90db2a7173816861750f475580ea Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH 1/1] TLP: Modify entrypoint for u-boot
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
- configs/tinker-rk3288_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index 83c3450839..648a7904be 100644
--- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -84,3 +84,5 @@ CONFIG_USB_ETHER_ASIX=y
- CONFIG_USB_ETHER_SMSC95XX=y
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x3000
-+
-- 
-2.17.1
-
--- a/buildroot-external/board/asus/tinker/patches/uboot/0002-rockchip-dts-tinker-move-i2c-node-to-shared-device-t.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0002-rockchip-dts-tinker-move-i2c-node-to-shared-device-t.patch
@@ -0,0 +1,55 @@
+From 683783c7253981c0d4c3b772aeb1f9bda833e2be Mon Sep 17 00:00:00 2001
+Message-Id: <683783c7253981c0d4c3b772aeb1f9bda833e2be.1599227174.git.stefan@agner.ch>
+In-Reply-To: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
+References: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Fri, 4 Sep 2020 15:40:55 +0200
+Subject: [PATCH 2/3] rockchip: dts: tinker: move i2c node to shared device
+ tree
+
+The I2C EEPROM is present on Tinker Board S as well. Move the i2c node
+to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
+
+Cc: Jonas Karlman <jonas@kwiboo.se>
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++
+ arch/arm/dts/rk3288-tinker.dts         | 7 -------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+index 732aa4f91f..3d169906fd 100644
+--- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+@@ -17,6 +17,13 @@
+ 	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
+ };
+ 
+&i2c2 {
+    m24c08@50 {
+        compatible = "at,24c08", "i2c-eeprom";
+        reg = <0x50>;
+    };
+};
+
+ &pinctrl {
+ 	u-boot,dm-pre-reloc;
+ };
+diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
+index 4b8405fd82..338670123b 100644
+--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
+@@ -35,10 +35,3 @@
+ 	vbus-supply = <&vcc5v0_host>;
+ 	status = "okay";
+ };
+-
+-&i2c2 {
+-    m24c08@50 {
+-        compatible = "at,24c08", "i2c-eeprom";
+-        reg = <0x50>;
+-    };
+-};
+-- 
+2.28.0
+
--- a/buildroot-external/board/asus/tinker/patches/uboot/0003-rockchip-dts-tinker-remove-unnecessary-node.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0003-rockchip-dts-tinker-remove-unnecessary-node.patch
@@ -0,0 +1,34 @@
+From 2af46619bb66af62bbfd2a880fe57d6dd0ec43fe Mon Sep 17 00:00:00 2001
+Message-Id: <2af46619bb66af62bbfd2a880fe57d6dd0ec43fe.1599227174.git.stefan@agner.ch>
+In-Reply-To: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
+References: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Fri, 4 Sep 2020 15:44:38 +0200
+Subject: [PATCH 3/3] rockchip: dts: tinker: remove unnecessary node
+
+The property reg-shift with the same value is present in the base
+device tree already. Remove unnecessary node from rk3288-tinker.dts.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/dts/rk3288-tinker.dts | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
+index 338670123b..8b1848c310 100644
+--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
+@@ -27,10 +27,6 @@
+ 	status = "okay";
+ };
+ 
+-&uart2 {
+-	reg-shift = <2>;
+-};
+-
+ &usb_host1 {
+ 	vbus-supply = <&vcc5v0_host>;
+ 	status = "okay";
+-- 
+2.28.0
+
--- a/buildroot-external/board/asus/tinker/uboot-boot.ush
+++ b/buildroot-external/board/asus/tinker/uboot-boot.ush
@@ -27,7 +27,11 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline

 # Load device tree
-fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
+if test "$devnum" = "0"; then
+  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker-s.dtb
+else
+  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
+fi

 setenv bootargs
 for BOOT_SLOT in "${BOOT_ORDER}"; do
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@@ -18,13 +18,6 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-# Board bootargs
-setenv bootargs_odroidc2 ""
-
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"

@@ -57,14 +50,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_a} rauc.slot=A ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
    fi
  elif test "x${BOOT_SLOT}" = "xB"; then
    if test ${BOOT_B_LEFT} -gt 0; then
      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_b} rauc.slot=B ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
    fi
  fi
 done
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot.config
@@ -1,3 +1,4 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
+CONFIG_DISPLAY_BOARDINFO=y
--- a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
@@ -7,7 +7,7 @@ function hassos_pre_image() {
    local SPL_IMG="$(path_spl_img)"

    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BINARIES_DIR}/meson-g12b-odroid-n2.dtb" "${BOOT_DATA}/meson-g12b-odroid-n2.dtb"
+    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"

    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"

--- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
@@ -18,13 +18,6 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-# Board bootargs
-setenv bootargs_odroidn2 ""
-
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"

@@ -36,7 +29,11 @@ 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
+if test "${board_rev}" = "c"; then
+  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2-plus.dtb
+else
+  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
+fi

 # logical volumes get numbered after physical ones.
 # 1. boot
@@ -57,14 +54,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_a} rauc.slot=A ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
    fi
  elif test "x${BOOT_SLOT}" = "xB"; then
    if test ${BOOT_B_LEFT} -gt 0; then
      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidn2} ${bootargs_b} rauc.slot=B ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
    fi
  fi
 done
--- a/buildroot-external/board/hardkernel/odroid-n2/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot.config
@@ -1,3 +1,4 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
+CONFIG_DISPLAY_BOARDINFO=y
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
@@ -20,13 +20,6 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-# Board bootargs
-setenv bootargs_odroidxu4 ""
-
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"

@@ -61,14 +54,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} zImage"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_a} rauc.slot=A ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
    fi
  elif test "x${BOOT_SLOT}" = "xB"; then
    if test ${BOOT_B_LEFT} -gt 0; then
      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} zImage"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_b} rauc.slot=B ${cmdline}"
+      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
    fi
  fi
 done
--- a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch
--- a/buildroot-external/board/hardkernel/patches/linux/0009-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0009-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch
@@ -0,0 +1,32 @@
+From 54d8ae2ae7a10dab6998b2d4ac507aec96c6f1da Mon Sep 17 00:00:00 2001
+Message-Id: <54d8ae2ae7a10dab6998b2d4ac507aec96c6f1da.1595882680.git.stefan@agner.ch>
+In-Reply-To: <d83d79b085486a605462fa91e3c6746e4ff0b263.1595882680.git.stefan@agner.ch>
+References: <d83d79b085486a605462fa91e3c6746e4ff0b263.1595882680.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Sun, 19 Jul 2020 14:10:33 +0000
+Subject: [PATCH 09/10] dt-bindings: arm: amlogic: add support for the
+ ODROID-N2+
+
+HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports
+higher cpu clock speeds than the original ODROID-N2.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index f74aba48cec1..915ef4f355ad 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -149,6 +149,7 @@ properties:
+         items:
+           - enum:
+               - hardkernel,odroid-n2
+              - hardkernel,odroid-n2-plus
+               - khadas,vim3
+               - ugoos,am6
+           - const: amlogic,s922x
+-- 
+2.27.0
+
--- a/buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-add-support-for-the-ODROID-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-add-support-for-the-ODROID-N2.patch
@@ -0,0 +1,97 @@
+From 188bc924b34b7d845324eb2e0e7493a9eaeb2cb5 Mon Sep 17 00:00:00 2001
+Message-Id: <188bc924b34b7d845324eb2e0e7493a9eaeb2cb5.1595882680.git.stefan@agner.ch>
+In-Reply-To: <d83d79b085486a605462fa91e3c6746e4ff0b263.1595882680.git.stefan@agner.ch>
+References: <d83d79b085486a605462fa91e3c6746e4ff0b263.1595882680.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Sun, 19 Jul 2020 14:10:34 +0000
+Subject: [PATCH 10/10] arm64: dts: meson: add support for the ODROID-N2+
+
+HardKernel ODROID-N2+ uses an Amlogic S922X rev. C chip capable of higher
+clock speeds than the original ODROID-N2. Hardkernel supports the big cpu
+cluster at 2.4GHz and the little cpu cluster at 2.0GHz. Opp points and
+regulator changess are from the HardKernel Linux kernel sources.
+
+Suggested-by: Dongjin Kim <tobetter@hardkernel.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+[Integrated Neil Armstrong's feedback from mailing list]
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |  1 +
+ .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 53 +++++++++++++++++++
+ 2 files changed, 54 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index eef0045320f2..7524cf9680f5 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+new file mode 100644
+index 000000000000..4ebb448d233f
+--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-odroid-n2.dtsi"
+
+/ {
+	compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
+	model = "Hardkernel ODROID-N2+";
+};
+
+&vddcpu_a {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_ab 0 1500 0>;
+};
+
+&vddcpu_b {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_AO_cd 1 1500 0>;
+};
+
+&cpu_opp_table_0 {
+	opp-1908000000 {
+		opp-hz = /bits/ 64 <1908000000>;
+		opp-microvolt = <1030000>;
+	};
+
+	opp-2016000000 {
+		opp-hz = /bits/ 64 <2016000000>;
+		opp-microvolt = <1040000>;
+	};
+};
+
+&cpub_opp_table_1 {
+	opp-2304000000 {
+		opp-hz = /bits/ 64 <2304000000>;
+		opp-microvolt = <1030000>;
+	};
+
+	opp-2400000000 {
+		opp-hz = /bits/ 64 <2400000000>;
+		opp-microvolt = <1040000>;
+	};
+};
+
+-- 
+2.27.0
+
--- a/buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch
@@ -0,0 +1,38 @@
+From c33df0ebe8be16b56741ce7f873221ab9087a0a6 Mon Sep 17 00:00:00 2001
+Message-Id: <c33df0ebe8be16b56741ce7f873221ab9087a0a6.1598564789.git.stefan@agner.ch>
+In-Reply-To: <f72fc1866396fed30036e0f06007c15217e47f22.1598564789.git.stefan@agner.ch>
+References: <f72fc1866396fed30036e0f06007c15217e47f22.1598564789.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 27 Aug 2020 23:29:57 +0200
+Subject: [PATCH 11/11] clk: meson: g12a: mark fclk_div2 as critical
+
+On Amlogic Meson G12b platform, similar to fclk_div3, the fclk_div2
+seems to be necessary for the system to operate correctly as well.
+
+Typically, the clock also gets chosen by the eMMC peripheral. This
+probably masked the problem so far. However, when booting from a SD
+card the clock seems to get disabled which leads to a system freeze.
+
+Let's mark this clock as critical, fixing boot from SD card on G12b
+platforms.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/clk/meson/g12a.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
+index fad616cac01e..2214b974f748 100644
+--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
+@@ -298,6 +298,7 @@ static struct clk_regmap g12a_fclk_div2 = {
+ 			&g12a_fclk_div2_div.hw
+ 		},
+ 		.num_parents = 1,
+		.flags = CLK_IS_CRITICAL,
+ 	},
+ };
+ 
+-- 
+2.28.0
+
--- a/buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch
+++ b/buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch
@@ -37,7 +37,7 @@ index e60dc3a622..d4028c6a39 100644
 +		len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
 +					  efuse_mac_addr, EFUSE_MAC_SIZE);
 +		if (len != EFUSE_MAC_SIZE)
-+			return 0; 
+			return 0;
 +
 +		for (int i = 0; i < 6; i++){
 +			buff[0] = efuse_mac_addr[i * 2];
--- a/buildroot-external/board/hardkernel/patches/uboot/0002-ARM-meson-isolate-loading-of-socinfo.patch
+++ b/buildroot-external/board/hardkernel/patches/uboot/0002-ARM-meson-isolate-loading-of-socinfo.patch
@@ -0,0 +1,63 @@
+From fb41bcaf0e61e78bc40addb1312040a2bc6a69b7 Mon Sep 17 00:00:00 2001
+Message-Id: <fb41bcaf0e61e78bc40addb1312040a2bc6a69b7.1598875349.git.stefan@agner.ch>
+In-Reply-To: <c12338d22649e46aed12ebe60d897112f045fda9.1598875349.git.stefan@agner.ch>
+References: <c12338d22649e46aed12ebe60d897112f045fda9.1598875349.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 31 Aug 2020 13:40:18 +0200
+Subject: [PATCH 2/4] ARM: meson: isolate loading of socinfo
+
+Move loading of socinfo into a separate function so the value can be
+reused later.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/mach-meson/board-info.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
+index 0d3b40a249..e305d60dca 100644
+--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
+@@ -123,12 +123,16 @@ static void print_board_model(void)
+ 	printf("Model: %s\n", model ? model : "Unknown");
+ }
+ 
+-int show_board_info(void)
+static unsigned int get_socinfo(void)
+ {
+ 	struct regmap *regmap;
+ 	int nodeoffset, ret;
+ 	ofnode node;
+-	unsigned int socinfo;
+	static unsigned int socinfo = 0;
+
+	/* Empty socinfo is invalid, so !socinfo is successfully initialized */
+	if (socinfo)
+		return socinfo;
+ 
+ 	/* find the offset of compatible node */
+ 	nodeoffset = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
+@@ -155,8 +159,20 @@ int show_board_info(void)
+ 		return 0;
+ 	}
+ 
+	return socinfo;
+}
+
+int show_board_info(void)
+{
+	unsigned int socinfo;
+
+ 	/* print board information */
+ 	print_board_model();
+
+	socinfo = get_socinfo();
+	if (!socinfo)
+		return 0;
+
+ 	printf("SoC:   Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n",
+ 	       socinfo_to_soc_id(socinfo),
+ 	       socinfo_to_package_id(socinfo),
+-- 
+2.28.0
+
--- a/buildroot-external/board/hardkernel/patches/uboot/0003-meson-Add-board_rev-to-env.patch
+++ b/buildroot-external/board/hardkernel/patches/uboot/0003-meson-Add-board_rev-to-env.patch
@@ -0,0 +1,82 @@
+From 15ce807d420324bc209772b843d4004619e0cdaf Mon Sep 17 00:00:00 2001
+Message-Id: <15ce807d420324bc209772b843d4004619e0cdaf.1598875349.git.stefan@agner.ch>
+In-Reply-To: <c12338d22649e46aed12ebe60d897112f045fda9.1598875349.git.stefan@agner.ch>
+References: <c12338d22649e46aed12ebe60d897112f045fda9.1598875349.git.stefan@agner.ch>
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Tue, 4 Aug 2020 13:50:57 +0000
+Subject: [PATCH 3/4] meson: Add board_rev to env
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/include/asm/arch-meson/boot.h |  4 ++++
+ arch/arm/mach-meson/board-info.c       | 12 ++++++++++++
+ board/amlogic/w400/w400.c              |  5 +++++
+ 3 files changed, 21 insertions(+)
+
+diff --git a/arch/arm/include/asm/arch-meson/boot.h b/arch/arm/include/asm/arch-meson/boot.h
+index a90fe55081..c67d12d06c 100644
+--- a/arch/arm/include/asm/arch-meson/boot.h
+++ b/arch/arm/include/asm/arch-meson/boot.h
+@@ -7,6 +7,8 @@
+ #ifndef __MESON_BOOT_H__
+ #define __MESON_BOOT_H__
+ 
+#include <linux/types.h>
+
+ /* Boot device */
+ #define BOOT_DEVICE_RESERVED    0
+ #define BOOT_DEVICE_EMMC        1
+@@ -17,4 +19,6 @@
+ 
+ int meson_get_boot_device(void);
+ 
+int meson_get_soc_rev(char *buff, size_t buff_len);
+
+ #endif /* __MESON_BOOT_H__ */
+diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
+index e305d60dca..3c40d6cd27 100644
+--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
+@@ -183,3 +183,15 @@ int show_board_info(void)
+ 
+ 	return 0;
+ }
+
+int meson_get_soc_rev(char *buff, size_t buff_len)
+{
+	unsigned int socinfo;
+
+	socinfo = get_socinfo();
+	if (!socinfo)
+		return -1;
+
+	/* Write SoC info */
+	return snprintf(buff, buff_len, "%x", socinfo_to_minor(socinfo));
+}
+diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c
+index d74aab899a..cb2e5edf5e 100644
+--- a/board/amlogic/w400/w400.c
+++ b/board/amlogic/w400/w400.c
+@@ -10,6 +10,7 @@
+ #include <asm/io.h>
+ #include <asm/arch/sm.h>
+ #include <asm/arch/eth.h>
+#include <asm/arch/boot.h>
+ 
+ #define EFUSE_MAC_OFFSET	20
+ #define EFUSE_MAC_SIZE		12
+@@ -20,6 +21,10 @@ int misc_init_r(void)
+ 	char efuse_mac_addr[EFUSE_MAC_SIZE], buff[3];
+ 	ssize_t len;
+ 
+	if (meson_get_soc_rev(buff, sizeof(buff))) {
+		env_set("board_rev", buff);
+	}
+
+ 	meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
+ 
+ 	if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
+-- 
+2.28.0
+
--- a/buildroot-external/board/intel/ova/home-assistant.ovf
+++ b/buildroot-external/board/intel/ova/home-assistant.ovf
@@ -13,8 +13,9 @@
      <Description>Logical network used by this appliance.</Description>
    </Network>
  </NetworkSection>
-  <VirtualSystem ovf:id="Home Assistant">
+  <VirtualSystem ovf:id="HomeAssistant">
    <Info>A virtual machine</Info>
+    <Name>Home Assistant</Name>
    <ProductSection>
      <Info>Meta-information about the installed software</Info>
      <Product>Operating-System</Product>
--- a/buildroot-external/board/raspberrypi/hassos-hook.sh
+++ b/buildroot-external/board/raspberrypi/hassos-hook.sh
@@ -13,14 +13,13 @@ function hassos_pre_image() {

    # Firmware
    if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
-        cp -t "${BOOT_DATA}" \
-        "${BINARIES_DIR}/rpi-firmware/fixup4.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start4.elf"
+        cp "${BINARIES_DIR}/rpi-firmware/fixup.dat" "${BOOT_DATA}/fixup4.dat" 
+        cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf" 
    else
        cp -t "${BOOT_DATA}" \
-        "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start.elf" \
-        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
+            "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
+            "${BINARIES_DIR}/rpi-firmware/start.elf" \
+            "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
    fi

    # Set cmd options
--- a/buildroot-external/board/raspberrypi/kernel.config
+++ b/buildroot-external/board/raspberrypi/kernel.config
@@ -0,0 +1,2 @@
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
--- a/buildroot-external/board/raspberrypi/patches/linux/0001-brcmfmac-add-FT-based-AKMs-in-brcmf_set_key_mgmt-for.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0001-brcmfmac-add-FT-based-AKMs-in-brcmf_set_key_mgmt-for.patch
@@ -0,0 +1,50 @@
+From d6fc5f89ac905cb3efc9c61ce79dbfad5d91883b Mon Sep 17 00:00:00 2001
+Message-Id: <d6fc5f89ac905cb3efc9c61ce79dbfad5d91883b.1597690408.git.stefan@agner.ch>
+From: Chung-Hsien Hsu <stanley.hsu@cypress.com>
+Date: Wed, 15 Aug 2018 05:32:39 -0500
+Subject: [PATCH] brcmfmac: add FT-based AKMs in brcmf_set_key_mgmt() for FT
+ support
+
+Add WLAN_AKM_SUITE_FT_8021X and WLAN_AKM_SUITE_FT_PSK in
+brcmf_set_key_mgmt() for FT support.
+
+Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
+Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++
+ .../net/wireless/broadcom/brcm80211/include/brcmu_wifi.h    | 1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+index 71b7e5c19434..c312626c0a27 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+@@ -1649,6 +1649,12 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
+ 		case WLAN_AKM_SUITE_PSK:
+ 			val = WPA2_AUTH_PSK;
+ 			break;
+		case WLAN_AKM_SUITE_FT_8021X:
+			val = WPA2_AUTH_UNSPECIFIED | WPA2_AUTH_FT;
+			break;
+		case WLAN_AKM_SUITE_FT_PSK:
+			val = WPA2_AUTH_PSK | WPA2_AUTH_FT;
+			break;
+ 		default:
+ 			brcmf_err("invalid cipher group (%d)\n",
+ 				  sme->crypto.cipher_group);
+diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
+index 75b2a0438cfa..dddebaa60352 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
+@@ -239,6 +239,7 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)
+ #define WPA2_AUTH_RESERVED4	0x0400
+ #define WPA2_AUTH_RESERVED5	0x0800
+ #define WPA2_AUTH_1X_SHA256	0x1000  /* 1X with SHA256 key derivation */
+#define WPA2_AUTH_FT		0x4000	/* Fast BSS Transition */
+ #define WPA2_AUTH_PSK_SHA256	0x8000	/* PSK with SHA256 key derivation */
+ 
+ #define DOT11_DEFAULT_RTS_LEN		2347
+-- 
+2.28.0
+
--- a/buildroot-external/configs/intel_nuc_defconfig
+++ b/buildroot-external/configs/intel_nuc_defconfig
@@ -22,7 +22,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.53"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63"
 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
@@ -80,6 +80,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -22,7 +22,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.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.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"
@@ -71,6 +71,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -22,13 +22,13 @@ 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.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-odroid-n2"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-odroid-n2 amlogic/meson-g12b-odroid-n2-plus"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -71,6 +71,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -23,7 +23,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.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 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
@@ -73,6 +73,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -23,7 +23,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.53"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63"
 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
@@ -71,6 +71,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi0_w_defconfig
+++ b/buildroot-external/configs/rpi0_w_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
@@ -74,6 +74,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b bcm2710-rpi-2-b"
@@ -73,6 +73,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -74,6 +74,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -74,6 +74,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 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_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
@@ -75,6 +75,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 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_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
@@ -75,6 +75,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/rpi_defconfig
+++ b/buildroot-external/configs/rpi_defconfig
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cc39f1c9f82f6fe5a437836811d906c709e0661c.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -73,6 +73,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -24,13 +24,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.53"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker rk3288-tinker-s"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -75,6 +75,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 # BR2_PACKAGE_SYSTEMD_RESOLVED is not set
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
@@ -88,7 +89,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config"
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
--- a/buildroot-external/kernel/device-support.config
+++ b/buildroot-external/kernel/device-support.config
@@ -24,6 +24,9 @@ CONFIG_BT_HCIBTUSB=y
 CONFIG_BT_HCIBTUSB_BCM=m
 CONFIG_BT_HCIBTUSB_RTL=m

+CONFIG_RTL_CARDS=y
+CONFIG_RTL8192CU=m
+
 # Multimedia core support
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
--- a/buildroot-external/kernel/docker.config
+++ b/buildroot-external/kernel/docker.config
@@ -71,6 +71,8 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_OVERLAY_FS=y
+CONFIG_OVERLAY_FS_REDIRECT_DIR=y
+CONFIG_OVERLAY_FS_METACOPY=y

 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -1,5 +1,5 @@
 VERSION_MAJOR=5
-VERSION_BUILD=0
+VERSION_BUILD=2

 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@@ -2,29 +2,46 @@

 ##
 # Hooks
+env

 # Handle boot hocks
 if [ "${RAUC_SLOT_CLASS}" = "boot" ]; then
-    BOOT_DATA=/tmp/boot-data
+    BOOT_TMP=/tmp/boot-tmp
+    BOOT_NEW=/tmp/boot-new
+    BOOT_MNT=/mnt/boot

-    mkdir -p ${BOOT_DATA}
-    if [ "${1}" = "slot-pre-install" ]; then
-        cp -f ${RAUC_SLOT_MOUNT_POINT}/*.txt ${BOOT_DATA}/
-    elif [ "${1}" = "slot-post-install" ]; then
-        cp -f ${BOOT_DATA}/*.txt ${RAUC_SLOT_MOUNT_POINT}/
+    mkdir -p "${BOOT_TMP}"
+    mkdir -p "${BOOT_NEW}"
+
+    # Mount boot
+    if ! systemctl -q is-active mnt-boot.mount; then
+        systemctl start mnt-boot.mount
    fi
+    mount "${RAUC_IMAGE_NAME}" "${BOOT_NEW}"
+
+    # Backup boot config
+    cp -f "${BOOT_MNT}"/*.txt "${BOOT_TMP}/"
+
+    # Update
+    cp -rf "${BOOT_NEW}"/* "${BOOT_MNT}/"
+
+    # Restore boot config
+    cp -f "${BOOT_TMP}"/*.txt "${BOOT_MNT}/"
+
+    umount "${BOOT_NEW}"
+    rm -rf "${BOOT_TMP}" "${BOOT_NEW}"
 fi

 # Handle spl install
 if [ "${RAUC_SLOT_CLASS}" = "spl" ]; then
    DEVICE_CHILD="$(findfs LABEL="hassos-boot")"
-    DEVICE_ROOT="/dev/$(lsblk -no pkname ${DEVICE_CHILD})"
+    DEVICE_ROOT="/dev/$(lsblk -no pkname "${DEVICE_CHILD}")"

-    if sfdisk -dq ${DEVICE_ROOT} | grep -q 'label: gpt'; then
-        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=512 seek=2 skip=2
+    if sfdisk -dq "${DEVICE_ROOT}" | grep -q 'label: gpt'; then
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc bs=512 seek=2 skip=2
    else
-        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=1 count=440
-        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=512 seek=1 skip=1
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc bs=1 count=440
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc bs=512 seek=1 skip=1
    fi
 fi

--- a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
@@ -1,5 +1,5 @@
 [Unit]
-RequiresMountsFor=/etc/docker /mnt/data
+RequiresMountsFor=/etc/docker /mnt/data /var/lib/docker

 [Service]
 ExecStart=
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf
@@ -1,3 +0,0 @@
-[Unit]
-Requires=docker.service
-After=docker.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
@@ -1,2 +0,0 @@
-[Service]
-TTYVTDisallocate=no
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf
@@ -1,3 +0,0 @@
-[Unit]
-Requires=docker.service
-After=docker.service
--- a/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install
+++ b/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl start mnt-boot.mount
--- a/buildroot-external/rootfs-overlay/usr/lib/rauc/pre-install
+++ b/buildroot-external/rootfs-overlay/usr/lib/rauc/pre-install
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl stop mnt-boot.mount
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
@@ -3,7 +3,7 @@ Description=HassOS supervisor
 Requires=docker.service
 Wants=network-online.target
 After=docker.service rauc.service dbus.socket network-online.target
-RequiresMountsFor=/mnt/data
+RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5

--- a/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand
+++ b/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand
@@ -11,7 +11,7 @@ PART_NUM="${DEVICE_CHILD: -1}"

 # Need resize
 UNUSED=$(sfdisk -Fq "${DEVICE_ROOT}" | cut -d " " -f 3 | tail -1)
-if [ -z "${UNUSED}" ] || [ "${UNUSED}" -le "2048" ]; then
+if [ -z "${UNUSED}" ] || [ "${UNUSED}" -le "16384" ]; then
    echo "[INFO] No resize of data partition needed"
    exit 0
 fi
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
@@ -14,7 +14,7 @@ if [ "$(docker ps -q -f name=hassio_cli)" ]; then
        /bin/ash -l
    fi
 else
-    echo "[ERROR] Somethings going wrong! Jump into emergency console..."
+    echo "[WARN] Home Assistant CLI is not running! Jump into emergency console..."
    /bin/ash -l
 fi

--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@@ -79,7 +79,9 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
        -v /var/run/docker.sock:/var/run/docker.sock \
        -v /var/run/dbus:/var/run/dbus \
        -v /etc/machine-id:/etc/machine-id:ro \
-        -v ${SUPERVISOR_DATA}:/data \
+        -v ${SUPERVISOR_DATA}:/data:rw \
+        -v /mnt/overlay:/os/overlay:rw \
+        -v /mnt/boot:/os/boot:rw \
        -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
        -e SUPERVISOR_NAME=hassio_supervisor \
        -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -201,27 +201,27 @@ function _create_disk_mbr() {
    local hdd_img="$(hassos_image_name img)"
    local hdd_count=${DISK_SIZE:-2}
    local disk_layout="${BINARIES_DIR}/disk.layout"
-    local boot_start=16384
+    local boot_start=$(size2sectors "8M")

-    local boot_size=$(($(size2sectors "$(get_boot_size)")+2))
-    local kernel0_size=$(($(size2sectors "$KERNEL_SIZE")+2))
-    local system0_size=$(($(size2sectors "$SYSTEM_SIZE")+2))
-    local kernel1_size=$(($(size2sectors "$KERNEL_SIZE")+2))
-    local system1_size=$(($(size2sectors "$SYSTEM_SIZE")+2))
-    local bootstate_size=$(($(size2sectors "$BOOTSTATE_SIZE")+2))
-    local overlay_size=$(($(size2sectors "$OVERLAY_SIZE")+2))
-    local data_size=$(($(size2sectors "$DATA_SIZE")+2))
-    local extended_size=$((kernel0_size+system0_size+kernel1_size+system1_size+bootstate_size+2))
+    local boot_size=$(size2sectors "$(get_boot_size)")
+    local kernel0_size=$(size2sectors "$KERNEL_SIZE")
+    local system0_size=$(size2sectors "$SYSTEM_SIZE")
+    local kernel1_size=$(size2sectors "$KERNEL_SIZE")
+    local system1_size=$(size2sectors "$SYSTEM_SIZE")
+    local bootstate_size=$(size2sectors "$BOOTSTATE_SIZE")
+    local overlay_size=$(size2sectors "$OVERLAY_SIZE")
+    local data_size=$(size2sectors "$DATA_SIZE")
+    local extended_size=$((kernel0_size+system0_size+kernel1_size+system1_size+bootstate_size+5*$(size2sectors "1M")))

    # we add one here for the extended header.
-    local extended_start=$((boot_start+boot_size+1))
-    local kernel0_start=$((extended_start+1))
-    local system0_start=$((kernel0_start+kernel0_size+1))
-    local kernel1_start=$((system0_start+system0_size+1))
-    local system1_start=$((kernel1_start+kernel1_size+1))
-    local bootstate_start=$((system1_start+system1_size+1))
-    local overlay_start=$((extended_start+extended_size+1))
-    local data_start=$((overlay_start+overlay_size+1))
+    local extended_start=$((boot_start+boot_size))
+    local kernel0_start=$((extended_start+$(size2sectors "1M")))
+    local system0_start=$((kernel0_start+kernel0_size+$(size2sectors "1M")))
+    local kernel1_start=$((system0_start+system0_size+$(size2sectors "1M")))
+    local system1_start=$((kernel1_start+kernel1_size+$(size2sectors "1M")))
+    local bootstate_start=$((system1_start+system1_size+$(size2sectors "1M")))
+    local overlay_start=$((extended_start+extended_size+$(size2sectors "1M")))
+    local data_start=$((overlay_start+overlay_size+$(size2sectors "1M")))

    local boot_offset=${boot_start}
    local kernel_offset=${kernel0_start}
--- a/buildroot-external/scripts/ota.sh
+++ b/buildroot-external/scripts/ota.sh
@@ -34,7 +34,7 @@ function create_ota_update() {
        echo "filename=hook"
        echo "[image.boot]"
        echo "filename=boot.vfat"
-        echo "hooks=pre-install;post-install"
+        echo "hooks=install"
        echo "[image.kernel]"
        echo "filename=kernel.ext4"
        echo "[image.rootfs]"
--- a/buildroot-external/scripts/rauc.sh
+++ b/buildroot-external/scripts/rauc.sh
@@ -4,15 +4,11 @@ set -e
 function _create_rauc_header() {
    (
        echo "[system]"
-	echo "compatible=$(hassos_rauc_compatible)"
+        echo "compatible=$(hassos_rauc_compatible)"
        echo "mountprefix=/run/rauc"
        echo "statusfile=/mnt/data/rauc.db"
        echo "bootloader=${BOOTLOADER}"

-        echo "[handlers]"
-        echo "pre-install=/usr/lib/rauc/pre-install"
-        echo "post-install=/usr/lib/rauc/post-install"
-
        echo "[keyring]"
        echo "path=/etc/rauc/keyring.pem"
    ) > "${TARGET_DIR}/etc/rauc/system.conf"
@@ -24,6 +20,7 @@ function _write_rauc_boot() {
        echo "[slot.boot.0]"
        echo "device=/dev/disk/by-partlabel/hassos-boot"
        echo "type=vfat"
+        echo "allow-mounted=true"
    ) >> "${TARGET_DIR}/etc/rauc/system.conf"

    # SPL
--- a/buildroot-patches/0010-Bump-wireguard-linux-compat.patch
+++ b/buildroot-patches/0010-Bump-wireguard-linux-compat.patch
@@ -1,37 +0,0 @@
-From e7becf35dd9d78fd7be773c765904cea1199ad14 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Sat, 6 Jun 2020 22:51:33 +0000
-Subject: [PATCH 1/1] Bump wireguard-linux-compat
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
- package/wireguard-linux-compat/wireguard-linux-compat.hash | 2 +-
- package/wireguard-linux-compat/wireguard-linux-compat.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash
-index d308f47a13..6835f98d09 100644
--- a/package/wireguard-linux-compat/wireguard-linux-compat.hash
-+++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash
-@@ -1,4 +1,4 @@
- # https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html
-sha256  cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116  wireguard-linux-compat-1.0.20200413.tar.xz
-+sha256  16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3  wireguard-linux-compat-1.0.20200520.tar.xz
- # Locally calculated
- sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk
-index 6d90245bd2..c6d79f59f9 100644
--- a/package/wireguard-linux-compat/wireguard-linux-compat.mk
-+++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
-WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413
-+WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200520
- WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot
- WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz
- WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0
-- 
-2.17.1
-
--- a/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch
+++ b/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch
@@ -0,0 +1,39 @@
+From 921d8ba2bd2cedf30582d9be8fb4dcf57061f42d Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Thu, 6 Aug 2020 10:15:32 +0000
+Subject: [PATCH 1/1] package/rauc: bump version to 1.4
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/rauc/rauc.hash | 6 +++---
+ package/rauc/rauc.mk   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash
+index 54760347c7..51f37f6cb8 100644
+--- a/package/rauc/rauc.hash
+++ b/package/rauc/rauc.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated, after verifying against
+-# https://github.com/rauc/rauc/releases/download/v1.2/rauc-1.2.tar.xz.asc
+-sha256 224683fc1fac50ccb89128aa786445cd8e26bb25deafd4410e0807187376e661 rauc-1.2.tar.xz
+-sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
+# https://github.com/rauc/rauc/releases/download/v1.3/rauc-1.4.tar.xz.asc
+sha256  85aabf214cd93a37f7ad0b3aaad89eb94facf0f3ebf6e2edca945acbca9b0967  rauc-1.4.tar.xz
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
+diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk
+index 5a208e07ae..1915c783aa 100644
+--- a/package/rauc/rauc.mk
+++ b/package/rauc/rauc.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-RAUC_VERSION = 1.2
+RAUC_VERSION = 1.4
+ RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
+ RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
+ RAUC_LICENSE = LGPL-2.1
+-- 
+2.17.1
+
--- a/buildroot/CHANGES
+++ b/buildroot/CHANGES
@@ -1,3 +1,62 @@
+2020.02.4, released July 26th, 2020
+
+	Important / security related fixes.
+
+	Toolchain:
+	- Make external toolchain version check also work for
+	  toolchains configured with --with-gcc-major-version-only
+
+	- Do not handle SOURCE_DATE_EPOCH in toolchain wrapper if the
+	  compiler supports it, fixing an issue with precompiled
+	  headers
+
+	- Ensure debug libs from external toolchains are not installed
+          into target if debugging is disabled
+
+	Download:
+	- Correct reproducibility issue in handling of git submodules
+	  for older git versions.
+
+	- Fix file locking over NFS
+
+	fs: Ensure cpio archive element order is reproducible
+
+	Br2-external: Fix error reporting for invalid br2-external trees
+
+	Per-package:
+	- Fix an issue with python3 sysconfig data not getting
+	correctly expanded
+
+	- Fix per-package building for packages using the qmake
+          infrastructure
+
+	Updated/fixed packages: a10disp, asterisk, bind, cdrkit,
+	checkpolicy, clamav, dbus, docker-cli, docker-engine,
+	dvb-apps, e2fsprogs, exim, exiv2, freerdp, gnutls, go, grub2,
+	gssdp, gst1-plugins-good, gst1-plugins-ugly, gupnp,
+	intel-microcode, iproute2, irrlicht, iwd, jq, kodi, libcamera,
+	libconfuse, libcurl, libglib2, libhttpserver, libmicrohttpd,
+	libopenssl, libvncserver, libxml2, libxmlrpc, lxc, mbedtls,
+	mesa3d, meson, mtools, mutt, nghttp2, ngircd, nodejs, ntp,
+	open-plc-utils, open2300, openjdk-bin, openssh, oracle-mysql,
+	paho-mqtt-c, pcre, php, poco, prosody, putty, python-twisted,
+	python-urllib3, python-validators, python3, qt5xmlpatterns,
+	redis, rpi-firmware, rtl8821au, samba4, sdl2, sqlite, squid,
+	syslog-ng, systemd, tcpreplay, tinydtls, upmpdcli, upx, vlc,
+	webkitgtk, wireguard-linux-compat, wireshark, wpebackend-fdo,
+	wpewebkit, zstd
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#12941: Python GObject fails to build when using BR2_PER_PACKAGE_..
+	#12946: Grub: Decompressor is too big.
+	#12986: Mtools: Error converting to codepage 850
+	#13001: openjdk-bin replaces libfreetype.so from host-freetype
+	#13011: Incorrect selection of gcc version
+	#13026: rpi-firmware: must not rename start files
+	#13031: nodejs: RangeError at new ArrayBuffer()
+	#13046: Optimize for fast -Ofast is not compliant
+
 2020.02.3, released June 3rd, 2020

 	Important / security related fixes.
--- a/buildroot/Config.in
+++ b/buildroot/Config.in
@@ -516,13 +516,14 @@ config BR2_OPTIMIZE_S
 	  This is the default.

 config BR2_OPTIMIZE_FAST
-	bool "optimize for fast"
+	bool "optimize for fast (may break packages!)"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
 	help
 	  Optimize for fast. Disregard strict standards
 	  compliance. -Ofast enables all -O3 optimizations. It also
 	  enables optimizations that are not valid for all
-	  standard-compliant programs. It turns on -ffast-math and the
+	  standard-compliant programs, so be careful, as it may break
+	  some packages. It turns on -ffast-math and the
 	  Fortran-specific -fstack-arrays, unless -fmax-stack-var-size
 	  is specified, and -fno-protect-parens.

--- a/buildroot/DEVELOPERS
+++ b/buildroot/DEVELOPERS
@@ -1771,7 +1771,7 @@ N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/

-N:	Mylène Josserand <mylene.josserand@bootlin.com>
+N:	Mylène Josserand <mylene.josserand@collabora.com>
 F:	package/rtl8723bu/

 N:	Nathaniel Roach <nroach44@gmail.com>
--- a/buildroot/Makefile
+++ b/buildroot/Makefile
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2020.02.3
+export BR2_VERSION := 2020.02.4
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1591196000
+BR2_VERSION_EPOCH = 1595750000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -457,12 +457,12 @@ endif

 ifneq ($(HOST_DIR),$(BASE_DIR)/host)
 HOST_DIR_SYMLINK = $(BASE_DIR)/host
-$(HOST_DIR_SYMLINK): $(BASE_DIR)
+$(HOST_DIR_SYMLINK): | $(BASE_DIR)
 	ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK)
 endif

 STAGING_DIR_SYMLINK = $(BASE_DIR)/staging
-$(STAGING_DIR_SYMLINK): $(BASE_DIR)
+$(STAGING_DIR_SYMLINK): | $(BASE_DIR)
 	ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK)

 # Quotes are needed for spaces and all in the original PATH content.
@@ -756,6 +756,7 @@ ifneq ($(BR2_PACKAGE_GDB),y)
 endif
 ifneq ($(BR2_PACKAGE_BASH),y)
 	rm -rf $(TARGET_DIR)/usr/share/bash-completion
+	rm -rf $(TARGET_DIR)/etc/bash_completion.d
 endif
 ifneq ($(BR2_PACKAGE_ZSH),y)
 	rm -rf $(TARGET_DIR)/usr/share/zsh
@@ -765,6 +766,9 @@ endif
 	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 	rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true
+ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:)
+	rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debug
+endif
 	$(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true
 	$(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true

--- a/buildroot/arch/Config.in.x86
+++ b/buildroot/arch/Config.in.x86
@@ -1,6 +1,8 @@
 # i386/x86_64 cpu features
 config BR2_X86_CPU_HAS_MMX
 	bool
+config BR2_X86_CPU_HAS_3DNOW
+	bool
 config BR2_X86_CPU_HAS_SSE
 	bool
 config BR2_X86_CPU_HAS_SSE2
@@ -155,15 +157,18 @@ config BR2_x86_k6_2
 	bool "k6-2"
 	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_3DNOW
 config BR2_x86_athlon
 	bool "athlon"
 	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_3DNOW
 config BR2_x86_athlon_4
 	bool "athlon-4"
 	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_3DNOW
 config BR2_x86_opteron
 	bool "opteron"
 	select BR2_X86_CPU_HAS_MMX
@@ -209,6 +214,7 @@ config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
 	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_3DNOW
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
 	depends on !BR2_x86_64
--- a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg
+++ b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg
@@ -4,8 +4,8 @@ image boot.vfat {
      "bcm2711-rpi-4-b.dtb",
      "rpi-firmware/cmdline.txt",
      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
      "rpi-firmware/overlays",
      "Image"
    }
--- a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg
+++ b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg
@@ -4,8 +4,8 @@ image boot.vfat {
      "bcm2711-rpi-4-b.dtb",
      "rpi-firmware/cmdline.txt",
      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
      "rpi-firmware/overlays",
      "zImage"
    }
--- a/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
+++ b/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
@@ -0,0 +1,313 @@
+From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001
+From: Simon Hardy <simon.hardy@itdev.co.uk>
+Date: Tue, 24 Mar 2020 13:29:12 +0000
+Subject: build: Fix GRUB i386-pc build with Ubuntu gcc
+
+With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is
+output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to
+fail with: "error: Decompressor is too big."
+
+This seems to be caused by a section .note.gnu.property that is placed at an
+offset such that objcopy needs to pad the img file with zeros.
+
+This issue is present on:
+Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0
+Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008
+
+This issue is not present on:
+Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0
+RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4)
+
+The issue can be fixed by removing the section using objcopy as shown in
+this patch.
+
+Signed-off-by: Simon Hardy <simon.hardy@itdev.co.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+[Retrieved (and updated to directly patch Makefile.in instead of
+gentpl.py to avoid adding a dependency on python) from:
+http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce30f775008e093580f0c9499dfb2c485]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[yann.morin.1998@free.fr:
+  - keep the part patching gentpl.py
+  - restore it as a git-formatted patch
+  - introduce the hunk about the generated .am file
+]
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+---
+ gentpl.py             |    2     1     1     0 +-
+ grub-core/Makefile.in |   38    19    19     0 +++++++++++++++++++-------------------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/gentpl.py b/gentpl.py
+index 387588c05..c86550d4f 100644
+--- a/gentpl.py
+++ b/gentpl.py
+@@ -766,7 +766,7 @@ def image(defn, platform):
+ if test x$(TARGET_APPLE_LINKER) = x1; then \
+   $(MACHO2IMG) $< $@; \
+ else \
+-  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \
+  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
+ fi
+ """)
+ 
+diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am
+index 387588c05..c86550d4f 100644
+--- a/grub-core/Makefile.core.am
+++ 2/grub-core/Makefile.core.am
+@@ -22897,7 +22897,7 @@
+ CLEANFILES += boot.img
+ 
+ boot.img: boot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -22918,7 +22918,7 @@
+ CLEANFILES += boot.img
+ 
+ boot.img: boot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -22939,7 +22939,7 @@
+ CLEANFILES += boot.img
+ 
+ boot.img: boot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -22960,7 +22960,7 @@
+ CLEANFILES += boot_hybrid.img
+ 
+ boot_hybrid.img: boot_hybrid.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -22981,7 +22981,7 @@
+ CLEANFILES += cdboot.img
+ 
+ cdboot.img: cdboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23002,7 +23002,7 @@
+ CLEANFILES += cdboot.img
+ 
+ cdboot.img: cdboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23023,7 +23023,7 @@
+ CLEANFILES += pxeboot.img
+ 
+ pxeboot.img: pxeboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23044,7 +23044,7 @@
+ CLEANFILES += diskboot.img
+ 
+ diskboot.img: diskboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23065,7 +23065,7 @@
+ CLEANFILES += diskboot.img
+ 
+ diskboot.img: diskboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23086,7 +23086,7 @@
+ CLEANFILES += lnxboot.img
+ 
+ lnxboot.img: lnxboot.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23107,7 +23107,7 @@
+ CLEANFILES += xz_decompress.img
+ 
+ xz_decompress.img: xz_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23128,7 +23128,7 @@
+ CLEANFILES += xz_decompress.img
+ 
+ xz_decompress.img: xz_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23149,7 +23149,7 @@
+ CLEANFILES += xz_decompress.img
+ 
+ xz_decompress.img: xz_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23170,7 +23170,7 @@
+ CLEANFILES += none_decompress.img
+ 
+ none_decompress.img: none_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23191,7 +23191,7 @@
+ CLEANFILES += none_decompress.img
+ 
+ none_decompress.img: none_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23212,7 +23212,7 @@
+ CLEANFILES += none_decompress.img
+ 
+ none_decompress.img: none_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23233,7 +23233,7 @@
+ CLEANFILES += lzma_decompress.img
+ 
+ lzma_decompress.img: lzma_decompress.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23254,7 +23254,7 @@
+ CLEANFILES += fwstart.img
+ 
+ fwstart.img: fwstart.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+@@ -23275,7 +23275,7 @@
+ CLEANFILES += fwstart_fuloong2f.img
+ 
+ fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT)
+-	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 	
+ endif
+ 
+diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in
+index 387588c05..c86550d4f 100644
+--- a/grub-core/Makefile.in
+++ b/grub-core/Makefile.in
+@@ -46531,61 +46531,61 @@
+ @COND_riscv64_efi_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(TARGET_STRIP) -S -x $(kernel_exec) -o $@.bin $<;   $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@;   rm -f $@.bin;    elif test ! -z '$(TARGET_OBJ2ELF)'; then      $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@.bin $< &&      $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1);      rm -f $@.bin; else $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@ $<; fi
+ 
+ @COND_i386_pc_TRUE@boot.img: boot.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_qemu_TRUE@boot.img: boot.image$(EXEEXT)
+-@COND_i386_qemu_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_qemu_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_sparc64_ieee1275_TRUE@boot.img: boot.image$(EXEEXT)
+-@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@boot_hybrid.img: boot_hybrid.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@cdboot.img: cdboot.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_sparc64_ieee1275_TRUE@cdboot.img: cdboot.image$(EXEEXT)
+-@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@pxeboot.img: pxeboot.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@diskboot.img: diskboot.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_sparc64_ieee1275_TRUE@diskboot.img: diskboot.image$(EXEEXT)
+-@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@lnxboot.img: lnxboot.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_loongson_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
+-@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_arc_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
+-@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_qemu_mips_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
+-@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_loongson_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
+-@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_arc_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
+-@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_qemu_mips_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
+-@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_i386_pc_TRUE@lzma_decompress.img: lzma_decompress.image$(EXEEXT)
+-@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_loongson_TRUE@fwstart.img: fwstart.image$(EXEEXT)
+-@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_mips_loongson_TRUE@fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT)
+-@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
+ 
+ @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@grub-emu.1: grub-emu 
+ @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@	chmod a+x grub-emu
--- a/buildroot/boot/grub2/grub2.mk
+++ b/buildroot/boot/grub2/grub2.mk
@@ -13,6 +13,14 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
 HOST_GRUB2_DEPENDENCIES = host-bison host-flex
 GRUB2_INSTALL_IMAGES = YES

+# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
+define GRUB2_AVOID_AUTORECONF
+	$(Q)touch $(@D)/Makefile.util.am
+	$(Q)touch $(@D)/Makefile.in
+endef
+GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
+HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
+
 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y)
 GRUB2_INSTALL_TARGET = YES
 else
--- a/buildroot/docs/manual/adding-packages-generic.txt
+++ b/buildroot/docs/manual/adding-packages-generic.txt
@@ -452,7 +452,7 @@ not and can not work as people would expect it should:
  of the manifest file for this package.

 * +LIBFOO_ACTUAL_SOURCE_TARBALL+ only applies to packages whose
-  +LIBFOO_SITE+ / +LIBTOO_SOURCE+ pair points to an archive that does
+  +LIBFOO_SITE+ / +LIBFOO_SOURCE+ pair points to an archive that does
  not actually contain source code, but binary code. This a very
  uncommon case, only known to apply to external toolchains which come
  already compiled, although theoretically it might apply to other
--- a/buildroot/docs/manual/manual.html
+++ b/buildroot/docs/manual/manual.html
--- a/buildroot/docs/manual/manual.pdf
+++ b/buildroot/docs/manual/manual.pdf
--- a/buildroot/docs/manual/manual.text
+++ b/buildroot/docs/manual/manual.text
@@ -167,13 +167,13 @@ List of Examples

 ---------------------------------------------------------------------

-Buildroot 2020.02.3 manual generated on 2020-06-03 14:56:43 UTC from
-git revision d42f3adaae
+Buildroot 2020.02.4 manual generated on 2020-07-26 08:11:34 UTC from
+git revision dee53013da

 The Buildroot manual is written by the Buildroot developers. It is
 licensed under the GNU General Public License, version 2. Refer to
 the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
-d42f3adaae24a6aa3abc2de4f39fa8023f971d31] file in the Buildroot
+dee53013da87dfa4bcb3433bdef79ec43b5a5c24] file in the Buildroot
 sources for the full text of this license.

 Copyright © 2004-2020 The Buildroot developers
@@ -4649,7 +4649,7 @@ information is (assuming the package name is libfoo) :
    not saved will appear in the license files field of the manifest
    file for this package.
  * LIBFOO_ACTUAL_SOURCE_TARBALL only applies to packages whose
-    LIBFOO_SITE / LIBTOO_SOURCE pair points to an archive that does
+    LIBFOO_SITE / LIBFOO_SOURCE pair points to an archive that does
    not actually contain source code, but binary code. This a very
    uncommon case, only known to apply to external toolchains which
    come already compiled, although theoretically it might apply to
--- a/buildroot/fs/cpio/cpio.mk
+++ b/buildroot/fs/cpio/cpio.mk
@@ -37,7 +37,11 @@ ROOTFS_CPIO_OPTS += --reproducible
 endif

 define ROOTFS_CPIO_CMD
-	cd $(TARGET_DIR) && find . | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@
+	cd $(TARGET_DIR) && \
+	find . \
+	| LC_ALL=C sort \
+	| cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc \
+	> $@
 endef

 ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pascal Vizeli	9b3e5357c5	Revert "Use Microsoft Basic Data instead of Microsoft Reserved Partition (#847 )" (#852 ) This reverts commit `31bb38ffd4`.	2020-09-07 09:22:23 +00:00
Pascal Vizeli	d204cbda7f	Merge pull request #851 from home-assistant/dev Release 5.2	2020-09-06 22:28:36 +02:00
Pascal Vizeli	22f7777099	Make getty for serial/tty same (#850 ) * Make getty for serial/tty same * adjust log output	2020-09-06 22:18:19 +02:00
Pascal Vizeli	813030bb4c	Linux: Update kernel 5.4.63 / 5.7.13 (#849 ) * Odroid: Update kernel 5.7.19 * Linux: Update kernel 5.4.63	2020-09-06 22:17:13 +02:00
Stefan Agner	31bb38ffd4	Use Microsoft Basic Data instead of Microsoft Reserved Partition (#847 ) Currently the Microsoft Reserved Partition GUID is used for this FAT32 formatted partition. This GUID is a rather Microsoft Windows specific GUID and not commonly used on Linux. On Linux systems partitions of this type do not get automatically mounted (see /usr/lib/udev/rules.d/80-udisks2.rules). However, since this partition contains some files user commonly need to adjust (config.txt, cmdline.txt) it would be good if the partition does get mounted. Use Microsoft Basic Data instead, which is used by default for FAT32 partition (even by Linux partitioning tools such as gparted). Tested on ASUS Tinker Board and RPi4.	2020-09-06 11:57:17 +02:00
Stefan Agner	b6cfe04422	Do not attempt to resize on every boot (#843 ) (#848 ) The hassos-expand script calls sfdisk to find free disk space. It seems that today it considers the space before the first partition as free: $ sudo sfdisk -Fq /dev/sdi Start End Sectors Size 2048 16383 14336 7M This causes the script to always resize. It seems not to cause harm to the partition table (it does not resize really). However, the call to partx seems to confuse systemd and kill the mnt-data.mount process (presumably because udev causes remove/add events for the by-label device units). Consider everything below 8MiB to not be worthy of a size change. This avoids missdetection and resize attempts where there is no need.	2020-09-06 11:22:43 +02:00
Stefan Agner	0ae67991d1	Cleanup Tinker Board patches (#846 ) * Remove rk3288-xt-q8l-v10.dts related patches We only support ASUS Tinker Board, so no need for those patches. * Remove unnecessary patches and rebase some for Tinker Board S Some patches only apply to the Tinker Board device tree. Rebase them to apply to the dtsi file so they apply for both boards, the Tinker Board and the Tinker Board S board.	2020-09-05 11:11:18 +02:00
Stefan Agner	f892334077	Support custom output directory (#842 ) Support custom output directories akin to how buildroot supports O=. This allows to use separate output directory per board, e.g. using make O=output_odroid-n2.	2020-09-04 21:07:32 +02:00
Stefan Agner	2e2f6e893b	Fix Tinker Board S (eMMC) boot (#650 ) (#845 ) * Fix Tinker Board S (eMMC) boot (#650) Use Tinker Board S U-Boot configuration which is capable to boot from eMMC as well as from SD card. Note that this makes U-Boot always claiming to run on Tinker Board S: .. Model: Rockchip RK3288 Asus Tinker Board S .. It seems that there is no generic Tinker Board configuration. However, Tinker Board S configuration really seems to work well with Tinker Board as well, so just use it. Also today the U-Boot Makefile seems to generate a working idbloader.img already. Drop our special handling. * Use Tinker Board S device tree if booting from eMMC for Linux Instead of patching the Tinker Board device tree, select the device tree based on what device we are booting from. Note: This boots the non-S device tree when booting a Tinker Board S from SD card! But there is no reliable detection otherwise, so let's just live with that fact. * Document how to use our U-Boot to flash eMMC	2020-09-04 21:05:49 +02:00
Stefan Agner	a2a4cf8668	Align all partitions to 1MiB boundary (#808 ) Aligning partitions (and hence file system structures) to higher level then 512 byte sectors is common practise and highly recommended for flash backed block devices. It makes sure that the underlaying flash translation layer (FTL) does not amplify writes due to missalignment of its erase block size. Use a 1MiB boundary which is what a modern fdisk is doing. Before this change: # fdisk /dev/mmcblk0 Welcome to fdisk (util-linux 2.35.1). Changes will remain in memory only, until you decide to write them. Be careful before using the write command. Command (m for help): p Disk /dev/mmcblk0: 14.57 GiB, 15634268160 bytes, 30535680 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: 0x48617373 Device Boot Start End Sectors Size Id Type /dev/mmcblk0p1 * 16384 65537 49154 24M c W95 FAT32 (LBA) /dev/mmcblk0p2 65539 1228814 1163276 568M 5 Extended /dev/mmcblk0p3 1228816 1425425 196610 96M 83 Linux /dev/mmcblk0p4 1425427 30535679 29110253 13.9G 83 Linux /dev/mmcblk0p5 65540 114693 49154 24M 83 Linux /dev/mmcblk0p6 114695 638984 524290 256M 83 Linux /dev/mmcblk0p7 638986 688139 49154 24M 83 Linux /dev/mmcblk0p8 688141 1212430 524290 256M 83 Linux /dev/mmcblk0p9 1212432 1228814 16383 8M 83 Linux After this change: # fdisk /dev/mmcblk0 Welcome to fdisk (util-linux 2.35.1). Changes will remain in memory only, until you decide to write them. Be careful before using the write command. Command (m for help): p Disk /dev/mmcblk0: 14.57 GiB, 15634268160 bytes, 30535680 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: 0x48617373 Device Boot Start End Sectors Size Id Type /dev/mmcblk0p1 * 16384 65535 49152 24M c W95 FAT32 (LBA) /dev/mmcblk0p2 65536 1239039 1173504 573M 5 Extended /dev/mmcblk0p3 1241088 1437695 196608 96M 83 Linux /dev/mmcblk0p4 1439744 30535679 29095936 13.9G 83 Linux /dev/mmcblk0p5 67584 116735 49152 24M 83 Linux /dev/mmcblk0p6 118784 643071 524288 256M 83 Linux /dev/mmcblk0p7 645120 694271 49152 24M 83 Linux /dev/mmcblk0p8 696320 1220607 524288 256M 83 Linux /dev/mmcblk0p9 1222656 1239039 16384 8M 83 Linux See also: https://unix.stackexchange.com/questions/248939/how-to-achieve-optimal-alignment-for-emmc-partition http://3gfp.com/wp/2014/07/formatting-sd-cards-for-speed-and-lifetime/	2020-09-01 22:54:19 +02:00
Stefan Agner	b8cf3face0	Load socinfo only once (#838 ) Remove code duplication and make sure to load socinfo only once. Also set board_rev before MAC address to make sure board_rev is set even if loading MAC address from efuses fails.	2020-09-01 19:07:07 +02:00
mikebaz	1c991c229d	Update network.md (#833 ) small change to reflect the renaming of the OS as shown in the top-level README	2020-08-28 10:37:01 +02:00
Stefan Agner	a3c5e670ef	Fix ODROID-N2(+) SD card boot (#835 ) (#836 )	2020-08-28 10:18:50 +02:00
Pascal Vizeli	ffc75a5053	Optimize overlay driver (#831 ) * Optimize overlay driver https://www.youtube.com/watch?v=fSyr_IXM21Y&feature=youtu.be Not sure about the INDEX, but the other should be safe. * Update buildroot-external/kernel/docker.config Co-authored-by: Stefan Agner <stefan@agner.ch> Co-authored-by: Stefan Agner <stefan@agner.ch>	2020-08-27 11:50:16 +02:00
Stefan Agner	4d6246be4d	RPi4 fix WiFi with 802.11r fast roaming enabled (#733 ) (#830 ) Add brcmfmac patch which adds 802.11r fast roaming support.	2020-08-22 15:08:14 +02:00
Stefan Agner	c6a1e668f4	Load loop module before starting the container (#824 ) This makes sure that the kernel module loop is loaded, the loop devices under /dev have been created before the container starts. Docker uses the current /dev as template for the container /dev. If the loop entries are missing, loop devices can't be used inside the container. Use losetup which does not make assumption weather loop support is built-in. This fixes issues seen on my machine when entering the build environment the first time after build: mount: /mnt/data: failed to setup loop device for /export/data.ext4. make[2]: *** [package/pkg-generic.mk:364: /build/buildroot/output_rpi4/build/hassio-1.0.0/.stamp_target_installed] Error 32	2020-08-18 10:46:28 +02:00
Pascal Vizeli	b19f83d74d	N2: fix possible issue with end up in not working device (#818 )	2020-08-10 09:59:49 +02:00
Pascal Vizeli	7b14ed775b	Fix RPi4 with buildroot v2020.02.4 (#815 )	2020-08-08 08:25:55 +00:00
Pascal Vizeli	a877e0c3dd	Fix RPi4 with buildroot v2020.02.4 (#815 )	2020-08-07 12:49:52 +02:00
Pascal Vizeli	265cb08e79	Bump version 5.2	2020-08-06 21:23:03 +02:00
Pascal Vizeli	1be8e44cde	Merge pull request #814 from home-assistant/dev Release 5.1	2020-08-06 21:22:21 +02:00
Pascal Vizeli	c473aca701	Add support for USB wifi (#813 ) Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>	2020-08-06 21:20:29 +02:00
Pascal Vizeli	f93f8e34b3	Kernel 5.4.56 / Odroid 5.7.13 (#812 ) * Linux: Update kernel 5.4.56 * Odroid: Update kernel 5.7.13	2020-08-06 21:12:41 +02:00
Pascal Vizeli	fa53c7bc99	Update buildroot v2020.02.4 (#811 ) * Update buildroot to 2020.02.4 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix patches Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>	2020-08-06 20:54:14 +02:00
Pascal Vizeli	1f4bd67f7e	Improve the compatibility (#810 ) * Improve the compatibility * small style fix	2020-08-06 20:49:42 +02:00
Pascal Vizeli	0c427d0dee	Update rauc 1.4 to fix mounted boot partition issue (#809 ) * Update rauc 1.4 to fix mounted boot partition issue * applay update * fix characters * fix CI * Support old format * fix mcopy prefix * fix lint * fix lint * clean style * Fix script * fix syntax * Support all system * fix shell * Fix script	2020-08-06 19:37:52 +02:00
Konpon96	701e4f78aa	Enable systemd-logind (#797 ) Signed-off-by: Konrad Ponichtera <konpon96@gmail.com>	2020-08-06 08:38:14 +02:00
Stefan Agner	cd5cb880ea	Do not break device tree changes made by audio patches (#807 )	2020-08-06 08:32:25 +02:00
Stefan Agner	cf033ec49d	hardkernel: Fix build warning when building U-Boot (#806 ) Drop const since we actually modify the buffer in meson_get_soc_rev	2020-08-05 12:07:53 +02:00
Pascal Vizeli	0ec506470a	Fix amlogic patch for soc rev (#804 )	2020-08-04 16:46:26 +02:00
cogneato	606da02461	Fix duplicate link and typo in documentation (#805 )	2020-08-04 16:44:37 +02:00
Pascal Vizeli	e49f8fe630	Update kernel mainline 5.4.55 / Odroid 5.7.12 (#803 ) * Odroid: Update kernel 5.7.12 * Linux: Update kernel 5.4.55 * Fix patch	2020-08-03 22:58:40 +02:00
Adam Griffiths	02836524ce	Documentation (#769 ) * spelling correction * Restuctured, added "features", "supported hardware", intro for developers and links to the developer documentation. * Spelling correction * URL correction * Documentation restructure * Moving developer documentation index from top level README to Documentation directory README * fixing URLS * Restructuring and adding to board config * Improving navigation of docs oon github * New line after first heading (https://github.com/home-assistant/operating-system/pull/768#discussion_r453336692) Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Update README.md https://github.com/home-assistant/operating-system/pull/768#discussion_r453336871 Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Update README.md (https://github.com/home-assistant/operating-system/pull/768#discussion_r453336999) - Surround headings with newlines - ODROID - Use dashes for unordered lists Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Update README.md - new line after heading (https://github.com/home-assistant/operating-system/pull/768#discussion_r453337043) Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Update README.md - \- for unordered lists - new line after heading (https://github.com/home-assistant/operating-system/pull/768#discussion_r453337101) Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Update README.md - new line after heading - \- for unordered lists (https://github.com/home-assistant/operating-system/pull/768#discussion_r453337183) Co-authored-by: Franck Nijhof <frenck@frenck.nl> * Spelling correction, to ensure /Dpcumentation/kernel.mdhas the correct spelling * capitalisation * using - for unordered lists * Adding links to config files * fixing links to _defconfig files * fixing link for rpi0_w * fixing link for rpi3_64 and rpi4_64 * making the ova README consistent with the others * formmating * fixing numbered list * fixing indent for sub-bullets * questions regarding Tinker S and OVA support * resolving PR comment from fabaff * resolving PR comment from fabaff * https://github.com/home-assistant/operating-system/pull/769\#discussion_r456774209 * Changing uBoot to U-Boot (https://github.com/home-assistant/operating-system/pull/769#discussion_r456774290) * s/boot sector/eMMC boot partition/ (See https://github.com/home-assistant/operating-system/pull/769#discussion_r456774329) * As per comments here: https://github.com/home-assistant/operating-system/pull/769#discussion_r456791491 https://github.com/home-assistant/operating-system/pull/769#discussion_r456791580 * HassOS is no longer the official name (https://github.com/home-assistant/operating-system/pull/769#discussion_r456791863) * Should be Home Assistant Operating System (or OS) (see https://community.home-assistant.io/t/changing-the-home-assistant-brand/167500/16). See also commennts here https://github.com/home-assistant/operating-system/pull/769#discussion_r456793030, taken in to account along with previous comments about this paragraph. * s/HassOS/Home Assistant Operating System/ * 8Gb Pi 4 will be supported soon (see comment https://github.com/home-assistant/operating-system/pull/769#discussion_r459768349) * resolving conflict with main dev branch. Co-authored-by: Franck Nijhof <frenck@frenck.nl> Co-authored-by: Pascal Vizeli <pvizeli@syshack.ch>	2020-08-03 16:31:36 +02:00
Pascal Vizeli	50176a0e3b	Add support for snapshots/restore on OS level (#801 )	2020-08-03 16:28:08 +02:00
Pascal Vizeli	06e7ee7efb	Change VM naming handling (#794 )	2020-07-29 11:19:00 +02:00
Stefan Agner	e08bbd7047	Add ODROID-N2+ support (#793 ) * Add ODROID-N2+ support Add ODROID-N2+ support with the new SoC revision c. Extend the U-Boot script: Assume ODROID-N2 if the SoC revision is "a" (there are only "a" revision SoCs on ODROID N2) and assume N2+ otherwise. Currently using overclock mode as proposed in the upstream kernel patches. * Update hassos-hook.sh Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>	2020-07-29 11:06:01 +02:00
Pascal Vizeli	653bcbe3ae	Add functionts for RPi to handle kernel options (#792 )	2020-07-27 12:09:43 +02:00
Pascal Vizeli	3700516097	Show board info on startup & Cleanup unused functionality (#784 ) * Show board info on startup & Cleanup unused functionality * Add patch for get env * move patch	2020-07-27 11:54:25 +02:00
Pascal Vizeli	3fe09a4e6a	Bump version to 5.1	2020-07-24 12:27:02 +02:00