Bump firmware to RPi bluez-firmware 1.2-4+rpt6 release (#918)

This addresses recent Bluetooth secruity vulnerabilities.

.github/ISSUE_TEMPLATE.md

@@ -1,23 +1,21 @@
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
-- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/core/releases
-- Do not report issues for integrations here, please refer to https://github.com/home-assistant/core/issues
+- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Do not report issues for components here, plaese refer to https://github.com/home-assistant/home-assistant/issues
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
-- If you have a problem with an add-on, make an issue in its repository.
-- If you are using Raspberry Pi overlays in config.txt and your system doesn't work anymore please report this to the Raspberry Pi kernel project.
-
+- If you have a problem with a Add-on, make a issue on there repository.
 -->
 
 **HassOS release with the issue:**
 <!--
-- Frontend -> Configuration -> Info
+- Frontend -> Developer tools -> Info
 - Or use this command: hass --version
 -->
 
 **Supervisor logs:**
 <!--
-- Frontend -> Supervisor -> System
+- Frontend -> Hass.io -> System
 - Or use this command: ha su logs
 -->
 

Documentation/README.md

@@ -3,7 +3,7 @@
 ## Contents
 
 - [Getting started](./getting_started_development.md) - the place for developers to begin
-- [Development](./development.md) - more details for developers
+- [Development](./getting_started_development.md) - more deatils for developers
 - [Deployment](./deployment.md) - approach to git branching and releases
 - [Configuration](./configuration.md) - how users can configure HassOS
 - [Partition](./partition.md) - partition layout

Documentation/boards/asus/README.md

@@ -5,26 +5,16 @@
 | 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 S RK3288| January 2018  | yes?    | [tinker](../../../buildroot-external/configs/tinker_defconfig)? |
 | Tinker Edge T  | November 2019 | no?     |          |
 | Tinker Edge R  | November 2019 | no?     |          |
 
+(? is the Tinker S supported?)
+<!--
 ## 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.
+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
 

Documentation/boards/raspberrypi/README.md

@@ -33,13 +33,8 @@ i2c-bcm2708
 
 ## USB Boot
 
-USB mass storage boot is available on Raspberry Pi 4 (64-bit only), 3B, 3B+, 3A+, and 2B v1.2.
-
-For Raspberry 3B, 3A+ and 2B v1.2, to enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
-
-For Raspberry 4, make sure to update the bootloader to a stable release
-supporting USB mass storage boot (see
-[bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot). If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
+USB mass storage boot is available on Raspberry Pi 3B, 3B+, 3A+, and 2B v1.2.
+To enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
 
 For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
 

Documentation/configuration.md

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

Documentation/deployment.md

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

Documentation/kernel.md

@@ -5,14 +5,14 @@ Default Kernel tree: 5.4
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.4.63 |
+| Open Virtual Appliance | 5.4.72 |
 | 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.63 |
+| Tinker Board | 5.4.72 |
 | Odroid-C2 | 5.7.19 |
 | Odroid-N2 | 5.7.19 |
 | Odroid-XU4 | 5.7.19 |
-| Intel NUC | 5.4.63 |
+| Intel NUC | 5.4.72 |

Documentation/network.md

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

Documentation/partition.md

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

Makefile

@@ -7,13 +7,6 @@ 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
@@ -30,7 +23,7 @@ $(TARGETS_CONFIG): %-config:
 $(TARGETS): %: $(RELEASE_DIR) %-config
 	@echo "build $@"
 	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
-	cp -f $(O)/images/hassos_* $(RELEASE_DIR)/
+	cp -f $(BUILDROOT)/output/images/hassos_* $(RELEASE_DIR)/
 
 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)

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

@@ -7,16 +7,20 @@ function hassos_pre_image() {
 
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/boot.scr" \
-        "${BINARIES_DIR}/rk3288-tinker.dtb" \
-        "${BINARIES_DIR}/rk3288-tinker-s.dtb"
+        "${BINARIES_DIR}/rk3288-tinker.dtb"
 
     echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
 
+    # Create boot binary
+    rm -f "${BINARIES_DIR}/idbloader.img"
+    mkimage -n rk3288 -T rksd -d "${BINARIES_DIR}/u-boot-tpl.bin" "${BINARIES_DIR}/idbloader.img"
+    cat "${BINARIES_DIR}/u-boot-spl.bin" >> "${BINARIES_DIR}/idbloader.img"
+
     # SPL
     create_spl_image
 
     dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
+    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=12288
 }
 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-From cd1aac268ff58eea28153bbabfb33abc2df52b1f Mon Sep 17 00:00:00 2001
-Message-Id: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH 1/4] SPL: modify load address of U-Boot
-
-Default load address of U-Boot is at sector 16384, which is where HAOS
-has its first partition. Use 0x2000 (8192) instead.
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- configs/tinker-rk3288_defconfig   | 1 +
- configs/tinker-s-rk3288_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index d459c7f50d..e0682ed479 100644
---- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -88,3 +88,4 @@ CONFIG_VIDEO_ROCKCHIP=y
- CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
-diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
-index 68411d863b..1a285baf73 100644
---- a/configs/tinker-s-rk3288_defconfig
-+++ b/configs/tinker-s-rk3288_defconfig
-@@ -90,3 +90,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CONSOLE_SCROLL_LINES=10
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
--- 
-2.28.0
-

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

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

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

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

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

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

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

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

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

@@ -27,11 +27,7 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
-if test "$devnum" = "0"; then
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker-s.dtb
-else
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
-fi
+fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
 
 setenv bootargs
 for BOOT_SLOT in "${BOOT_ORDER}"; do

buildroot-external/board/hardkernel/patches/linux/0001-Revert-cdc-acm-introduce-a-cool-down.patch

@@ -0,0 +1,132 @@
+From 5edf98e1fa176a480686ec77a5782b61eb009842 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 15 Oct 2020 13:58:14 +0200
+Subject: [PATCH] Revert "cdc-acm: introduce a cool down"
+
+This reverts commit a4e7279cd1d19f48f0af2a10ed020febaa9ac092.
+---
+ drivers/usb/class/cdc-acm.c | 30 ++----------------------------
+ drivers/usb/class/cdc-acm.h |  5 +----
+ 2 files changed, 3 insertions(+), 32 deletions(-)
+
+diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
+index f1a9043bdfe5..0f47d74c857d 100644
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -410,12 +410,9 @@ static void acm_ctrl_irq(struct urb *urb)
+ 
+ exit:
+ 	retval = usb_submit_urb(urb, GFP_ATOMIC);
+-	if (retval && retval != -EPERM && retval != -ENODEV)
++	if (retval && retval != -EPERM)
+ 		dev_err(&acm->control->dev,
+ 			"%s - usb_submit_urb failed: %d\n", __func__, retval);
+-	else
+-		dev_vdbg(&acm->control->dev,
+-			"control resubmission terminated %d\n", retval);
+ }
+ 
+ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags)
+@@ -431,8 +428,6 @@ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags)
+ 			dev_err(&acm->data->dev,
+ 				"urb %d failed submission with %d\n",
+ 				index, res);
+-		} else {
+-			dev_vdbg(&acm->data->dev, "intended failure %d\n", res);
+ 		}
+ 		set_bit(index, &acm->read_urbs_free);
+ 		return res;
+@@ -474,7 +469,6 @@ static void acm_read_bulk_callback(struct urb *urb)
+ 	int status = urb->status;
+ 	bool stopped = false;
+ 	bool stalled = false;
+-	bool cooldown = false;
+ 
+ 	dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n",
+ 		rb->index, urb->actual_length, status);
+@@ -501,14 +495,6 @@ static void acm_read_bulk_callback(struct urb *urb)
+ 			__func__, status);
+ 		stopped = true;
+ 		break;
+-	case -EOVERFLOW:
+-	case -EPROTO:
+-		dev_dbg(&acm->data->dev,
+-			"%s - cooling babbling device\n", __func__);
+-		usb_mark_last_busy(acm->dev);
+-		set_bit(rb->index, &acm->urbs_in_error_delay);
+-		cooldown = true;
+-		break;
+ 	default:
+ 		dev_dbg(&acm->data->dev,
+ 			"%s - nonzero urb status received: %d\n",
+@@ -530,11 +516,9 @@ static void acm_read_bulk_callback(struct urb *urb)
+ 	 */
+ 	smp_mb__after_atomic();
+ 
+-	if (stopped || stalled || cooldown) {
++	if (stopped || stalled) {
+ 		if (stalled)
+ 			schedule_work(&acm->work);
+-		else if (cooldown)
+-			schedule_delayed_work(&acm->dwork, HZ / 2);
+ 		return;
+ 	}
+ 
+@@ -581,12 +565,6 @@ static void acm_softint(struct work_struct *work)
+ 		}
+ 	}
+ 
+-	if (test_and_clear_bit(ACM_ERROR_DELAY, &acm->flags)) {
+-		for (i = 0; i < acm->rx_buflimit; i++)
+-			if (test_and_clear_bit(i, &acm->urbs_in_error_delay))
+-					acm_submit_read_urb(acm, i, GFP_NOIO);
+-	}
+-
+ 	if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags))
+ 		tty_port_tty_wakeup(&acm->port);
+ }
+@@ -1353,7 +1331,6 @@ static int acm_probe(struct usb_interface *intf,
+ 	acm->readsize = readsize;
+ 	acm->rx_buflimit = num_rx_buf;
+ 	INIT_WORK(&acm->work, acm_softint);
+-	INIT_DELAYED_WORK(&acm->dwork, acm_softint);
+ 	init_waitqueue_head(&acm->wioctl);
+ 	spin_lock_init(&acm->write_lock);
+ 	spin_lock_init(&acm->read_lock);
+@@ -1563,7 +1540,6 @@ static void acm_disconnect(struct usb_interface *intf)
+ 
+ 	acm_kill_urbs(acm);
+ 	cancel_work_sync(&acm->work);
+-	cancel_delayed_work_sync(&acm->dwork);
+ 
+ 	tty_unregister_device(acm_tty_driver, acm->minor);
+ 
+@@ -1606,8 +1582,6 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
+ 
+ 	acm_kill_urbs(acm);
+ 	cancel_work_sync(&acm->work);
+-	cancel_delayed_work_sync(&acm->dwork);
+-	acm->urbs_in_error_delay = 0;
+ 
+ 	return 0;
+ }
+diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
+index cd5e9d8ab237..ca1c026382c2 100644
+--- a/drivers/usb/class/cdc-acm.h
++++ b/drivers/usb/class/cdc-acm.h
+@@ -109,11 +109,8 @@ struct acm {
+ #		define EVENT_TTY_WAKEUP	0
+ #		define EVENT_RX_STALL	1
+ #		define ACM_THROTTLED	2
+-#		define ACM_ERROR_DELAY	3
+-	unsigned long urbs_in_error_delay;		/* these need to be restarted after a delay */
+ 	struct usb_cdc_line_coding line;		/* bits, stop, parity */
+-	struct work_struct work;			/* work queue entry for various purposes*/
+-	struct delayed_work dwork;			/* for cool downs needed in error recovery */
++	struct work_struct work;			/* work queue entry for line discipline waking up */
+ 	unsigned int ctrlin;				/* input control lines (DCD, DSR, RI, break, overruns) */
+ 	unsigned int ctrlout;				/* output control lines (DTR, RTS) */
+ 	struct async_icount iocount;			/* counters for control line changes */
+-- 
+2.25.4
+

buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch

@@ -0,0 +1,43 @@
+From e2b93751cfd0722801b65b4603b588ab9df4c12b Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Tue, 21 Apr 2020 18:39:30 +0200
+Subject: [PATCH 2/8] arm64: defconfig: enable meson gx audio as module
+
+Enable the module config for the Amlogic GX audio card.
+This module will imply the internal components usually associated
+with it to make a functional sound card on these platforms.
+
+Also enable the simple amplifier module which often used on the
+output stage of those cards.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Tested-by: Christian Hewitt <christianshewitt@gmail.com>
+Link: https://lore.kernel.org/r/20200421163935.775935-2-jbrunet@baylibre.com
+---
+ arch/arm64/configs/defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 03d0189f7d68..ceb60ee9c340 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -644,6 +644,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m
+ CONFIG_SND_SOC=y
+ CONFIG_SND_BCM2835_SOC_I2S=m
+ CONFIG_SND_MESON_AXG_SOUND_CARD=m
++CONFIG_SND_MESON_GX_SOUND_CARD=m
+ CONFIG_SND_SOC_SDM845=m
+ CONFIG_SND_SOC_ROCKCHIP=m
+ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+@@ -656,6 +657,7 @@ CONFIG_SND_SOC_AK4613=m
+ CONFIG_SND_SOC_ES7134=m
+ CONFIG_SND_SOC_ES7241=m
+ CONFIG_SND_SOC_PCM3168A_I2C=m
++CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+ CONFIG_SND_SOC_TAS571X=m
+ CONFIG_SND_SOC_WCD934X=m
+ CONFIG_SND_SOC_WSA881X=m
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0001-usb-cdc-acm-fix-cooldown-mechanism.patch

@@ -1,124 +0,0 @@
-From f6fce2e974fe091fd233301bd7c127ca18304039 Mon Sep 17 00:00:00 2001
-Message-Id: <f6fce2e974fe091fd233301bd7c127ca18304039.1603303549.git.stefan@agner.ch>
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Mon, 19 Oct 2020 19:07:02 +0200
-Subject: [PATCH] usb: cdc-acm: fix cooldown mechanism
-
-Commit a4e7279cd1d1 ("cdc-acm: introduce a cool down") is causing
-regression if there is some USB error, such as -EPROTO.
-
-This has been reported on some samples of the Odroid-N2 using the Combee II
-Zibgee USB dongle.
-
-> struct acm *acm = container_of(work, struct acm, work)
-
-is incorrect in case of a delayed work and causes warnings, usually from
-the workqueue:
-
-> WARNING: CPU: 0 PID: 0 at kernel/workqueue.c:1474 __queue_work+0x480/0x528.
-
-When this happens, USB eventually stops working completely after a while.
-Also the ACM_ERROR_DELAY bit is never set, so the cooldown mechanism
-previously introduced cannot be triggered and acm_submit_read_urb() is
-never called.
-
-This changes makes the cdc-acm driver use a single delayed work, fixing the
-pointer arithmetic in acm_softint() and set the ACM_ERROR_DELAY when the
-cooldown mechanism appear to be needed.
-
-Fixes: a4e7279cd1d1 ("cdc-acm: introduce a cool down")
-Reported-by: Pascal Vizeli <pascal.vizeli@nabucasa.com>
-Cc: Oliver Neukum <oneukum@suse.com>
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
----
- drivers/usb/class/cdc-acm.c | 12 +++++-------
- drivers/usb/class/cdc-acm.h |  3 +--
- 2 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index 7f6f3ab5b8a6..8f087499196a 100644
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -507,6 +507,7 @@ static void acm_read_bulk_callback(struct urb *urb)
- 			"%s - cooling babbling device\n", __func__);
- 		usb_mark_last_busy(acm->dev);
- 		set_bit(rb->index, &acm->urbs_in_error_delay);
-+		set_bit(ACM_ERROR_DELAY, &acm->flags);
- 		cooldown = true;
- 		break;
- 	default:
-@@ -532,7 +533,7 @@ static void acm_read_bulk_callback(struct urb *urb)
- 
- 	if (stopped || stalled || cooldown) {
- 		if (stalled)
--			schedule_work(&acm->work);
-+			schedule_delayed_work(&acm->dwork, 0);
- 		else if (cooldown)
- 			schedule_delayed_work(&acm->dwork, HZ / 2);
- 		return;
-@@ -562,13 +563,13 @@ static void acm_write_bulk(struct urb *urb)
- 	acm_write_done(acm, wb);
- 	spin_unlock_irqrestore(&acm->write_lock, flags);
- 	set_bit(EVENT_TTY_WAKEUP, &acm->flags);
--	schedule_work(&acm->work);
-+	schedule_delayed_work(&acm->dwork, 0);
- }
- 
- static void acm_softint(struct work_struct *work)
- {
- 	int i;
--	struct acm *acm = container_of(work, struct acm, work);
-+	struct acm *acm = container_of(work, struct acm, dwork.work);
- 
- 	if (test_bit(EVENT_RX_STALL, &acm->flags)) {
- 		smp_mb(); /* against acm_suspend() */
-@@ -584,7 +585,7 @@ static void acm_softint(struct work_struct *work)
- 	if (test_and_clear_bit(ACM_ERROR_DELAY, &acm->flags)) {
- 		for (i = 0; i < acm->rx_buflimit; i++)
- 			if (test_and_clear_bit(i, &acm->urbs_in_error_delay))
--					acm_submit_read_urb(acm, i, GFP_NOIO);
-+				acm_submit_read_urb(acm, i, GFP_KERNEL);
- 	}
- 
- 	if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags))
-@@ -1352,7 +1353,6 @@ static int acm_probe(struct usb_interface *intf,
- 	acm->ctrlsize = ctrlsize;
- 	acm->readsize = readsize;
- 	acm->rx_buflimit = num_rx_buf;
--	INIT_WORK(&acm->work, acm_softint);
- 	INIT_DELAYED_WORK(&acm->dwork, acm_softint);
- 	init_waitqueue_head(&acm->wioctl);
- 	spin_lock_init(&acm->write_lock);
-@@ -1562,7 +1562,6 @@ static void acm_disconnect(struct usb_interface *intf)
- 	}
- 
- 	acm_kill_urbs(acm);
--	cancel_work_sync(&acm->work);
- 	cancel_delayed_work_sync(&acm->dwork);
- 
- 	tty_unregister_device(acm_tty_driver, acm->minor);
-@@ -1605,7 +1604,6 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
- 		return 0;
- 
- 	acm_kill_urbs(acm);
--	cancel_work_sync(&acm->work);
- 	cancel_delayed_work_sync(&acm->dwork);
- 	acm->urbs_in_error_delay = 0;
- 
-diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
-index cd5e9d8ab237..b95ff769072e 100644
---- a/drivers/usb/class/cdc-acm.h
-+++ b/drivers/usb/class/cdc-acm.h
-@@ -112,8 +112,7 @@ struct acm {
- #		define ACM_ERROR_DELAY	3
- 	unsigned long urbs_in_error_delay;		/* these need to be restarted after a delay */
- 	struct usb_cdc_line_coding line;		/* bits, stop, parity */
--	struct work_struct work;			/* work queue entry for various purposes*/
--	struct delayed_work dwork;			/* for cool downs needed in error recovery */
-+	struct delayed_work dwork;		        /* work queue entry for various purposes */
- 	unsigned int ctrlin;				/* input control lines (DCD, DSR, RI, break, overruns) */
- 	unsigned int ctrlout;				/* output control lines (DTR, RTS) */
- 	struct async_icount iocount;			/* counters for control line changes */
--- 
-2.28.0
-

buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch

@@ -0,0 +1,28 @@
+From 821b8ac21b1675910423ee69d37cb1977b8f271e Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 30 Mar 2020 17:39:04 +0200
+Subject: [PATCH 3/8] ASoC: meson: imply acodec glue on axg sound card
+
+When axg card driver support is enabled, lets enable the related
+internal DAC glue by default.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ sound/soc/meson/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
+index 8b6295283989..363dc3b1bbe4 100644
+--- a/sound/soc/meson/Kconfig
++++ b/sound/soc/meson/Kconfig
+@@ -68,6 +68,7 @@ config SND_MESON_AXG_SOUND_CARD
+ 	imply SND_MESON_AXG_SPDIFOUT
+ 	imply SND_MESON_AXG_SPDIFIN
+ 	imply SND_MESON_AXG_PDM
++	imply SND_MESON_G12A_TOACODEC
+ 	imply SND_MESON_G12A_TOHDMITX if DRM_MESON_DW_HDMI
+ 	help
+ 	  Select Y or M to add support for the AXG SoC sound card
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch

@@ -0,0 +1,47 @@
+From 60164df03c6314d8f5f3afef56b0bf97962ec9ee Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 24 Feb 2020 14:35:17 +0100
+Subject: [PATCH 4/8] ASoC: meson: gx-card: fix sound-dai dt schema
+
+There is a fair amount of warnings when running 'make dtbs_check' with
+amlogic,gx-sound-card.yaml.
+
+Ex:
+arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:1: missing phandle tag in 0
+arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:2: missing phandle tag in 0
+arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0: [66, 0, 0] is too long
+
+The reason is that the sound-dai phandle provided has cells, and in such
+case the schema should use 'phandle-array' instead of 'phandle'.
+
+Fixes: fd00366b8e41 ("ASoC: meson: gx: add sound card dt-binding documentation")
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ .../devicetree/bindings/sound/amlogic,gx-sound-card.yaml      | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
+index fb374c659be1..a48222e8cd08 100644
+--- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
++++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
+@@ -57,7 +57,7 @@ patternProperties:
+           rate
+ 
+       sound-dai:
+-        $ref: /schemas/types.yaml#/definitions/phandle
++        $ref: /schemas/types.yaml#/definitions/phandle-array
+         description: phandle of the CPU DAI
+ 
+     patternProperties:
+@@ -71,7 +71,7 @@ patternProperties:
+ 
+         properties:
+           sound-dai:
+-            $ref: /schemas/types.yaml#/definitions/phandle
++            $ref: /schemas/types.yaml#/definitions/phandle-array
+             description: phandle of the codec DAI
+ 
+         required:
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch

@@ -0,0 +1,39 @@
+From e128dd1ca079c5ee558ab100387d9f81bd4f3980 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 7 May 2020 00:16:55 +0200
+Subject: [PATCH 5/8] arm64: dts: meson: g12: add internal DAC
+
+add internal audio DAC support on the g12 and sm1 SoC family
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20200506221656.477379-7-jbrunet@baylibre.com
+---
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index c0aef7d69117..593a006f4b7b 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -250,6 +250,17 @@
+ 				};
+ 			};
+ 
++			acodec: audio-controller@32000 {
++				compatible = "amlogic,t9015";
++				reg = <0x0 0x32000 0x0 0x14>;
++				#sound-dai-cells = <0>;
++				sound-name-prefix = "ACODEC";
++				clocks = <&clkc CLKID_AUDIO_CODEC>;
++				clock-names = "pclk";
++				resets = <&reset RESET_AUDIO_CODEC>;
++				status = "disabled";
++			};
++
+ 			periphs: bus@34400 {
+ 				compatible = "simple-bus";
+ 				reg = <0x0 0x34400 0x0 0x400>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch

@@ -0,0 +1,39 @@
+From 5ea4085da165fd3f3aa211cb3664dd166d0d5fd7 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 7 May 2020 00:16:56 +0200
+Subject: [PATCH 6/8] arm64: dts: meson: g12: add internal DAC glue
+
+add the internal DAC glue support on the g12 and sm1 family
+This glue connects the different TDM interfaces of the SoC to
+the internal audio DAC codec.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20200506221656.477379-8-jbrunet@baylibre.com
+---
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 55d39020ec72..0d14409f509c 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -343,6 +343,15 @@
+ 			status = "disabled";
+ 		};
+ 
++		toacodec: audio-controller@740 {
++			compatible = "amlogic,g12a-toacodec";
++			reg = <0x0 0x740 0x0 0x4>;
++			#sound-dai-cells = <1>;
++			sound-name-prefix = "TOACODEC";
++			resets = <&clkc_audio AUD_RESET_TOACODEC>;
++			status = "disabled";
++		};
++
+ 		tohdmitx: audio-controller@744 {
+ 			compatible = "amlogic,g12a-tohdmitx";
+ 			reg = <0x0 0x744 0x0 0x4>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch

@@ -0,0 +1,123 @@
+From 15b3cef2ea75c4d81cb067264be1cf49c49f81b1 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 15 Jun 2020 15:38:44 +0200
+Subject: [PATCH 7/8] arm64: dts: meson-g12b: odroid-n2: enable audio loopback
+
+Add capture pcm interfaces and loopback routes to the odroid-n2
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 65 +++++++++++++++++--
+ 1 file changed, 61 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+index 169ea283d4ee..d4421ad164bd 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -209,11 +209,28 @@
+ 	sound {
+ 		compatible = "amlogic,axg-sound-card";
+ 		model = "G12B-ODROID-N2";
+-		audio-aux-devs = <&tdmout_b>;
++		audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>,
++				 <&tdmin_c>, <&tdmin_lb>;
+ 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
+ 				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
+-				"TDM_B Playback", "TDMOUT_B OUT";
++				"TDM_B Playback", "TDMOUT_B OUT",
++				"TDMIN_A IN 4", "TDM_B Loopback",
++				"TDMIN_B IN 4", "TDM_B Loopback",
++				"TDMIN_C IN 4", "TDM_B Loopback",
++				"TDMIN_LB IN 1", "TDM_B Loopback",
++				"TODDR_A IN 0", "TDMIN_A OUT",
++				"TODDR_B IN 0", "TDMIN_A OUT",
++				"TODDR_C IN 0", "TDMIN_A OUT",
++				"TODDR_A IN 1", "TDMIN_B OUT",
++				"TODDR_B IN 1", "TDMIN_B OUT",
++				"TODDR_C IN 1", "TDMIN_B OUT",
++				"TODDR_A IN 2", "TDMIN_C OUT",
++				"TODDR_B IN 2", "TDMIN_C OUT",
++				"TODDR_C IN 2", "TDMIN_C OUT",
++				"TODDR_A IN 6", "TDMIN_LB OUT",
++				"TODDR_B IN 6", "TDMIN_LB OUT",
++				"TODDR_C IN 6", "TDMIN_LB OUT";
+ 
+ 		assigned-clocks = <&clkc CLKID_MPLL2>,
+ 				  <&clkc CLKID_MPLL0>,
+@@ -236,8 +253,20 @@
+ 			sound-dai = <&frddr_c>;
+ 		};
+ 
+-		/* 8ch hdmi interface */
+ 		dai-link-3 {
++			sound-dai = <&toddr_a>;
++		};
++
++		dai-link-4 {
++			sound-dai = <&toddr_b>;
++		};
++
++		dai-link-5 {
++			sound-dai = <&toddr_c>;
++		};
++
++		/* 8ch hdmi interface */
++		dai-link-6 {
+ 			sound-dai = <&tdmif_b>;
+ 			dai-format = "i2s";
+ 			dai-tdm-slot-tx-mask-0 = <1 1>;
+@@ -252,7 +281,7 @@
+ 		};
+ 
+ 		/* hdmi glue */
+-		dai-link-4 {
++		dai-link-7 {
+ 			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+ 
+ 			codec {
+@@ -476,6 +505,22 @@
+ 	status = "okay";
+ };
+ 
++&tdmin_a {
++	status = "okay";
++};
++
++&tdmin_b {
++	status = "okay";
++};
++
++&tdmin_c {
++	status = "okay";
++};
++
++&tdmin_lb {
++	status = "okay";
++};
++
+ &tdmout_b {
+ 	status = "okay";
+ };
+@@ -484,6 +529,18 @@
+ 	status = "okay";
+ };
+ 
++&toddr_a {
++	status = "okay";
++};
++
++&toddr_b {
++	status = "okay";
++};
++
++&toddr_c {
++	status = "okay";
++};
++
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch

@@ -0,0 +1,168 @@
+From 978cc250574b7f1ab45f494cc2a094e3c9fd1fa4 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 15 Jun 2020 16:34:37 +0200
+Subject: [PATCH 8/8] arm64: dts: meson: odroid-n2: add jack audio output
+ support
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 79 +++++++++++++++++--
+ 1 file changed, 74 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+index d4421ad164bd..34fffa6d859d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -9,6 +9,7 @@
+ #include "meson-g12b-s922x.dtsi"
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/gpio/meson-g12a-gpio.h>
++#include <dt-bindings/sound/meson-g12a-toacodec.h>
+ #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+ 
+ / {
+@@ -20,6 +21,14 @@
+ 		ethernet0 = &ethmac;
+ 	};
+ 
++	dioo2133: audio-amplifier-0 {
++		compatible = "simple-audio-amplifier";
++		enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
++		VCC-supply = <&vcc_5v>;
++		sound-name-prefix = "U19";
++		status = "okay";
++	};
++
+ 	chosen {
+ 		stdout-path = "serial0:115200n8";
+ 	};
+@@ -209,16 +218,26 @@
+ 	sound {
+ 		compatible = "amlogic,axg-sound-card";
+ 		model = "G12B-ODROID-N2";
+-		audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>,
+-				 <&tdmin_c>, <&tdmin_lb>;
++		audio-widgets = "Line", "Lineout";
++		audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&tdmin_a>,
++				 <&tdmin_b>, <&tdmin_c>, <&tdmin_lb>,
++				 <&dioo2133>;
+ 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
+ 				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
+ 				"TDM_B Playback", "TDMOUT_B OUT",
++				"TDMOUT_C IN 0", "FRDDR_A OUT 2",
++				"TDMOUT_C IN 1", "FRDDR_B OUT 2",
++				"TDMOUT_C IN 2", "FRDDR_C OUT 2",
++				"TDM_C Playback", "TDMOUT_C OUT",
+ 				"TDMIN_A IN 4", "TDM_B Loopback",
+ 				"TDMIN_B IN 4", "TDM_B Loopback",
+ 				"TDMIN_C IN 4", "TDM_B Loopback",
+ 				"TDMIN_LB IN 1", "TDM_B Loopback",
++				"TDMIN_A IN 5", "TDM_C Loopback",
++				"TDMIN_B IN 5", "TDM_C Loopback",
++				"TDMIN_C IN 5", "TDM_C Loopback",
++				"TDMIN_LB IN 2", "TDM_C Loopback",
+ 				"TODDR_A IN 0", "TDMIN_A OUT",
+ 				"TODDR_B IN 0", "TDMIN_A OUT",
+ 				"TODDR_C IN 0", "TDMIN_A OUT",
+@@ -230,7 +249,11 @@
+ 				"TODDR_C IN 2", "TDMIN_C OUT",
+ 				"TODDR_A IN 6", "TDMIN_LB OUT",
+ 				"TODDR_B IN 6", "TDMIN_LB OUT",
+-				"TODDR_C IN 6", "TDMIN_LB OUT";
++				"TODDR_C IN 6", "TDMIN_LB OUT",
++				"U19 INL", "ACODEC LOLP",
++				"U19 INR", "ACODEC LORP",
++				"Lineout", "U19 OUTL",
++				"Lineout", "U19 OUTR";
+ 
+ 		assigned-clocks = <&clkc CLKID_MPLL2>,
+ 				  <&clkc CLKID_MPLL0>,
+@@ -275,22 +298,56 @@
+ 			dai-tdm-slot-tx-mask-3 = <1 1>;
+ 			mclk-fs = <256>;
+ 
+-			codec {
++			codec-0 {
+ 				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
+ 			};
++
++			codec-1 {
++				sound-dai = <&toacodec TOACODEC_IN_B>;
++			};
+ 		};
+ 
+-		/* hdmi glue */
++		/* i2s jack output interface */
+ 		dai-link-7 {
++			sound-dai = <&tdmif_c>;
++			dai-format = "i2s";
++			dai-tdm-slot-tx-mask-0 = <1 1>;
++			mclk-fs = <256>;
++
++			codec-0 {
++				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;
++			};
++
++			codec-1 {
++				sound-dai = <&toacodec TOACODEC_IN_C>;
++			};
++		};
++
++		/* hdmi glue */
++		dai-link-8 {
+ 			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+ 
+ 			codec {
+ 				sound-dai = <&hdmi_tx>;
+ 			};
+ 		};
++
++		/* acodec glue */
++		dai-link-9 {
++			sound-dai = <&toacodec TOACODEC_OUT>;
++
++			codec {
++				sound-dai = <&acodec>;
++			};
++		};
+ 	};
+ };
+ 
++&acodec {
++	AVDD-supply = <&vddao_1v8>;
++	status = "okay";
++};
++
+ &arb {
+ 	status = "okay";
+ };
+@@ -505,6 +562,10 @@
+ 	status = "okay";
+ };
+ 
++&tdmif_c {
++	status = "okay";
++};
++
+ &tdmin_a {
+ 	status = "okay";
+ };
+@@ -525,6 +586,14 @@
+ 	status = "okay";
+ };
+ 
++&tdmout_c {
++	status = "okay";
++};
++
++&toacodec {
++	status = "okay";
++};
++
+ &tohdmitx {
+ 	status = "okay";
+ };
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch

@@ -1,8 +1,10 @@
-From d35db3d5f943fea569dde8e83f15565254643385 Mon Sep 17 00:00:00 2001
-Message-Id: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
+From 9443f2cd21a8ebd08f0fb64f5b3a8ccb6cd77d8e Mon Sep 17 00:00:00 2001
+Message-Id: <9443f2cd21a8ebd08f0fb64f5b3a8ccb6cd77d8e.1596660075.git.stefan@agner.ch>
+In-Reply-To: <f72fc1866396fed30036e0f06007c15217e47f22.1596660075.git.stefan@agner.ch>
+References: <f72fc1866396fed30036e0f06007c15217e47f22.1596660075.git.stefan@agner.ch>
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 19 Jul 2020 14:10:32 +0000
-Subject: [PATCH 1/4] arm64: dts: meson: convert ODROID-N2 to dtsi
+Subject: [PATCH 08/10] arm64: dts: meson: convert ODROID-N2 to dtsi
 
 Convert the current ODROID-N2 dts into a common dtsi in preparation
 for adding ODROID-N2+ support.
@@ -1281,5 +1283,5 @@ index 000000000000..e5bc132ce7d5
 +	phy-supply = <&hub_5v>;
 +};
 -- 
-2.28.0
+2.27.0
 

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

@@ -1,10 +1,11 @@
-From 4b9d9159ed5a79ceac5b831012b3cb44cce2516c Mon Sep 17 00:00:00 2001
-Message-Id: <4b9d9159ed5a79ceac5b831012b3cb44cce2516c.1602360581.git.stefan@agner.ch>
-In-Reply-To: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
-References: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
+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 2/4] dt-bindings: arm: amlogic: add support for the ODROID-N2+
+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.
@@ -15,17 +16,17 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 5eba9f48823e..12ba8d074370 100644
+index f74aba48cec1..915ef4f355ad 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -153,6 +153,7 @@ properties:
-               - azw,gtking
-               - azw,gtking-pro
+@@ -149,6 +149,7 @@ properties:
+         items:
+           - enum:
                - hardkernel,odroid-n2
 +              - hardkernel,odroid-n2-plus
                - khadas,vim3
                - ugoos,am6
            - const: amlogic,s922x
 -- 
-2.28.0
+2.27.0
 

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

@@ -1,10 +1,10 @@
-From 81b5af6c3ce3e0f312be0897bec0b3c942e2ce97 Mon Sep 17 00:00:00 2001
-Message-Id: <81b5af6c3ce3e0f312be0897bec0b3c942e2ce97.1602360581.git.stefan@agner.ch>
-In-Reply-To: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
-References: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
+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 3/4] arm64: dts: meson: add support for the ODROID-N2+
+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
@@ -22,10 +22,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 4e2239ffcaa5..b0b3d6791499 100644
+index eef0045320f2..7524cf9680f5 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
+@@ -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
@@ -93,5 +93,5 @@ index 000000000000..4ebb448d233f
 +};
 +
 -- 
-2.28.0
+2.27.0
 

buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch

@@ -1,10 +1,10 @@
-From 6a7c42785788faa862aeb7902cb2b3b08f033ca0 Mon Sep 17 00:00:00 2001
-Message-Id: <6a7c42785788faa862aeb7902cb2b3b08f033ca0.1602360581.git.stefan@agner.ch>
-In-Reply-To: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
-References: <d35db3d5f943fea569dde8e83f15565254643385.1602360581.git.stefan@agner.ch>
+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 4/4] clk: meson: g12a: mark fclk_div2 as critical
+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.
@@ -22,7 +22,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
-index 9803d44bb157..9a6722a1dc19 100644
+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 = {

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

@@ -1,25 +1,22 @@
-From f40f83d023b2e1dd82e751aee35c1f0d386b8b4f Mon Sep 17 00:00:00 2001
-Message-Id: <f40f83d023b2e1dd82e751aee35c1f0d386b8b4f.1602104035.git.stefan@agner.ch>
+From b93c598b1acfe59ffac342d114483af8a45a78ac Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Sat, 1 Feb 2020 20:55:39 +0000
-Subject: [PATCH 1/3] Amlogic w400: read ethaddr from efuse
+Subject: [PATCH 1/1] Amlogic w400: read ethaddr from efuse
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- board/amlogic/w400/w400.c | 27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
+ board/amlogic/w400/w400.c | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c
-index 47a51710dc..d74aab899a 100644
+index e60dc3a622..d4028c6a39 100644
 --- a/board/amlogic/w400/w400.c
 +++ b/board/amlogic/w400/w400.c
-@@ -6,15 +6,36 @@
+@@ -6,13 +6,36 @@
  
  #include <common.h>
  #include <dm.h>
 -#include <env_internal.h>
--#include <init.h>
--#include <net.h>
 +#include <env.h>
  #include <asm/io.h>
 +#include <asm/arch/sm.h>
@@ -54,5 +51,5 @@ index 47a51710dc..d74aab899a 100644
  	return 0;
  }
 -- 
-2.28.0
+2.17.1
 

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

@@ -1,10 +1,10 @@
-From c67fb4dbb332ed38bc7fbee13079e5ea11390f4e Mon Sep 17 00:00:00 2001
-Message-Id: <c67fb4dbb332ed38bc7fbee13079e5ea11390f4e.1602104035.git.stefan@agner.ch>
-In-Reply-To: <f40f83d023b2e1dd82e751aee35c1f0d386b8b4f.1602104035.git.stefan@agner.ch>
-References: <f40f83d023b2e1dd82e751aee35c1f0d386b8b4f.1602104035.git.stefan@agner.ch>
+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/3] ARM: meson: isolate loading of socinfo
+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.
@@ -15,10 +15,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  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 3abb27e03b..cfcd5bbd3b 100644
+index 0d3b40a249..e305d60dca 100644
 --- a/arch/arm/mach-meson/board-info.c
 +++ b/arch/arm/mach-meson/board-info.c
-@@ -126,12 +126,16 @@ static void print_board_model(void)
+@@ -123,12 +123,16 @@ static void print_board_model(void)
  	printf("Model: %s\n", model ? model : "Unknown");
  }
  
@@ -37,7 +37,7 @@ index 3abb27e03b..cfcd5bbd3b 100644
  
  	/* find the offset of compatible node */
  	nodeoffset = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
-@@ -158,8 +162,20 @@ int show_board_info(void)
+@@ -155,8 +159,20 @@ int show_board_info(void)
  		return 0;
  	}
  

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

@@ -1,10 +1,10 @@
-From bb86524d84909ffe5d1d6ff3afe41d26396ba561 Mon Sep 17 00:00:00 2001
-Message-Id: <bb86524d84909ffe5d1d6ff3afe41d26396ba561.1602104035.git.stefan@agner.ch>
-In-Reply-To: <f40f83d023b2e1dd82e751aee35c1f0d386b8b4f.1602104035.git.stefan@agner.ch>
-References: <f40f83d023b2e1dd82e751aee35c1f0d386b8b4f.1602104035.git.stefan@agner.ch>
+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/3] meson: Add board_rev to env
+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>
@@ -35,10 +35,10 @@ index a90fe55081..c67d12d06c 100644
 +
  #endif /* __MESON_BOOT_H__ */
 diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
-index cfcd5bbd3b..3ea7eb7251 100644
+index e305d60dca..3c40d6cd27 100644
 --- a/arch/arm/mach-meson/board-info.c
 +++ b/arch/arm/mach-meson/board-info.c
-@@ -186,3 +186,15 @@ int show_board_info(void)
+@@ -183,3 +183,15 @@ int show_board_info(void)
  
  	return 0;
  }

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

@@ -15,3 +15,13 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
+
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_CORE=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_I915=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m

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

@@ -37,10 +37,4 @@ CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV_STORAGE=y
 CONFIG_HYPERV_NET=y
 CONFIG_HYPERV_VSOCKETS=m
-CONFIG_PCI_HYPERV=m
-CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y
-
-CONFIG_IGBVF=m
-CONFIG_IXGBEVF=m
-CONFIG_I40EVF=m

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

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

buildroot-external/board/raspberrypi/kernel.config

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

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

@@ -1,41 +0,0 @@
-From a9f92163e6c07e5c6f57f00f4931098e0e1ee826 Mon Sep 17 00:00:00 2001
-Message-Id: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Date: Mon, 29 Jun 2020 18:18:37 +0200
-Subject: [PATCH 1/4] dt-bindings: reset: Add a binding for the RPi Firmware
- reset controller
-
-The firmware running on the RPi VideoCore can be used to reset and
-initialize HW controlled by the firmware.
-
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-[backport for RPi 4.19 kernel]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- .../dt-bindings/reset/raspberrypi,firmware-reset.h  | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
- create mode 100644 include/dt-bindings/reset/raspberrypi,firmware-reset.h
-
-diff --git a/include/dt-bindings/reset/raspberrypi,firmware-reset.h b/include/dt-bindings/reset/raspberrypi,firmware-reset.h
-new file mode 100644
-index 000000000000..1a4f4c792723
---- /dev/null
-+++ b/include/dt-bindings/reset/raspberrypi,firmware-reset.h
-@@ -0,0 +1,13 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (c) 2020 Nicolas Saenz Julienne
-+ * Author: Nicolas Saenz Julienne <nsaenzjulienne@suse.com>
-+ */
-+
-+#ifndef _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H
-+#define _DT_BINDINGS_RASPBERRYPI_FIRMWARE_RESET_H
-+
-+#define RASPBERRYPI_FIRMWARE_RESET_ID_USB	0
-+#define RASPBERRYPI_FIRMWARE_RESET_NUM_IDS	1
-+
-+#endif
--- 
-2.27.0
-

buildroot-external/board/raspberrypi/patches/linux/0002-ARM-dts-bcm2711-Add-firmware-usb-reset-node.patch

@@ -1,38 +0,0 @@
-From b15414057bc9a023fc865242f499807d82933e58 Mon Sep 17 00:00:00 2001
-Message-Id: <b15414057bc9a023fc865242f499807d82933e58.1595152741.git.stefan@agner.ch>
-In-Reply-To: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-References: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Date: Mon, 29 Jun 2020 18:18:39 +0200
-Subject: [PATCH 2/4] ARM: dts: bcm2711: Add firmware usb reset node
-
-Now that the reset driver exposing Raspberry Pi 4's firmware based USB
-reset routine is available, let's add the device tree node exposing it.
-
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-[backport for RPi 4.19 kernel]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 42259dbf3919..ec0b3bb64de8 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -80,6 +80,11 @@
- 				  "";
- 		status = "okay";
- 	};
-+
-+	reset: reset {
-+		compatible = "raspberrypi,firmware-reset";
-+		#reset-cells = <1>;
-+	};
- };
- 
- &uart0 {
--- 
-2.27.0
-

buildroot-external/board/raspberrypi/patches/linux/0003-ARM-dts-bcm2711-Add-reset-controller-to-xHCI-node.patch

@@ -1,58 +0,0 @@
-From 08558575c0f3d1437994590ad418d6c2cf18d96b Mon Sep 17 00:00:00 2001
-Message-Id: <08558575c0f3d1437994590ad418d6c2cf18d96b.1595152741.git.stefan@agner.ch>
-In-Reply-To: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-References: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Date: Mon, 29 Jun 2020 18:18:40 +0200
-Subject: [PATCH 3/4] ARM: dts: bcm2711: Add reset controller to xHCI node
-
-The chip is hardwired to the board's PCIe bus and needs to be properly
-setup trough a firmware routine after a PCI fundamental reset. Pass the
-reset controller phandle that takes care of triggering the
-initialization to the relevant PCI device.
-
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-[backport for RPi 4.19 kernel]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index ec0b3bb64de8..2c6aa1933600 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -4,6 +4,8 @@
- #include "bcm2711-rpi.dtsi"
- #include "bcm283x-rpi-csi1-2lane.dtsi"
- 
-+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
-+
- / {
- 	compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
- 	model = "Raspberry Pi 4 Model B";
-@@ -87,6 +89,21 @@
- 	};
- };
- 
-+&pcie_0 {
-+	pci@1,0 {
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		ranges;
-+
-+		reg = <0 0 0 0 0>;
-+
-+		usb@1,0 {
-+			reg = <0x10000 0 0 0 0>;
-+			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
-+		};
-+	};
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pins &bt_pins>;
--- 
-2.27.0
-

buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-bcm2838-add-upstream-property-to-enable-PCIe.patch

@@ -1,44 +0,0 @@
-From dcfb930f9c271ad303a888ce94227d2d78974e39 Mon Sep 17 00:00:00 2001
-Message-Id: <dcfb930f9c271ad303a888ce94227d2d78974e39.1595152741.git.stefan@agner.ch>
-In-Reply-To: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-References: <a9f92163e6c07e5c6f57f00f4931098e0e1ee826.1595152741.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Sun, 19 Jul 2020 11:49:45 +0200
-Subject: [PATCH 4/4] ARM: dts: bcm2838: add upstream property to enable PCIe
- spread-spectrum
-
-Add the upstream device tree property brcm,enable-ssc to enable
-spread-spectrum for PCIe. This is used by the upstream U-Boot.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/boot/dts/bcm2838.dtsi | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 36d250d7053b..d6cc876bc720 100644
---- a/arch/arm/boot/dts/bcm2838.dtsi
-+++ b/arch/arm/boot/dts/bcm2838.dtsi
-@@ -353,11 +353,14 @@
- 			 */
- 			ranges = <0x02000000 0x0 0xf8000000  0x6 0x00000000
- 				  0x0 0x04000000>;
--			/* Map inbound accesses from pci:0x0_00000000..ffffffff
--			 * to scb:0x0_00000000-ffffffff
--			 */
--			dma-ranges = <0x02000000 0x0 0x00000000  0x0 0x00000000
--				      0x1 0x00000000>;
-+                        /*
-+                         * The wrapper around the PCIe block has a bug
-+                         * preventing it from accessing beyond the first 3GB of
-+                         * memory.
-+                         */
-+                        dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000
-+                                      0x0 0xc0000000>;
-+			brcm,enable-ssc;
- 			status = "okay";
- 		};
- 
--- 
-2.27.0
-

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

@@ -1,8 +1,7 @@
-From a04331a6ba7334282836bbaa76e979c4e6be3900 Mon Sep 17 00:00:00 2001
-Message-Id: <a04331a6ba7334282836bbaa76e979c4e6be3900.1602102849.git.stefan@agner.ch>
+From 0f45c3f2f46b62f767ef225b258f927ad88ca360 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH 1/2] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
+Subject: [PATCH 1/1] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -14,7 +13,7 @@ Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index bba5e12b12..0241f4c6d3 100644
+index fe5a7763a6..ed7f9381e9 100644
 --- a/configs/rpi_0_w_defconfig
 +++ b/configs/rpi_0_w_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -23,11 +22,11 @@ index bba5e12b12..0241f4c6d3 100644
  CONFIG_CMD_FS_UUID=y
 -CONFIG_OF_EMBED=y
 +CONFIG_OF_BOARD=y
+ CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
+ CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index 1c2bbb29ce..9573e475f4 100644
+index bf331c0ad0..52e3c3b234 100644
 --- a/configs/rpi_2_defconfig
 +++ b/configs/rpi_2_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -36,11 +35,11 @@ index 1c2bbb29ce..9573e475f4 100644
  CONFIG_CMD_FS_UUID=y
 -CONFIG_OF_EMBED=y
 +CONFIG_OF_BOARD=y
+ CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
+ CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index b8a3d17f43..252df994e6 100644
+index c2417a0ec9..191962f0f7 100644
 --- a/configs/rpi_3_32b_defconfig
 +++ b/configs/rpi_3_32b_defconfig
 @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -49,11 +48,11 @@ index b8a3d17f43..252df994e6 100644
  CONFIG_CMD_FS_UUID=y
 -CONFIG_OF_EMBED=y
 +CONFIG_OF_BOARD=y
+ CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
+ CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 9b281a4f15..1e9ee6122e 100644
+index 4fa682539c..03a2356d3d 100644
 --- a/configs/rpi_3_defconfig
 +++ b/configs/rpi_3_defconfig
 @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -62,11 +61,11 @@ index 9b281a4f15..1e9ee6122e 100644
  CONFIG_CMD_FS_UUID=y
 -CONFIG_OF_EMBED=y
 +CONFIG_OF_BOARD=y
+ CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
+ CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index b5ad53c37b..223fc03275 100644
+index 2c04b3334e..bf00d8b669 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -75,9 +74,8 @@ index b5ad53c37b..223fc03275 100644
  CONFIG_CMD_FS_UUID=y
 -CONFIG_OF_EMBED=y
 +CONFIG_OF_BOARD=y
+ CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
+ CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 -- 
-2.28.0
-
+2.17.1

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

@@ -1,10 +1,7 @@
-From cc40a554b003df9b07f8a55f69a94d7393d81cbc Mon Sep 17 00:00:00 2001
-Message-Id: <cc40a554b003df9b07f8a55f69a94d7393d81cbc.1602102849.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1602102849.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1602102849.git.stefan@agner.ch>
+From 68e65b1e3859d4baf41d1e5f6525ff7ace778ba1 Mon Sep 17 00:00:00 2001
 From: Florin Sarbu <florin@balena.io>
 Date: Thu, 12 Sep 2019 12:31:31 +0200
-Subject: [PATCH 2/2] raspberrypi: Disable simple framebuffer support
+Subject: [PATCH] raspberrypi: Disable simple framebuffer support
 
 On 4.19 kernels this u-boot driver clashes with bcm2708_fb.
 So let's disable it from here so that we have bcm2708_fb
@@ -20,10 +17,10 @@ Signed-off-by: Florin Sarbu <florin@balena.io>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index 6b1fa5fc14..5cfee7c00a 100644
+index 153a1fd..c7bd399 100644
 --- a/board/raspberrypi/rpi/rpi.c
 +++ b/board/raspberrypi/rpi/rpi.c
-@@ -485,7 +485,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
+@@ -482,7 +482,7 @@ int ft_board_setup(void *blob, bd_t *bd)
  	 * should be more intelligent, and e.g. only do this if no enabled DT
  	 * node exists for the "real" graphics driver.
  	 */
@@ -33,7 +30,7 @@ index 6b1fa5fc14..5cfee7c00a 100644
  #ifdef CONFIG_EFI_LOADER
  	/* Reserve the spin table */
 diff --git a/common/Makefile b/common/Makefile
-index 2e7a090588..b3985cc04d 100644
+index 0de60b3..2848d98 100644
 --- a/common/Makefile
 +++ b/common/Makefile
 @@ -50,7 +50,7 @@ ifndef CONFIG_DM_VIDEO
@@ -46,10 +43,10 @@ index 2e7a090588..b3985cc04d 100644
  obj-$(CONFIG_MENU) += menu.o
  obj-$(CONFIG_UPDATE_TFTP) += update.o
 diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index 834f1cd236..19a0d611c4 100644
+index a38bf20..e2760b0 100644
 --- a/include/configs/rpi.h
 +++ b/include/configs/rpi.h
-@@ -65,8 +65,8 @@
+@@ -60,8 +60,8 @@
  /* GPIO */
  #define CONFIG_BCM2835_GPIO
  /* LCD */
@@ -61,5 +58,5 @@ index 834f1cd236..19a0d611c4 100644
  #ifdef CONFIG_CMD_USB
  #define CONFIG_TFTP_TSIZE
 -- 
-2.28.0
+2.7.4
 

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.63"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.72"
 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,7 +80,6 @@ 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

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.9.1"
+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,7 +71,6 @@ 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
@@ -84,12 +83,12 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/odroid_n2_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-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.9.1"
+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,7 +71,6 @@ 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
@@ -84,12 +83,12 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

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.9.1"
+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,7 +73,6 @@ 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
@@ -86,14 +85,14 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

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.63"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.72"
 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,7 +71,6 @@ 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

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="bcm2708-rpi-zero-w"
@@ -74,7 +74,6 @@ 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
@@ -87,7 +86,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="bcm2709-rpi-2-b bcm2710-rpi-2-b"
@@ -73,7 +73,6 @@ 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
@@ -86,7 +85,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -74,7 +74,6 @@ 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
@@ -87,7 +86,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -74,7 +74,6 @@ 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
@@ -87,7 +86,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="broadcom/bcm2711-rpi-4-b"
@@ -75,7 +75,6 @@ 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 +87,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="bcm2711-rpi-4-b"
@@ -75,7 +75,6 @@ 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 +87,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -73,7 +73,6 @@ 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
@@ -86,7 +85,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y

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.63"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.72"
 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 rk3288-tinker-s"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker"
 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,7 +75,6 @@ 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,14 +87,14 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-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
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
+BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin tpl/u-boot-tpl.bin"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y

buildroot-external/kernel/device-support.config

@@ -13,6 +13,7 @@ CONFIG_USB_ACM=m
 CONFIG_USB_USBNET=m
 
 CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_SND_USB_AUDIO=m
 
 CONFIG_BT=y
 CONFIG_BT_BREDR=y
@@ -143,15 +144,3 @@ CONFIG_VIDEO_EM28XX_V4L2=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX_RC=m
-
-# Audio devices (USB/PCI)
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_HDA=y
-CONFIG_SND_HDA_CORE=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m

buildroot-external/kernel/docker.config

@@ -71,8 +71,6 @@ 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

buildroot-external/meta

@@ -1,7 +1,7 @@
-VERSION_MAJOR=5
-VERSION_BUILD=4
+VERSION_MAJOR=4
+VERSION_BUILD=15
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

buildroot-external/patches/uboot/2020.10/0001-CMD-read-string-from-fileinto-env.patch

@@ -1,96 +0,0 @@
-From 8a77e2b9f56c8973273b8dc6a7cfa1ed0330d058 Mon Sep 17 00:00:00 2001
-Message-Id: <8a77e2b9f56c8973273b8dc6a7cfa1ed0330d058.1602102685.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Sun, 5 Aug 2018 20:43:03 +0000
-Subject: [PATCH] CMD: read string from fileinto env
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- cmd/Kconfig   |  5 +++++
- cmd/Makefile  |  1 +
- cmd/fileenv.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 51 insertions(+)
- create mode 100644 cmd/fileenv.c
-
-diff --git a/cmd/Kconfig b/cmd/Kconfig
-index 0c984d735d..0dfd82d0a3 100644
---- a/cmd/Kconfig
-+++ b/cmd/Kconfig
-@@ -1448,6 +1448,11 @@ config CMD_SETEXPR
- 	  Also supports loading the value at a memory location into a variable.
- 	  If CONFIG_REGEX is enabled, setexpr also supports a gsub function.
- 
-+config CMD_FILEENV
-+	bool "fileenv"
-+	help
-+	   Read a file into memory and store it to env.
-+
- endmenu
- 
- menu "Android support commands"
-diff --git a/cmd/Makefile b/cmd/Makefile
-index 3a9c9747c9..9ccb63e248 100644
---- a/cmd/Makefile
-+++ b/cmd/Makefile
-@@ -133,6 +133,7 @@ obj-$(CONFIG_CMD_SF) += sf.o
- obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o
- obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o
- obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
-+obj-$(CONFIG_CMD_FILEENV) += fileenv.o
- obj-$(CONFIG_CMD_SPI) += spi.o
- obj-$(CONFIG_CMD_STRINGS) += strings.o
- obj-$(CONFIG_CMD_SMC) += smccc.o
-diff --git a/cmd/fileenv.c b/cmd/fileenv.c
-new file mode 100644
-index 0000000000..af24d22d0e
---- /dev/null
-+++ b/cmd/fileenv.c
-@@ -0,0 +1,45 @@
-+#include <config.h>
-+#include <common.h>
-+#include <command.h>
-+#include <linux/ctype.h>
-+
-+static char *fs_argv[5];
-+
-+int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
-+{
-+	if (argc < 6)
-+		return CMD_RET_USAGE;
-+
-+	fs_argv[0] = "fatload";
-+	fs_argv[1] = argv[1];
-+	fs_argv[2] = argv[2];
-+	fs_argv[3] = argv[3];
-+	fs_argv[4] = argv[4];
-+
-+	if (do_fat_fsload(cmdtp, 0, 5, fs_argv) != 0)
-+		return 1;
-+
-+	char *addr = (char *)simple_strtoul(argv[3], NULL, 16);
-+	size_t size = env_get_hex("filesize", 0);
-+
-+	// Prepare string
-+	addr[size] = 0x00;
-+	char *s = addr;
-+	while(*s != 0x00) {
-+		if (isprint(*s)) {
-+			s++;
-+		}
-+		else {
-+			*s = 0x00;
-+		}
-+	}
-+
-+	return env_set(argv[5], addr);
-+}
-+
-+U_BOOT_CMD(
-+	fileenv, 6, 0, do_fileenv,
-+	"Read file and store it into env.",
-+	"<interface> <dev:part> <addr> <filename> <envname>\n"
-+	"    - Read file from fat32 and store it as env."
-+);
--- 
-2.28.0
-

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=HassOS supervisor
-Requires=docker.service rauc.service dbus.service
+Requires=docker.service
 Wants=network-online.target
-After=docker.service rauc.service dbus.service network-online.target
+After=docker.service rauc.service dbus.socket network-online.target
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5
-ConditionPathExists=/run/dbus/system_bus_socket
-ConditionPathExists=/run/docker.sock
 
 [Service]
 Type=simple

buildroot-patches/0002-rpi-firmware-Bump-firmware.patch

@@ -16,7 +16,7 @@ index 59ab1da0c6..e3ba1bf99c 100644
 @@ -1,3 +1,3 @@
  # Locally computed
 -sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz
-+sha256 6e5f1bf068995078d4d6a01899a7f7fe094b92a4f5cc19f0d4f67040a3175aa9 rpi-firmware-2b41f509710d99758a5b8efa88d95dd0e9169c0a.tar.gz
++sha256 4789d4422b3bc7eab157471ba36aebd54efc2a6de4c937f5cfdb4392af04fe80 rpi-firmware-7caead9416f64b2d33361c703fb243b8e157eba4.tar.gz
  sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 6fee60b08c..2177ca9859 100644
@@ -27,7 +27,7 @@ index 6fee60b08c..2177ca9859 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
-+RPI_FIRMWARE_VERSION = 2b41f509710d99758a5b8efa88d95dd0e9169c0a
++RPI_FIRMWARE_VERSION = 7caead9416f64b2d33361c703fb243b8e157eba4
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot-patches/0008-Linux-5.7.patch

@@ -0,0 +1,68 @@
+From e36dc9a2a030204b5b6c6868348878b596f88de3 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 5 Jun 2020 14:18:26 +0000
+Subject: [PATCH 1/1] Linux 5.7
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/linux-headers/Config.in.host               | 4 ++++
+ toolchain/Config.in                                | 5 +++++
+ .../toolchain-external-custom/Config.in.options    | 4 ++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
+index 95e85a00..88b9ff99 100644
+--- a/package/linux-headers/Config.in.host
++++ b/package/linux-headers/Config.in.host
+@@ -127,6 +127,10 @@ choice
+ 	  If your kernel headers are more recent than the latest version
+ 	  in the choice, then select the latest version.
+ 
++config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7
++	bool "5.7.x or later"
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++
+ config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4
+ 	bool "5.4.x or later"
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+diff --git a/toolchain/Config.in b/toolchain/Config.in
+index bff57280..c07a92ce 100644
+--- a/toolchain/Config.in
++++ b/toolchain/Config.in
+@@ -470,6 +470,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
+ 	select BR2_TOOLCHAIN_HEADERS_LATEST
+ 
++config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++	bool
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
++
+ # This should be selected by the latest version, above, to indicate that
+ # Buildroot does not know of more recent headers than the ones selected.
+ # This allows using toolchains with headers more recent than Buildroot
+@@ -481,6 +485,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
+ # stops affecting a value on the first matching default.
+ config BR2_TOOLCHAIN_HEADERS_AT_LEAST
+ 	string
++	default "5.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
+ 	default "5.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+ 	default "5.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
+ 	default "5.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
+diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+index 8c38dd9f..b49231e1 100644
+--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
++++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+@@ -115,6 +115,10 @@ choice
+ 	  If your toolchain uses headers newer than the latest version
+ 	  in the choice, then select the latest version.
+ 
++config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7
++	bool "5.7.x or later"
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++
+ config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4
+ 	bool "5.4.x or later"
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+-- 
+2.17.1
+

buildroot/.gitlab-ci.yml

@@ -4,13 +4,12 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".
 
-image: buildroot/base:20200814.2228
+image: buildroot/base:20191027.2027
 
 .check_base:
-    rules:
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/ || $CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/'
-          when: never
-        - when: always
+    except:
+        - /^.*-.*_defconfig$/
+        - /^.*-tests\..*$/
 
 check-DEVELOPERS:
     extends: .check_base
@@ -28,7 +27,7 @@ check-flake8:
         - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt
         - sort -u files.txt | tee files.processed
     script:
-        - python3 -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
+        - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
     after_script:
         - wc -l files.processed
 
@@ -70,21 +69,17 @@ check-package:
     extends: .defconfig_base
     # Running the defconfigs for every push is too much, so limit to
     # explicit triggers through the API.
-    rules:
-        # For tags, create a pipeline.
-        - if: '$CI_COMMIT_TAG'
-        # For pipeline created by using a trigger token.
-        - if: '$CI_PIPELINE_TRIGGERED'
-        # For the branch or tag name named *-defconfigs, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-defconfigs$/'
+    only:
+        - triggers
+        - tags
+        - /-defconfigs$/
     before_script:
         - DEFCONFIG_NAME=${CI_JOB_NAME}
 
 one-defconfig:
     extends: .defconfig_base
-    rules:
-        # For the branch or tag name named *-*_defconfigs, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/'
+    only:
+        - /^.*-.*_defconfig$/
     before_script:
         - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
 
@@ -108,20 +103,17 @@ one-defconfig:
     extends: .runtime_test_base
     # Running the runtime tests for every push is too much, so limit to
     # explicit triggers through the API.
-    rules:
-        # For tags, create a pipeline.
-        - if: '$CI_COMMIT_TAG'
-        # For pipeline created by using a trigger token.
-        - if: '$CI_PIPELINE_TRIGGERED'
-        # For the branch or tag name named *-runtime-tests, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-runtime-tests$/'
+    only:
+        - triggers
+        - tags
+        - /-runtime-tests$/
     before_script:
         - TEST_CASE_NAME=${CI_JOB_NAME}
 
 one-runtime_test:
     extends: .runtime_test_base
-    rules:
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/'
+    only:
+        - /^.*-tests\..*$/
     before_script:
         - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
 aarch64_efi_defconfig: { extends: .defconfig }

buildroot/.gitlab-ci.yml.in

@@ -4,13 +4,12 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".
 
-image: buildroot/base:20200814.2228
+image: buildroot/base:20191027.2027
 
 .check_base:
-    rules:
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/ || $CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/'
-          when: never
-        - when: always
+    except:
+        - /^.*-.*_defconfig$/
+        - /^.*-tests\..*$/
 
 check-DEVELOPERS:
     extends: .check_base
@@ -28,7 +27,7 @@ check-flake8:
         - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt
         - sort -u files.txt | tee files.processed
     script:
-        - python3 -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
+        - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
     after_script:
         - wc -l files.processed
 
@@ -70,21 +69,17 @@ check-package:
     extends: .defconfig_base
     # Running the defconfigs for every push is too much, so limit to
     # explicit triggers through the API.
-    rules:
-        # For tags, create a pipeline.
-        - if: '$CI_COMMIT_TAG'
-        # For pipeline created by using a trigger token.
-        - if: '$CI_PIPELINE_TRIGGERED'
-        # For the branch or tag name named *-defconfigs, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-defconfigs$/'
+    only:
+        - triggers
+        - tags
+        - /-defconfigs$/
     before_script:
         - DEFCONFIG_NAME=${CI_JOB_NAME}
 
 one-defconfig:
     extends: .defconfig_base
-    rules:
-        # For the branch or tag name named *-*_defconfigs, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/'
+    only:
+        - /^.*-.*_defconfig$/
     before_script:
         - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
 
@@ -108,19 +103,16 @@ one-defconfig:
     extends: .runtime_test_base
     # Running the runtime tests for every push is too much, so limit to
     # explicit triggers through the API.
-    rules:
-        # For tags, create a pipeline.
-        - if: '$CI_COMMIT_TAG'
-        # For pipeline created by using a trigger token.
-        - if: '$CI_PIPELINE_TRIGGERED'
-        # For the branch or tag name named *-runtime-tests, create a pipeline.
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-runtime-tests$/'
+    only:
+        - triggers
+        - tags
+        - /-runtime-tests$/
     before_script:
         - TEST_CASE_NAME=${CI_JOB_NAME}
 
 one-runtime_test:
     extends: .runtime_test_base
-    rules:
-        - if: '$CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/'
+    only:
+        - /^.*-tests\..*$/
     before_script:
         - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')

buildroot/CHANGES

@@ -1,94 +1,3 @@
-2020.02.7, released October 12th, 2020
-
-	Important / security related fixes.
-
-	meson: Correct SDK cross-compilation.conf file when
-	per-package builds were used to build SDK.
-
-	systemd: Use /run rather than /var/run for PID files in units.
-
-	Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32.
-
-	support/script/pycompile: Rework logic to ensure .pyc files
-	contain absolute target paths, fixing code inspection at
-	runtime when executed with cwd != '/'.
-
-	support/scripts/setlocalversion: Correct Mercurial output to
-	match behaviour with Git.
-
-	support/scripts/apply-patches.sh: Use patch
-	--no-backup-if-mismatch, so we no longer blindly have to
-	remove *.orig files after patching, fixing issues with
-	packages containing such files.
-
-	Updated/fixed packages: bandwidthd, barebox, bash, bison,
-	brotli, cifs-utils, cryptsetup, dhcpcd, dhcpdump, docker-cli,
-	docker-engine, ecryptfs-utils, efl, fail2ban, freetype, gcc,
-	gdb, ghostscript, gnutls, go, gst1-plugins-base,
-	gst1-plugins-ugly, ipmitool, libhtp, libraw, libssh, libxml2,
-	libxml-parser-perl, localedef, lua, memcached, mesa3d, meson,
-	minidlna, nginx, nodejs, nss-pam-ldapd, openvmtools, php,
-	postgresql, python, python-aenum, python-autobahn,
-	python-engineio, python-fire, python-pymodbus, python-scapy,
-	python-semver, python-sentry-sdk, python-socketio,
-	python-texttable, python-tinyrpc, python-txtorcon, python3,
-	qt5base, runc, samba4, strace, supertux, suricata, systemd,
-	vlc, wayland-protocols, wireguard-linux-compat, wireshark,
-	xserver_xorg-server, zeromq, zstd
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12911: usb_modeswitch installation race condition
-	#13251: cryptsetup does not work on branch 2020.02 following..
-
-2020.02.6, released September 5th, 2020
-
-	Important / security related fixes.
-
-	Fix a 2020.02.5 build regression in busybox when systemd (and
-	not less) are enabled because of missing infrastructure.
-
-	Updated/fixed packages: alsa-utils, avahi, busybox, cups,
-	docker-cli, graphite2, imagemagick, libeXosip2, mbedtls,
-	nvidia-driver, paho-mqtt-c, python-django, systemd, uclibc,
-	usb_modeswitch, wolfssl
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12911: usb_modeswitch installation race condition
-
-2020.02.5, released August 29th, 2020
-
-	Important / security related fixes.
-
-	Infrastructure: Ensure RPATH entries that may be needed for
-	dlopen() are not dropped by patchelf.
-
-	BR_VERSION_FULL/setlocalversion (used by make print-version
-	and /etc/os-release): Properly handle local git tags
-
-	Updated/fixed packages: apache, at91bootstrap3, bind, boost,
-	busybox, capnproto, chrony, collectd, cpio, cryptsetup, cups,
-	cvs, dbus, docker-engine, domoticz, dovecot,
-	dovecot-pigeonhole, dropbear, efl, elixir, f2fs-tools, ffmpeg,
-	gd, gdk-pixbuf, ghostscript, glibc, grub2, gst1-plugins-bad,
-	hostapd, iputils, jasper, json-c, libcurl, libwebsockets,
-	linux, live555, mesa3d, mosquitto, mpv, nodejs, opencv,
-	opencv3, openjpeg, patchelf, perl, php, postgresql,
-	python-django, python-gunicorn, python-matplotlib, ripgrep,
-	rtl8188eu, rtl8821au, ruby, shadowsocks-libev, squid,
-	tpm2-abrmd, tpm2-tools, trousers, uacme, webkitgtk, wireshark,
-	wolfssl, wpa_supplicant, wpewebkit, xen, xlib_libX11,
-	xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12876: nodejs fails to build when host-icu has been built before
-	#13111: python-gunicorn: missing dependency on python-setuptools
-	#13121: wpa_supplicant fails to build without libopenssl enabled
-	#13141: Target-finalize fail with "depmod: ERROR: Bad version passed"
-	#13156: package live555 new license
-
 2020.02.4, released July 26th, 2020
 
 	Important / security related fixes.

buildroot/DEVELOPERS

@@ -186,25 +186,18 @@ F:	package/rauc/
 
 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
 F:	package/corkscrew/
-F:	package/cups/
-F:	package/cups-filters/
 F:	package/fail2ban/
-F:	package/grep/
 F:	package/i2c-tools/
-F:	package/jq/
-F:	package/libb64/
 F:	package/mender/
 F:	package/mender-artifact/
 F:	package/mono/
 F:	package/mono-gtksharp3/
 F:	package/monolite/
-F:	package/openjpeg/
 F:	package/python-can/
 F:	package/python-pillow/
 F:	package/python-pydal/
 F:	package/python-spidev/
 F:	package/python-web2py/
-F:	package/sam-ba/
 F:	package/sshguard/
 F:	package/sunwait/
 F:	package/sysdig/
@@ -218,8 +211,6 @@ N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/
 
 N:	Antoine Ténart <antoine.tenart@bootlin.com>
-F:	package/libselinux/
-F:	package/refpolicy/
 F:	package/wf111/
 
 N:	Antony Pavlov <antonynpavlov@gmail.com>
@@ -1044,7 +1035,6 @@ N:	Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
 F:	package/gnuradio/
 F:	package/gqrx/
 F:	package/gr-osmosdr/
-F:	package/librtlsdr/
 F:	package/libusbgx/
 F:	package/python-cheetah/
 F:	package/python-markdown/
@@ -1723,6 +1713,9 @@ F:	package/systemd-bootchart/
 F:	package/tinyalsa/
 F:	package/tinyxml/
 
+N:	Maxime Ripard <maxime.ripard@bootlin.com>
+F:	package/kmsxx/
+
 N:	Michael Durrant <mdurrant@arcturusnetworks.com>
 F:	board/arcturus/
 F:	configs/arcturus_ucp1020_defconfig
@@ -1817,7 +1810,6 @@ F:	package/tpm-tools/
 F:	package/trousers/
 
 N:	Norbert Lange <nolange79@gmail.com>
-F:	package/systemd/
 F:	package/tcf-agent/
 
 N:	Nylon Chen <nylon7@andestech.com>
@@ -2143,7 +2135,6 @@ F:	package/davfs2/
 
 N:	Ryan Barnett <ryan.barnett@rockwellcollins.com>
 F:	package/atftp/
-F:	package/c-periphery/
 F:	package/miraclecast/
 F:	package/python-pyasn/
 F:	package/python-pysnmp/

buildroot/Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2020.02.7
+export BR2_VERSION := 2020.02.4
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1602538000
+BR2_VERSION_EPOCH = 1595750000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -113,13 +113,7 @@ DATE := $(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
 # Need to export it, so it can be got from environment in children (eg. mconf)
-
-BR2_LOCALVERSION := $(shell $(TOPDIR)/support/scripts/setlocalversion)
-ifeq ($(BR2_LOCALVERSION),)
-export BR2_VERSION_FULL := $(BR2_VERSION)
-else
-export BR2_VERSION_FULL := $(BR2_LOCALVERSION)
-endif
+export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
 # List of targets and target patterns for which .config doesn't need to be read in
 noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
@@ -799,9 +793,9 @@ endif
 # counterparts are appropriately setup as symlinks ones to the others.
 ifeq ($(BR2_ROOTFS_MERGED_USR),y)
 
-	$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
-		@$(call MESSAGE,"Sanity check in overlay $(d)")$(sep) \
-		$(Q)not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
+	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
+		$(call MESSAGE,"Sanity check in overlay $(d)"); \
+		not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
 		test -n "$$not_merged_dirs" && { \
 			echo "ERROR: The overlay in $(d) is not" \
 				"using a merged /usr for the following directories:" \
@@ -811,20 +805,20 @@ ifeq ($(BR2_ROOTFS_MERGED_USR),y)
 
 endif # merged /usr
 
-	$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
-		@$(call MESSAGE,"Copying overlay $(d)")$(sep) \
-		$(Q)$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
+	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
+		$(call MESSAGE,"Copying overlay $(d)"); \
+		$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
 
-	$(Q)$(if $(TARGET_DIR_FILES_LISTS), \
+	$(if $(TARGET_DIR_FILES_LISTS), \
 		cat $(TARGET_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list.txt
-	$(Q)$(if $(HOST_DIR_FILES_LISTS), \
+	$(if $(HOST_DIR_FILES_LISTS), \
 		cat $(HOST_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-host.txt
-	$(Q)$(if $(STAGING_DIR_FILES_LISTS), \
+	$(if $(STAGING_DIR_FILES_LISTS), \
 		cat $(STAGING_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-staging.txt
 
-	$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
-		@$(call MESSAGE,"Executing post-build script $(s)")$(sep) \
-		$(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
+		$(call MESSAGE,"Executing post-build script $(s)"); \
+		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
 	touch $(TARGET_DIR)/usr
 

buildroot/boot/at91bootstrap3/Config.in

@@ -1,6 +1,6 @@
 config BR2_TARGET_AT91BOOTSTRAP3
 	bool "AT91 Bootstrap 3"
-	depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7
+	depends on BR2_arm926t || BR2_cortex_a5
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:

buildroot/boot/barebox/barebox.mk

@@ -88,6 +88,13 @@ $(1)_KCONFIG_DEPENDENCIES = \
 	$(BR2_BISON_HOST_DEPENDENCY) \
 	$(BR2_FLEX_HOST_DEPENDENCY)
 
+ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
+define $(1)_BUILD_BAREBOXENV_CMDS
+	$$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \
+		$$(@D)/scripts/bareboxenv.c
+endef
+endif
+
 ifeq ($$(BR2_TARGET_$(1)_CUSTOM_ENV),y)
 $(1)_ENV_NAME = $$(notdir $$(call qstrip,\
 	$$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH)))
@@ -102,23 +109,12 @@ endef
 endif
 
 ifneq ($$($(1)_CUSTOM_EMBEDDED_ENV_PATH),)
-define $(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH
-	$$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT)
-	$$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)")
+define $(1)_KCONFIG_FIXUP_CMDS
+	$$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT,$$(@D)/.config)
+	$$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)",$$(@D)/.config)
 endef
 endif
 
-define $(1)_KCONFIG_FIXUP_BAREBOXENV
-	$$(if $$(BR2_TARGET_$(1)_BAREBOXENV),\
-		$$(call KCONFIG_ENABLE_OPT,CONFIG_BAREBOXENV_TARGET),\
-		$$(call KCONFIG_DISABLE_OPT,CONFIG_BAREBOXENV_TARGET))
-endef
-
-define $(1)_KCONFIG_FIXUP_CMDS
-	$$($(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH)
-	$$($(1)_KCONFIG_FIXUP_BAREBOXENV)
-endef
-
 define $(1)_BUILD_CMDS
 	$$($(1)_BUILD_BAREBOXENV_CMDS)
 	$$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D)
@@ -140,7 +136,7 @@ endef
 
 ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
 define $(1)_INSTALL_TARGET_CMDS
-	cp $$(@D)/scripts/bareboxenv-target $$(TARGET_DIR)/usr/bin/bareboxenv
+	cp $$(@D)/bareboxenv $$(TARGET_DIR)/usr/bin
 endef
 endif
 

buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch

@@ -1,73 +0,0 @@
-From a7ab0cc98fa89a3d5098c29cbe44bcd24b0a6454 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 15 Apr 2020 15:45:02 -0400
-Subject: [PATCH] yylex: Make lexer fatal errors actually be fatal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When presented with a command that can't be tokenized to anything
-smaller than YYLMAX characters, the parser calls YY_FATAL_ERROR(errmsg),
-expecting that will stop further processing, as such:
-
-  #define YY_DO_BEFORE_ACTION \
-        yyg->yytext_ptr = yy_bp; \
-        yyleng = (int) (yy_cp - yy_bp); \
-        yyg->yy_hold_char = *yy_cp; \
-        *yy_cp = '\0'; \
-        if ( yyleng >= YYLMAX ) \
-                YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-        yy_flex_strncpy( yytext, yyg->yytext_ptr, yyleng + 1 , yyscanner); \
-        yyg->yy_c_buf_p = yy_cp;
-
-The code flex generates expects that YY_FATAL_ERROR() will either return
-for it or do some form of longjmp(), or handle the error in some way at
-least, and so the strncpy() call isn't in an "else" clause, and thus if
-YY_FATAL_ERROR() is *not* actually fatal, it does the call with the
-questionable limit, and predictable results ensue.
-
-Unfortunately, our implementation of YY_FATAL_ERROR() is:
-
-   #define YY_FATAL_ERROR(msg)                     \
-     do {                                          \
-       grub_printf (_("fatal error: %s\n"), _(msg));     \
-     } while (0)
-
-The same pattern exists in yyless(), and similar problems exist in users
-of YY_INPUT(), several places in the main parsing loop,
-yy_get_next_buffer(), yy_load_buffer_state(), yyensure_buffer_stack,
-yy_scan_buffer(), etc.
-
-All of these callers expect YY_FATAL_ERROR() to actually be fatal, and
-the things they do if it returns after calling it are wildly unsafe.
-
-Fixes: CVE-2020-10713
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/script/yylex.l | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 7b44c37b7..b7203c823 100644
---- a/grub-core/script/yylex.l
-+++ b/grub-core/script/yylex.l
-@@ -37,11 +37,11 @@
- 
- /* 
-  * As we don't have access to yyscanner, we cannot do much except to
-- * print the fatal error.
-+ * print the fatal error and exit.
-  */
- #define YY_FATAL_ERROR(msg)                     \
-   do {                                          \
--    grub_printf (_("fatal error: %s\n"), _(msg));     \
-+    grub_fatal (_("fatal error: %s\n"), _(msg));\
-   } while (0)
- 
- #define COPY(str, hint)                         \
--- 
-2.26.2
-

buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch

@@ -1,128 +0,0 @@
-From 782a4580a5e347793443aa8e9152db1bf4a0fff8 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 15 Jun 2020 10:58:42 -0400
-Subject: [PATCH] safemath: Add some arithmetic primitives that check for
- overflow
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This adds a new header, include/grub/safemath.h, that includes easy to
-use wrappers for __builtin_{add,sub,mul}_overflow() declared like:
-
-  bool OP(a, b, res)
-
-where OP is grub_add, grub_sub or grub_mul. OP() returns true in the
-case where the operation would overflow and res is not modified.
-Otherwise, false is returned and the operation is executed.
-
-These arithmetic primitives require newer compiler versions. So, bump
-these requirements in the INSTALL file too.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- INSTALL                 | 22 ++--------------------
- include/grub/compiler.h |  8 ++++++++
- include/grub/safemath.h | 37 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 47 insertions(+), 20 deletions(-)
- create mode 100644 include/grub/safemath.h
-
-diff --git a/INSTALL b/INSTALL
-index 8acb40902..dcb9b7d7b 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
- you don't have any of them, please obtain and install them before
- configuring the GRUB.
- 
--* GCC 4.1.3 or later
--  Note: older versions may work but support is limited
--
--  Experimental support for clang 3.3 or later (results in much bigger binaries)
-+* GCC 5.1.0 or later
-+  Experimental support for clang 3.8.0 or later (results in much bigger binaries)
-   for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64
--  Note: clang 3.2 or later works for i386 and x86_64 targets but results in
--        much bigger binaries.
--	earlier versions not tested
--  Note: clang 3.2 or later works for arm
--	earlier versions not tested
--  Note: clang on arm64 is not supported due to
--	https://llvm.org/bugs/show_bug.cgi?id=26030
--  Note: clang 3.3 or later works for mips(el)
--	earlier versions fail to generate .reginfo and hence gprel relocations
--	fail.
--  Note: clang 3.2 or later works for powerpc
--	earlier versions not tested
--  Note: clang 3.5 or later works for sparc64
--        earlier versions return "error: unable to interface with target machine"
--  Note: clang has no support for ia64 and hence you can't compile GRUB
--	for ia64 with clang
- * GNU Make
- * GNU Bison 2.3 or later
- * GNU gettext 0.17 or later
-diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index c9e1d7a73..8f3be3ae7 100644
---- a/include/grub/compiler.h
-+++ b/include/grub/compiler.h
-@@ -48,4 +48,12 @@
- #  define WARN_UNUSED_RESULT
- #endif
- 
-+#if defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__)
-+#  define CLANG_PREREQ(maj,min) \
-+          ((__clang_major__ > (maj)) || \
-+	   (__clang_major__ == (maj) && __clang_minor__ >= (min)))
-+#else
-+#  define CLANG_PREREQ(maj,min) 0
-+#endif
-+
- #endif /* ! GRUB_COMPILER_HEADER */
-diff --git a/include/grub/safemath.h b/include/grub/safemath.h
-new file mode 100644
-index 000000000..c17b89bba
---- /dev/null
-+++ b/include/grub/safemath.h
-@@ -0,0 +1,37 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2020  Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *  Arithmetic operations that protect against overflow.
-+ */
-+
-+#ifndef GRUB_SAFEMATH_H
-+#define GRUB_SAFEMATH_H 1
-+
-+#include <grub/compiler.h>
-+
-+/* These appear in gcc 5.1 and clang 3.8. */
-+#if GNUC_PREREQ(5, 1) || CLANG_PREREQ(3, 8)
-+
-+#define grub_add(a, b, res)	__builtin_add_overflow(a, b, res)
-+#define grub_sub(a, b, res)	__builtin_sub_overflow(a, b, res)
-+#define grub_mul(a, b, res)	__builtin_mul_overflow(a, b, res)
-+
-+#else
-+#error gcc 5.1 or newer or clang 3.8 or newer is required
-+#endif
-+
-+#endif /* GRUB_SAFEMATH_H */
--- 
-2.26.2
-

buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch

@@ -1,246 +0,0 @@
-From 5775eb40862b67468ced816e6d7560dbe22a3670 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 15 Jun 2020 12:15:29 -0400
-Subject: [PATCH] calloc: Make sure we always have an overflow-checking
- calloc() available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This tries to make sure that everywhere in this source tree, we always have
-an appropriate version of calloc() (i.e. grub_calloc(), xcalloc(), etc.)
-available, and that they all safely check for overflow and return NULL when
-it would occur.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/kern/emu/misc.c          | 12 +++++++++
- grub-core/kern/emu/mm.c            | 10 ++++++++
- grub-core/kern/mm.c                | 40 ++++++++++++++++++++++++++++++
- grub-core/lib/libgcrypt_wrap/mem.c | 11 ++++++--
- grub-core/lib/posix_wrap/stdlib.h  |  8 +++++-
- include/grub/emu/misc.h            |  1 +
- include/grub/mm.h                  |  6 +++++
- 7 files changed, 85 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 65db79baa..dfd8a8ec4 100644
---- a/grub-core/kern/emu/misc.c
-+++ b/grub-core/kern/emu/misc.c
-@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...)
-   exit (1);
- }
- 
-+void *
-+xcalloc (grub_size_t nmemb, grub_size_t size)
-+{
-+  void *p;
-+
-+  p = calloc (nmemb, size);
-+  if (!p)
-+    grub_util_error ("%s", _("out of memory"));
-+
-+  return p;
-+}
-+
- void *
- xmalloc (grub_size_t size)
- {
-diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
-index f262e95e3..145b01d37 100644
---- a/grub-core/kern/emu/mm.c
-+++ b/grub-core/kern/emu/mm.c
-@@ -25,6 +25,16 @@
- #include <string.h>
- #include <grub/i18n.h>
- 
-+void *
-+grub_calloc (grub_size_t nmemb, grub_size_t size)
-+{
-+  void *ret;
-+  ret = calloc (nmemb, size);
-+  if (!ret)
-+    grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-+  return ret;
-+}
-+
- void *
- grub_malloc (grub_size_t size)
- {
-diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index ee88ff611..f2822a836 100644
---- a/grub-core/kern/mm.c
-+++ b/grub-core/kern/mm.c
-@@ -67,8 +67,10 @@
- #include <grub/dl.h>
- #include <grub/i18n.h>
- #include <grub/mm_private.h>
-+#include <grub/safemath.h>
- 
- #ifdef MM_DEBUG
-+# undef grub_calloc
- # undef grub_malloc
- # undef grub_zalloc
- # undef grub_realloc
-@@ -375,6 +377,30 @@ grub_memalign (grub_size_t align, grub_size_t size)
-   return 0;
- }
- 
-+/*
-+ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on
-+ * integer overflow.
-+ */
-+void *
-+grub_calloc (grub_size_t nmemb, grub_size_t size)
-+{
-+  void *ret;
-+  grub_size_t sz = 0;
-+
-+  if (grub_mul (nmemb, size, &sz))
-+    {
-+      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-+      return NULL;
-+    }
-+
-+  ret = grub_memalign (0, sz);
-+  if (!ret)
-+    return NULL;
-+
-+  grub_memset (ret, 0, sz);
-+  return ret;
-+}
-+
- /* Allocate SIZE bytes and return the pointer.  */
- void *
- grub_malloc (grub_size_t size)
-@@ -561,6 +587,20 @@ grub_mm_dump (unsigned lineno)
-   grub_printf ("\n");
- }
- 
-+void *
-+grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t size)
-+{
-+  void *ptr;
-+
-+  if (grub_mm_debug)
-+    grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ",
-+		 file, line, size);
-+  ptr = grub_calloc (nmemb, size);
-+  if (grub_mm_debug)
-+    grub_printf ("%p\n", ptr);
-+  return ptr;
-+}
-+
- void *
- grub_debug_malloc (const char *file, int line, grub_size_t size)
- {
-diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
-index beeb661a3..74c6eafe5 100644
---- a/grub-core/lib/libgcrypt_wrap/mem.c
-+++ b/grub-core/lib/libgcrypt_wrap/mem.c
-@@ -4,6 +4,7 @@
- #include <grub/crypto.h>
- #include <grub/dl.h>
- #include <grub/env.h>
-+#include <grub/safemath.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -36,7 +37,10 @@ void *
- gcry_xcalloc (size_t n, size_t m)
- {
-   void *ret;
--  ret = grub_zalloc (n * m);
-+  size_t sz;
-+  if (grub_mul (n, m, &sz))
-+    grub_fatal ("gcry_xcalloc would overflow");
-+  ret = grub_zalloc (sz);
-   if (!ret)
-     grub_fatal ("gcry_xcalloc failed");
-   return ret;
-@@ -56,7 +60,10 @@ void *
- gcry_xcalloc_secure (size_t n, size_t m)
- {
-   void *ret;
--  ret = grub_zalloc (n * m);
-+  size_t sz;
-+  if (grub_mul (n, m, &sz))
-+    grub_fatal ("gcry_xcalloc would overflow");
-+  ret = grub_zalloc (sz);
-   if (!ret)
-     grub_fatal ("gcry_xcalloc failed");
-   return ret;
-diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
-index 3b46f47ff..7a8d385e9 100644
---- a/grub-core/lib/posix_wrap/stdlib.h
-+++ b/grub-core/lib/posix_wrap/stdlib.h
-@@ -21,6 +21,7 @@
- 
- #include <grub/mm.h>
- #include <grub/misc.h>
-+#include <grub/safemath.h>
- 
- static inline void 
- free (void *ptr)
-@@ -37,7 +38,12 @@ malloc (grub_size_t size)
- static inline void *
- calloc (grub_size_t size, grub_size_t nelem)
- {
--  return grub_zalloc (size * nelem);
-+  grub_size_t sz;
-+
-+  if (grub_mul (size, nelem, &sz))
-+    return NULL;
-+
-+  return grub_zalloc (sz);
- }
- 
- static inline void *
-diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index ce464cfd0..ff9c48a64 100644
---- a/include/grub/emu/misc.h
-+++ b/include/grub/emu/misc.h
-@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev);
- #define GRUB_HOST_PRIuLONG_LONG "llu"
- #define GRUB_HOST_PRIxLONG_LONG "llx"
- 
-+void * EXPORT_FUNC(xcalloc) (grub_size_t nmemb, grub_size_t size) WARN_UNUSED_RESULT;
- void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT;
- void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
- char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
-diff --git a/include/grub/mm.h b/include/grub/mm.h
-index 28e2e53eb..9c38dd3ca 100644
---- a/include/grub/mm.h
-+++ b/include/grub/mm.h
-@@ -29,6 +29,7 @@
- #endif
- 
- void grub_mm_init_region (void *addr, grub_size_t size);
-+void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);
- void *EXPORT_FUNC(grub_malloc) (grub_size_t size);
- void *EXPORT_FUNC(grub_zalloc) (grub_size_t size);
- void EXPORT_FUNC(grub_free) (void *ptr);
-@@ -48,6 +49,9 @@ extern int EXPORT_VAR(grub_mm_debug);
- void grub_mm_dump_free (void);
- void grub_mm_dump (unsigned lineno);
- 
-+#define grub_calloc(nmemb, size)	\
-+  grub_debug_calloc (GRUB_FILE, __LINE__, nmemb, size)
-+
- #define grub_malloc(size)	\
-   grub_debug_malloc (GRUB_FILE, __LINE__, size)
- 
-@@ -63,6 +67,8 @@ void grub_mm_dump (unsigned lineno);
- #define grub_free(ptr)	\
-   grub_debug_free (GRUB_FILE, __LINE__, ptr)
- 
-+void *EXPORT_FUNC(grub_debug_calloc) (const char *file, int line,
-+				      grub_size_t nmemb, grub_size_t size);
- void *EXPORT_FUNC(grub_debug_malloc) (const char *file, int line,
- 				      grub_size_t size);
- void *EXPORT_FUNC(grub_debug_zalloc) (const char *file, int line,
--- 
-2.26.2
-

buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch

@@ -1,72 +0,0 @@
-From e0dd17a3ce79c6622dc78c96e1f2ef1b20e2bf7b Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Sat, 4 Jul 2020 12:25:09 -0400
-Subject: [PATCH] iso9660: Don't leak memory on realloc() failures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/fs/iso9660.c | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 7ba5b300b..5ec4433b8 100644
---- a/grub-core/fs/iso9660.c
-+++ b/grub-core/fs/iso9660.c
-@@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx,
- {
-   int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0;
-   grub_size_t sz;
-+  char *new;
- 
-   if (grub_add (size, len2, &sz) ||
-       grub_add (sz, 1, &sz))
-     return;
- 
--  ctx->symlink = grub_realloc (ctx->symlink, sz);
--  if (! ctx->symlink)
--    return;
-+  new = grub_realloc (ctx->symlink, sz);
-+  if (!new)
-+    {
-+      grub_free (ctx->symlink);
-+      ctx->symlink = NULL;
-+      return;
-+    }
-+  ctx->symlink = new;
- 
-   grub_memcpy (ctx->symlink + size, part, len2);
-   ctx->symlink[size + len2] = 0;  
-@@ -634,7 +640,12 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry,
- 		   is the length.  Both are part of the `Component
- 		   Record'.  */
- 		if (ctx->symlink && !ctx->was_continue)
--		  add_part (ctx, "/", 1);
-+		  {
-+		    add_part (ctx, "/", 1);
-+		    if (grub_errno)
-+		      return grub_errno;
-+		  }
-+
- 		add_part (ctx, (char *) &entry->data[pos + 2],
- 			  entry->data[pos + 1]);
- 		ctx->was_continue = (entry->data[pos] & 1);
-@@ -653,6 +664,11 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry,
- 	      add_part (ctx, "/", 1);
- 	      break;
- 	    }
-+
-+	  /* Check if grub_realloc() failed in add_part(). */
-+	  if (grub_errno)
-+	    return grub_errno;
-+
- 	  /* In pos + 1 the length of the `Component Record' is
- 	     stored.  */
- 	  pos += entry->data[pos + 1] + 2;
--- 
-2.26.2
-

buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch

@@ -1,41 +0,0 @@
-From 73bc7a964c9496d5b0f00dbd69959dacf5adcebe Mon Sep 17 00:00:00 2001
-From: Daniel Kiper <daniel.kiper@oracle.com>
-Date: Tue, 7 Jul 2020 15:36:26 +0200
-Subject: [PATCH] font: Do not load more than one NAME section
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The GRUB font file can have one NAME section only. Though if somebody
-crafts a broken font file with many NAME sections and loads it then the
-GRUB leaks memory. So, prevent against that by loading first NAME
-section and failing in controlled way on following one.
-
-Reported-by: Chris Coulson <chris.coulson@canonical.com>
-Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
-Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/font/font.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 5edb477ac..d09bb38d8 100644
---- a/grub-core/font/font.c
-+++ b/grub-core/font/font.c
-@@ -532,6 +532,12 @@ grub_font_load (const char *filename)
-       if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FONT_NAME,
- 		       sizeof (FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0)
- 	{
-+	  if (font->name != NULL)
-+	    {
-+	      grub_error (GRUB_ERR_BAD_FONT, "invalid font file: too many NAME sections");
-+	      goto fail;
-+	    }
-+
- 	  font->name = read_section_as_string (&section);
- 	  if (!font->name)
- 	    goto fail;
--- 
-2.26.2
-

buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch

@@ -1,39 +0,0 @@
-From 9ff609f0e7798bc5fb04f791131c98e7693bdd9b Mon Sep 17 00:00:00 2001
-From: Alexey Makhalov <amakhalov@vmware.com>
-Date: Wed, 8 Jul 2020 20:41:56 +0000
-Subject: [PATCH] gfxmenu: Fix double free in load_image()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-self->bitmap should be zeroed after free. Otherwise, there is a chance
-to double free (USE_AFTER_FREE) it later in rescale_image().
-
-Fixes: CID 292472
-
-Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/gfxmenu/gui_image.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
-index 29784ed2d..6b2e976f1 100644
---- a/grub-core/gfxmenu/gui_image.c
-+++ b/grub-core/gfxmenu/gui_image.c
-@@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
-     return grub_errno;
- 
-   if (self->bitmap && (self->bitmap != self->raw_bitmap))
--    grub_video_bitmap_destroy (self->bitmap);
-+    {
-+      grub_video_bitmap_destroy (self->bitmap);
-+      self->bitmap = 0;
-+    }
-   if (self->raw_bitmap)
-     grub_video_bitmap_destroy (self->raw_bitmap);
- 
--- 
-2.26.2
-

buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch

@@ -1,58 +0,0 @@
-From dc9777dc17697b196c415c53187a55861d41fd2a Mon Sep 17 00:00:00 2001
-From: Alexey Makhalov <amakhalov@vmware.com>
-Date: Wed, 8 Jul 2020 21:30:43 +0000
-Subject: [PATCH] xnu: Fix double free in grub_xnu_devprop_add_property()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-grub_xnu_devprop_add_property() should not free utf8 and utf16 as it get
-allocated and freed in the caller.
-
-Minor improvement: do prop fields initialization after memory allocations.
-
-Fixes: CID 292442, CID 292457, CID 292460, CID 292466
-
-Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/loader/i386/xnu.c | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index b7d176b5d..e9e119259 100644
---- a/grub-core/loader/i386/xnu.c
-+++ b/grub-core/loader/i386/xnu.c
-@@ -262,20 +262,19 @@ grub_xnu_devprop_add_property (struct grub_xnu_devprop_device_descriptor *dev,
-   if (!prop)
-     return grub_errno;
- 
--  prop->name = utf8;
--  prop->name16 = utf16;
--  prop->name16len = utf16len;
--
--  prop->length = datalen;
--  prop->data = grub_malloc (prop->length);
-+  prop->data = grub_malloc (datalen);
-   if (!prop->data)
-     {
--      grub_free (prop->name);
--      grub_free (prop->name16);
-       grub_free (prop);
-       return grub_errno;
-     }
--  grub_memcpy (prop->data, data, prop->length);
-+  grub_memcpy (prop->data, data, datalen);
-+
-+  prop->name = utf8;
-+  prop->name16 = utf16;
-+  prop->name16len = utf16len;
-+  prop->length = datalen;
-+
-   grub_list_push (GRUB_AS_LIST_P (&dev->properties),
- 		  GRUB_AS_LIST (prop));
-   return GRUB_ERR_NONE;
--- 
-2.26.2
-

buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch

@@ -1,55 +0,0 @@
-From 78829f0c230680e386fff9f420bb1631bc20f761 Mon Sep 17 00:00:00 2001
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Thu, 9 Jul 2020 03:05:23 +0000
-Subject: [PATCH] lzma: Make sure we don't dereference past array
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The two dimensional array p->posSlotEncoder[4][64] is being dereferenced
-using the GetLenToPosState() macro which checks if len is less than 5,
-and if so subtracts 2 from it. If len = 0, that is 0 - 2 = 4294967294.
-Obviously we don't want to dereference that far out so we check if the
-position found is greater or equal kNumLenToPosStates (4) and bail out.
-
-N.B.: Upstream LZMA 18.05 and later has this function completely rewritten
-without any history.
-
-Fixes: CID 51526
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/lib/LzmaEnc.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
-index f2ec04a8c..753e56a95 100644
---- a/grub-core/lib/LzmaEnc.c
-+++ b/grub-core/lib/LzmaEnc.c
-@@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
-       }
-       else
-       {
--        UInt32 posSlot;
-+        UInt32 posSlot, lenToPosState;
-         RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-         p->state = kMatchNextStates[p->state];
-         LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-         pos -= LZMA_NUM_REPS;
-         GetPosSlot(pos, posSlot);
--        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        lenToPosState = GetLenToPosState(len);
-+        if (lenToPosState >= kNumLenToPosStates)
-+        {
-+          p->result = SZ_ERROR_DATA;
-+          return CheckErrors(p);
-+        }
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[lenToPosState], kNumPosSlotBits, posSlot);
- 
-         if (posSlot >= kStartPosModelIndex)
-         {
--- 
-2.26.2
-

buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch

@@ -1,69 +0,0 @@
-From 8d3b6f9da468f666e3a7976657f2ab5c52762a21 Mon Sep 17 00:00:00 2001
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Tue, 7 Jul 2020 15:12:25 -0400
-Subject: [PATCH] term: Fix overflow on user inputs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This requires a very weird input from the serial interface but can cause
-an overflow in input_buf (keys) overwriting the next variable (npending)
-with the user choice:
-
-(pahole output)
-
-struct grub_terminfo_input_state {
-        int                        input_buf[6];         /*     0    24 */
-        int                        npending;             /*    24     4 */ <- CORRUPT
-        ...snip...
-
-The magic string requires causing this is "ESC,O,],0,1,2,q" and we overflow
-npending with "q" (aka increase npending to 161). The simplest fix is to
-just to disallow overwrites input_buf, which exactly what this patch does.
-
-Fixes: CID 292449
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/term/terminfo.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa36..5fa94c0c3 100644
---- a/grub-core/term/terminfo.c
-+++ b/grub-core/term/terminfo.c
-@@ -398,7 +398,7 @@ grub_terminfo_getwh (struct grub_term_output *term)
- }
- 
- static void
--grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
-+grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int max_len,
- 		       int (*readkey) (struct grub_term_input *term))
- {
-   int c;
-@@ -414,6 +414,9 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
-     if (c == -1)						\
-       return;							\
- 								\
-+    if (*len >= max_len)                                       \
-+      return;                                                   \
-+                                                                \
-     keys[*len] = c;						\
-     (*len)++;							\
-   }
-@@ -602,8 +605,8 @@ grub_terminfo_getkey (struct grub_term_input *termi)
-       return ret;
-     }
- 
--  grub_terminfo_readkey (termi, data->input_buf,
--			 &data->npending, data->readkey);
-+  grub_terminfo_readkey (termi, data->input_buf, &data->npending,
-+			 GRUB_TERMINFO_READKEY_MAX_LEN, data->readkey);
- 
- #if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
-   if (data->npending == 1 && data->input_buf[0] == GRUB_TERM_ESC
--- 
-2.26.2
-

buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch

@@ -1,59 +0,0 @@
-From 748b691761d31bfff7e9d0d210caa606294c2b52 Mon Sep 17 00:00:00 2001
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Tue, 7 Jul 2020 22:02:31 -0400
-Subject: [PATCH] udf: Fix memory leak
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: CID 73796
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/fs/udf.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index 21ac7f446..2ac5c1d00 100644
---- a/grub-core/fs/udf.c
-+++ b/grub-core/fs/udf.c
-@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
- 	    return 0;
- 
-           if (grub_udf_read_icb (dir->data, &dirent.icb, child))
--	    return 0;
--
-+	    {
-+	      grub_free (child);
-+	      return 0;
-+	    }
-           if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT)
- 	    {
- 	      /* This is the parent directory.  */
-@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
- 				       dirent.file_ident_length,
- 				       (char *) raw))
- 		  != dirent.file_ident_length)
--		return 0;
-+		{
-+		  grub_free (child);
-+		  return 0;
-+		}
- 
- 	      filename = read_string (raw, dirent.file_ident_length, 0);
- 	      if (!filename)
--		grub_print_error ();
-+		{
-+		  /* As the hook won't get called. */
-+		  grub_free (child);
-+		  grub_print_error ();
-+		}
- 
- 	      if (filename && hook (filename, type, child, hook_data))
- 		{
--- 
-2.26.2
-

buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch

@@ -1,38 +0,0 @@
-From 49bf3faa106498e151306fc780c63194a14751e3 Mon Sep 17 00:00:00 2001
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Fri, 26 Jun 2020 10:51:43 -0400
-Subject: [PATCH] multiboot2: Fix memory leak if
- grub_create_loader_cmdline() fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: CID 292468
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/loader/multiboot_mbi2.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 53da78615..0efc66062 100644
---- a/grub-core/loader/multiboot_mbi2.c
-+++ b/grub-core/loader/multiboot_mbi2.c
-@@ -1070,7 +1070,11 @@ grub_multiboot2_add_module (grub_addr_t start, grub_size_t size,
-   err = grub_create_loader_cmdline (argc, argv, newmod->cmdline,
- 				    newmod->cmdline_size, GRUB_VERIFY_MODULE_CMDLINE);
-   if (err)
--    return err;
-+    {
-+      grub_free (newmod->cmdline);
-+      grub_free (newmod);
-+      return err;
-+    }
- 
-   if (modules_last)
-     modules_last->next = newmod;
--- 
-2.26.2
-

buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch

@@ -1,283 +0,0 @@
-From b6c4a1b204740fe52b32e7f530831a59f4038e20 Mon Sep 17 00:00:00 2001
-From: Alexey Makhalov <amakhalov@vmware.com>
-Date: Thu, 9 Jul 2020 08:10:40 +0000
-Subject: [PATCH] tftp: Do not use priority queue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is not need to reassemble the order of blocks. Per RFC 1350,
-server must wait for the ACK, before sending next block. Data packets
-can be served immediately without putting them to priority queue.
-
-Logic to handle incoming packet is this:
-  - if packet block id equal to expected block id, then
-    process the packet,
-  - if packet block id is less than expected - this is retransmit
-    of old packet, then ACK it and drop the packet,
-  - if packet block id is more than expected - that shouldn't
-    happen, just drop the packet.
-
-It makes the tftp receive path code simpler, smaller and faster.
-As a benefit, this change fixes CID# 73624 and CID# 96690, caused
-by following while loop:
-
-  while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0)
-
-where tftph pointer is not moving from one iteration to another, causing
-to serve same packet again. Luckily, double serving didn't happen due to
-data->block++ during the first iteration.
-
-Fixes: CID 73624, CID 96690
-
-Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- grub-core/net/tftp.c | 168 ++++++++++++++-----------------------------
- 1 file changed, 53 insertions(+), 115 deletions(-)
-
-diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7d90bf66e..b4297bc8d 100644
---- a/grub-core/net/tftp.c
-+++ b/grub-core/net/tftp.c
-@@ -25,7 +25,6 @@
- #include <grub/mm.h>
- #include <grub/dl.h>
- #include <grub/file.h>
--#include <grub/priority_queue.h>
- #include <grub/i18n.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
-@@ -106,31 +105,8 @@ typedef struct tftp_data
-   int have_oack;
-   struct grub_error_saved save_err;
-   grub_net_udp_socket_t sock;
--  grub_priority_queue_t pq;
- } *tftp_data_t;
- 
--static int
--cmp_block (grub_uint16_t a, grub_uint16_t b)
--{
--  grub_int16_t i = (grub_int16_t) (a - b);
--  if (i > 0)
--    return +1;
--  if (i < 0)
--    return -1;
--  return 0;
--}
--
--static int
--cmp (const void *a__, const void *b__)
--{
--  struct grub_net_buff *a_ = *(struct grub_net_buff **) a__;
--  struct grub_net_buff *b_ = *(struct grub_net_buff **) b__;
--  struct tftphdr *a = (struct tftphdr *) a_->data;
--  struct tftphdr *b = (struct tftphdr *) b_->data;
--  /* We want the first elements to be on top.  */
--  return -cmp_block (grub_be_to_cpu16 (a->u.data.block), grub_be_to_cpu16 (b->u.data.block));
--}
--
- static grub_err_t
- ack (tftp_data_t data, grub_uint64_t block)
- {
-@@ -207,73 +183,60 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
- 	  return GRUB_ERR_NONE;
- 	}
- 
--      err = grub_priority_queue_push (data->pq, &nb);
--      if (err)
--	return err;
--
--      {
--	struct grub_net_buff **nb_top_p, *nb_top;
--	while (1)
--	  {
--	    nb_top_p = grub_priority_queue_top (data->pq);
--	    if (!nb_top_p)
--	      return GRUB_ERR_NONE;
--	    nb_top = *nb_top_p;
--	    tftph = (struct tftphdr *) nb_top->data;
--	    if (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) >= 0)
--	      break;
--	    ack (data, grub_be_to_cpu16 (tftph->u.data.block));
--	    grub_netbuff_free (nb_top);
--	    grub_priority_queue_pop (data->pq);
--	  }
--	while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0)
--	  {
--	    unsigned size;
--
--	    grub_priority_queue_pop (data->pq);
--
--	    if (file->device->net->packs.count < 50)
-+      /* Ack old/retransmitted block. */
-+      if (grub_be_to_cpu16 (tftph->u.data.block) < data->block + 1)
-+	ack (data, grub_be_to_cpu16 (tftph->u.data.block));
-+      /* Ignore unexpected block. */
-+      else if (grub_be_to_cpu16 (tftph->u.data.block) > data->block + 1)
-+	grub_dprintf ("tftp", "TFTP unexpected block # %d\n", tftph->u.data.block);
-+      else
-+	{
-+	  unsigned size;
-+
-+	  if (file->device->net->packs.count < 50)
-+	    {
- 	      err = ack (data, data->block + 1);
--	    else
--	      {
--		file->device->net->stall = 1;
--		err = 0;
--	      }
--	    if (err)
--	      return err;
--
--	    err = grub_netbuff_pull (nb_top, sizeof (tftph->opcode) +
--				     sizeof (tftph->u.data.block));
--	    if (err)
--	      return err;
--	    size = nb_top->tail - nb_top->data;
--
--	    data->block++;
--	    if (size < data->block_size)
--	      {
--		if (data->ack_sent < data->block)
--		  ack (data, data->block);
--		file->device->net->eof = 1;
--		file->device->net->stall = 1;
--		grub_net_udp_close (data->sock);
--		data->sock = NULL;
--	      }
--	    /* Prevent garbage in broken cards. Is it still necessary
--	       given that IP implementation has been fixed?
--	     */
--	    if (size > data->block_size)
--	      {
--		err = grub_netbuff_unput (nb_top, size - data->block_size);
--		if (err)
--		  return err;
--	      }
--	    /* If there is data, puts packet in socket list. */
--	    if ((nb_top->tail - nb_top->data) > 0)
--	      grub_net_put_packet (&file->device->net->packs, nb_top);
--	    else
--	      grub_netbuff_free (nb_top);
--	  }
--      }
-+	      if (err)
-+		return err;
-+	    }
-+	  else
-+	    file->device->net->stall = 1;
-+
-+	  err = grub_netbuff_pull (nb, sizeof (tftph->opcode) +
-+				   sizeof (tftph->u.data.block));
-+	  if (err)
-+	    return err;
-+	  size = nb->tail - nb->data;
-+
-+	  data->block++;
-+	  if (size < data->block_size)
-+	    {
-+	      if (data->ack_sent < data->block)
-+		ack (data, data->block);
-+	      file->device->net->eof = 1;
-+	      file->device->net->stall = 1;
-+	      grub_net_udp_close (data->sock);
-+	      data->sock = NULL;
-+	    }
-+	  /*
-+	   * Prevent garbage in broken cards. Is it still necessary
-+	   * given that IP implementation has been fixed?
-+	   */
-+	  if (size > data->block_size)
-+	    {
-+	      err = grub_netbuff_unput (nb, size - data->block_size);
-+	      if (err)
-+		return err;
-+	    }
-+	  /* If there is data, puts packet in socket list. */
-+	  if ((nb->tail - nb->data) > 0)
-+	    {
-+	      grub_net_put_packet (&file->device->net->packs, nb);
-+	      /* Do not free nb. */
-+	      return GRUB_ERR_NONE;
-+	    }
-+	}
-+      grub_netbuff_free (nb);
-       return GRUB_ERR_NONE;
-     case TFTP_ERROR:
-       data->have_oack = 1;
-@@ -287,19 +250,6 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
-     }
- }
- 
--static void
--destroy_pq (tftp_data_t data)
--{
--  struct grub_net_buff **nb_p;
--  while ((nb_p = grub_priority_queue_top (data->pq)))
--    {
--      grub_netbuff_free (*nb_p);
--      grub_priority_queue_pop (data->pq);
--    }
--
--  grub_priority_queue_destroy (data->pq);
--}
--
- static grub_err_t
- tftp_open (struct grub_file *file, const char *filename)
- {
-@@ -372,17 +322,9 @@ tftp_open (struct grub_file *file, const char *filename)
-   file->not_easily_seekable = 1;
-   file->data = data;
- 
--  data->pq = grub_priority_queue_new (sizeof (struct grub_net_buff *), cmp);
--  if (!data->pq)
--    {
--      grub_free (data);
--      return grub_errno;
--    }
--
-   err = grub_net_resolve_address (file->device->net->server, &addr);
-   if (err)
-     {
--      destroy_pq (data);
-       grub_free (data);
-       return err;
-     }
-@@ -392,7 +334,6 @@ tftp_open (struct grub_file *file, const char *filename)
- 				  file);
-   if (!data->sock)
-     {
--      destroy_pq (data);
-       grub_free (data);
-       return grub_errno;
-     }
-@@ -406,7 +347,6 @@ tftp_open (struct grub_file *file, const char *filename)
-       if (err)
- 	{
- 	  grub_net_udp_close (data->sock);
--	  destroy_pq (data);
- 	  grub_free (data);
- 	  return err;
- 	}
-@@ -423,7 +363,6 @@ tftp_open (struct grub_file *file, const char *filename)
-   if (grub_errno)
-     {
-       grub_net_udp_close (data->sock);
--      destroy_pq (data);
-       grub_free (data);
-       return grub_errno;
-     }
-@@ -466,7 +405,6 @@ tftp_close (struct grub_file *file)
- 	grub_print_error ();
-       grub_net_udp_close (data->sock);
-     }
--  destroy_pq (data);
-   grub_free (data);
-   return GRUB_ERR_NONE;
- }
--- 
-2.26.2
-