Fix release builds without dev part in version number (#1396 )

Bump linux to 5.10.42 (#1395 )
* Linux: Update kernel 5.10.42 * Fix kernel version documentation
2021-06-09 01:18:42 +02:00 · 2021-06-08 23:59:31 +02:00 · 2021-06-08 23:44:06 +02:00 · 2021-06-07 11:51:06 +02:00 · 2021-06-05 15:17:14 +02:00 · 2021-06-05 15:16:56 +02:00
40 changed files with 1925 additions and 30 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,5 +3,9 @@ buildroot/
 buildroot-external/
 buildroot-patches/

-# Ignore too
+# Release directory gets created using build scripts
 release/
+
+# Ignore hidden directories as well
+.git/
+.github/
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,8 +29,10 @@ jobs:
          fi
          if [ "" != "${tag_dev}" ]; then
            echo "Note: Release build with custom dev part: ${tag_dev}."
+            echo "::set-output name=version::${major}.${build}.${tag_dev}"
+          else
+            echo "::set-output name=version::${major}.${build}"
          fi
-          echo "::set-output name=version::${major}.${build}.${tag_dev}"
          echo "::set-output name=version_dev::${tag_dev}"

  build:
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -5,15 +5,15 @@ Default Kernel tree: 5.10

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.10.37 |
+| Open Virtual Appliance | 5.10.42 |
 | Raspberry Pi | 5.10.17 |
 | Raspberry Pi 0-W | 5.10.17 |
 | Raspberry Pi 2 | 5.10.17 |
 | Raspberry Pi 3 | 5.10.17 |
 | Raspberry Pi 4 | 5.10.17 |
-| Tinker Board | 5.10.37 |
-| Odroid-C2 | 5.10.37 |
-| Odroid-C4 | 5.10.37 |
-| Odroid-N2 | 5.10.37 |
-| Odroid-XU4 | 5.10.37 |
-| Generic x86-64 | 5.10.37 |
+| Tinker Board | 5.10.42 |
+| Odroid-C2 | 5.10.42 |
+| Odroid-C4 | 5.10.42 |
+| Odroid-N2 | 5.9.16 |
+| Odroid-XU4 | 5.10.42 |
+| Generic x86-64 | 5.10.42 |
--- a/Documentation/partition.md
+++ b/Documentation/partition.md
@@ -75,3 +75,7 @@ Within the Home Assistant interface you won't see if the move was succesful. To
 $ systemctl status mnt-data.mount
 ```
 If the data partition was moved to your USB drive you should see ```sh Active: active (mounted)  ``` in the output. Also, it will show, which drive got mounted as /mnt/data (```sh Where ``` and ```sh what ``` section of the output)
+
+
+## Check Power Supply Rating
+Using an USB attached SSD can draw quite some power. For instance on Raspberry Pi 3 the official Raspberry Pi power supply (PSU) only provides 2.5A which can be too tight. Use a power supply which can at least provide 3.5A. Alternatively use a powered USB hub. Connect the Hub to one of the USB slots of your Raspberry Pi, and connect the SSD to the Hub. The power supply that came with the Hub will power the attached device(s).
--- a/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch
+++ b/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch
@@ -0,0 +1,61 @@
+From d6b82edb420c7df4fa8bb0924dae2476beb649a2 Mon Sep 17 00:00:00 2001
+Message-Id: <d6b82edb420c7df4fa8bb0924dae2476beb649a2.1622398359.git.stefan@agner.ch>
+From: "charles.park" <charles.park@hardkernel.com>
+Date: Fri, 1 Jun 2018 18:12:01 +0900
+Subject: [PATCH] ODROID-XU4: Update hack avoiding the invalid temperature by
+ TMU broken
+
+Change-Id: I6092834427950a50746535458e99bf7089212044
+---
+ drivers/thermal/thermal_helpers.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
+index c94bc824e5d3..2880126c5861 100644
+--- a/drivers/thermal/thermal_helpers.c
+++ b/drivers/thermal/thermal_helpers.c
+@@ -75,6 +75,10 @@ EXPORT_SYMBOL(get_thermal_instance);
+  *
+  * Return: On success returns 0, an error code otherwise
+  */
+
+#define	CRITICAL_TEMP	120000
+int thermal_zone_data[4] = { 0, };
+
+ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
+ {
+ 	int ret = -EINVAL;
+@@ -108,6 +112,30 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
+ 			*temp = tz->emul_temperature;
+ 	}
+ 
+	/* save thermal_zone data */
+	if (!ret)
+		thermal_zone_data[tz->id] = *temp;
+	/*
+	 * This case is that the thermal sensor is broken.
+	 * That's not real temperature. Set the fake temperature value in order to
+	 * avoid reaching the ciritical temperature.
+	 */
+	if ((thermal_zone_data[tz->id] > CRITICAL_TEMP) && (tz->id != 4)) {
+		int i, broken_sensor = 0, correct_temp = 0;
+		for (i = 0; i < 4; i++) {
+			if ((thermal_zone_data[i] <= CRITICAL_TEMP) &&
+			    (correct_temp <= thermal_zone_data[i]))
+				correct_temp = thermal_zone_data[i];
+			if (thermal_zone_data[i] > CRITICAL_TEMP)
+				broken_sensor++;
+		}
+		/*
+		 * if all thermal sensor broken then critical temperature data send
+		 * for system poweroff.
+		 */
+		*temp = (broken_sensor == 4) ? CRITICAL_TEMP : correct_temp;
+	}
+
+ 	mutex_unlock(&tz->lock);
+ exit:
+ 	return ret;
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0004-arm64-dts-meson-g12b-add-power-button-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0004-arm64-dts-meson-g12b-add-power-button-support.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0007-arm64-dts-meson-add-uart_A-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0007-arm64-dts-meson-add-uart_A-node.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.10.37/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.10.37/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0001-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0001-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch
@@ -0,0 +1,38 @@
+From a189f6229a9462ae2fc406b1e45286d2eea32b40 Mon Sep 17 00:00:00 2001
+Message-Id: <a189f6229a9462ae2fc406b1e45286d2eea32b40.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 15 Sep 2020 17:24:31 +0200
+Subject: [PATCH 02/11] dt-bindings: arm: amlogic: add support for the
+ ODROID-N2+
+
+HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports
+higher cpu clock speeds than the original ODROID-N2.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Acked-by: Rob Herring <robh@kernel.org>
+Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Link: https://lore.kernel.org/r/20200915152432.30616-3-narmstrong@baylibre.com
+(cherry picked from commit 88ba71cdc5497390350c87e68ce35688e88be3e8)
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index 5eba9f48823e..12ba8d074370 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
+               - hardkernel,odroid-n2
+              - hardkernel,odroid-n2-plus
+               - khadas,vim3
+               - ugoos,am6
+           - const: amlogic,s922x
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch
@@ -0,0 +1,79 @@
+From 2f09401241a0f2348d3e30617e89a00c1dc45895 Mon Sep 17 00:00:00 2001
+Message-Id: <2f09401241a0f2348d3e30617e89a00c1dc45895.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 15 Sep 2020 17:24:32 +0200
+Subject: [PATCH 03/11] 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.
+
+The rev. C support a slighly higher VDDCPU_A & VDDCPU_B voltages and supports
+the same OPPs as the Amlogic A311D SoC from the same G12B family.
+
+Suggested-by: Dongjin Kim <tobetter@hardkernel.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Link: https://lore.kernel.org/r/20200915152432.30616-4-narmstrong@baylibre.com
+(cherry picked from commit 98d24896ee117b1f0969405476c943e9307e30d4)
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |  1 +
+ .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 +++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index 4e2239ffcaa5..b0b3d6791499 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
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+new file mode 100644
+index 000000000000..5de2815ba99d
+--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
+@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+/dts-v1/;
+
+/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
+#include "meson-g12b-a311d.dtsi"
+#include "meson-g12b-odroid-n2.dtsi"
+
+/ {
+	compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
+	model = "Hardkernel ODROID-N2Plus";
+};
+
+&vddcpu_a {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_AO_cd 1 1500 0>;
+};
+
+&vddcpu_b {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_AO_cd 1 1500 0>;
+};
+
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0004-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0004-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
@@ -0,0 +1,55 @@
+From 7dba042e7863dc61ec74c0759493264e48d32df2 Mon Sep 17 00:00:00 2001
+Message-Id: <7dba042e7863dc61ec74c0759493264e48d32df2.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 11 Jan 2021 13:58:31 +0000
+Subject: [PATCH 04/11] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases
+ to ODROID-N2 dtsi
+
+Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the
+common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210111135831.2218-1-christianshewitt@gmail.com
+---
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi     | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 6982632ae646..5927c4493f5a 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -13,6 +13,8 @@ / {
+ 	aliases {
+ 		serial0 = &uart_AO;
+ 		ethernet0 = &ethmac;
+		rtc0 = &rtc;
+		rtc1 = &vrtc;
+ 	};
+ 
+ 	dioo2133: audio-amplifier-0 {
+@@ -478,6 +480,18 @@ &ir {
+ 	linux,rc-map-name = "rc-odroid";
+ };
+ 
+&i2c3 {
+	status = "okay";
+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+	pinctrl-names = "default";
+
+	rtc: rtc@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+		wakeup-source;
+	};
+};
+
+ &pwm_ab {
+ 	pinctrl-0 = <&pwm_a_e_pins>;
+ 	pinctrl-names = "default";
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0005-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0005-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
@@ -0,0 +1,37 @@
+From 3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645 Mon Sep 17 00:00:00 2001
+Message-Id: <3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Wed, 7 Apr 2021 04:26:08 +0000
+Subject: [PATCH 05/11] arm64: dts: meson: add saradc node to ODROID N2/N2+
+
+Add the meson saradc node to the ODROID N2/N2+ common dtsi.
+
+Signed-off-by: Hyeonki Hong <hhk7734@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 5927c4493f5a..194a437b4e3f 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -508,6 +508,11 @@ &pwm_AO_cd {
+ 	status = "okay";
+ };
+ 
+&saradc {
+	status = "okay";
+	vref-supply = <&vddao_1v8>;
+};
+
+ /* SD card */
+ &sd_emmc_b {
+ 	status = "okay";
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0006-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0006-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
@@ -0,0 +1,78 @@
+From d13c62fab2c91cacda74a9001ea6a6c7d8a9af39 Mon Sep 17 00:00:00 2001
+Message-Id: <d13c62fab2c91cacda74a9001ea6a6c7d8a9af39.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Wed, 7 Apr 2021 04:26:09 +0000
+Subject: [PATCH 06/11] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
+
+Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.
+
+Signed-off-by: Hyeonki Hong <hhk7734@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210407042609.9736-4-christianshewitt@gmail.com
+---
+ .../dts/amlogic/meson-g12b-odroid-n2.dtsi     | 45 +++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 194a437b4e3f..fe85aa6da460 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -446,6 +446,51 @@ &frddr_c {
+ };
+ 
+ &gpio {
+	gpio-line-names =
+		/* GPIOZ */
+		"", "", "", "", "", "", "", "",
+		"", "", "", "", "", "", "", "",
+		/* GPIOH */
+		"", "", "", "", "", "", "", "",
+		"",
+		/* BOOT */
+		"", "", "", "", "", "", "", "",
+		"", "", "", "", "", "", "", "",
+		/* GPIOC */
+		"", "", "", "", "", "", "", "",
+		/* GPIOA */
+		"PIN_44", /* GPIOA_0 */
+		"PIN_46", /* GPIOA_1 */
+		"PIN_45", /* GPIOA_2 */
+		"PIN_47", /* GPIOA_3 */
+		"PIN_26", /* GPIOA_4 */
+		"", "", "", "", "", "",
+		"PIN_42", /* GPIOA_11 */
+		"PIN_32", /* GPIOA_12 */
+		"PIN_7",  /* GPIOA_13 */
+		"PIN_27", /* GPIOA_14 */
+		"PIN_28", /* GPIOA_15 */
+		/* GPIOX */
+		"PIN_16", /* GPIOX_0 */
+		"PIN_18", /* GPIOX_1 */
+		"PIN_22", /* GPIOX_2 */
+		"PIN_11", /* GPIOX_3 */
+		"PIN_13", /* GPIOX_4 */
+		"PIN_33", /* GPIOX_5 */
+		"PIN_35", /* GPIOX_6 */
+		"PIN_15", /* GPIOX_7 */
+		"PIN_19", /* GPIOX_8 */
+		"PIN_21", /* GPIOX_9 */
+		"PIN_24", /* GPIOX_10 */
+		"PIN_23", /* GPIOX_11 */
+		"PIN_8",  /* GPIOX_12 */
+		"PIN_10", /* GPIOX_13 */
+		"PIN_29", /* GPIOX_14 */
+		"PIN_31", /* GPIOX_15 */
+		"PIN_12", /* GPIOX_16 */
+		"PIN_3",  /* GPIOX_17 */
+		"PIN_5",  /* GPIOX_18 */
+		"PIN_36"; /* GPIOX_19 */
+ 	/*
+ 	 * WARNING: The USB Hub on the Odroid-N2 needs a reset signal
+ 	 * to be turned high in order to be detected by the USB Controller
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0007-arm64-dts-meson-g12b-add-power-button-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0007-arm64-dts-meson-g12b-add-power-button-support.patch
@@ -0,0 +1,42 @@
+From 25cd545d370b67f5e5e19d93484d378571526da2 Mon Sep 17 00:00:00 2001
+Message-Id: <25cd545d370b67f5e5e19d93484d378571526da2.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 11:20:48 +0100
+Subject: [PATCH 07/11] arm64: dts: meson: g12b: add power button support
+
+Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The
+GPIO is low active, e.g. when connecting with pin 9 (GND) a power
+button press is triggered.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index fe85aa6da460..9b1541ee2273 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
+ 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+ 	};
+ 
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		poll-interval = <100>;
+
+		power-button {
+			label = "power";
+			linux,code = <KEY_POWER>;
+			gpios = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0008-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0008-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
@@ -0,0 +1,42 @@
+From b94a0698f21a2d8f6623b69fc17fe9491bc22a9b Mon Sep 17 00:00:00 2001
+Message-Id: <b94a0698f21a2d8f6623b69fc17fe9491bc22a9b.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 11:38:54 +0100
+Subject: [PATCH 08/11] arm64: dts: meson: g12b: add GPIO fan support
+
+Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the
+pad used to control the fan does not support real PWM, hence the RPM
+cannot be modulated.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 9b1541ee2273..8ad7c3ee1aa3 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
+ 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+ 	};
+ 
+	/*
+	 * 5V 80x80x10.8mm cooling fan from Hardkernel shop.
+	 */
+	fan0: gpio-fan {
+		#cooling-cells = <2>;
+		compatible = "gpio-fan";
+		gpio-fan,speed-map = <0 0 1600 1>;
+		gpios = <&gpio_ao GPIOAO_10 GPIO_ACTIVE_HIGH>;
+		status = "okay";
+	};
+
+ 	gpio-keys-polled {
+ 		compatible = "gpio-keys-polled";
+ 		poll-interval = <100>;
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0009-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0009-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
@@ -0,0 +1,74 @@
+From 4d9f93dbdc93e83ba8ddf01893b3c29cd11a87f9 Mon Sep 17 00:00:00 2001
+Message-Id: <4d9f93dbdc93e83ba8ddf01893b3c29cd11a87f9.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 15:53:55 +0100
+Subject: [PATCH 09/11] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
+ device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add the GPIO fan as a cooling device for the CPU thermal zone. Since we
+have only full fan speed available with this, set the tripping point to
+65°C which is the highest tripping point which Hardkernel used in their
+downstream kernel.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ .../dts/amlogic/meson-g12b-odroid-n2.dtsi     | 38 +++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 8ad7c3ee1aa3..c4052293ea0d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -388,6 +388,44 @@ &clkc_audio {
+ 	status = "okay";
+ };
+ 
+&cpu_thermal {
+	trips {
+		cpu_warm: cpu_warm {
+			hysteresis = <5000>;
+			temperature = <65000>;
+			type = "active";
+		};
+	};
+
+	cooling-maps {
+		map0 {
+			cooling-device =
+				<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+			trip = <&cpu_warm>;
+		};
+		map1 {
+			trip = <&cpu_passive>;
+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+		};
+		map2 {
+			trip = <&cpu_hot>;
+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					 <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+		};
+	};
+};
+
+ &cpu0 {
+ 	cpu-supply = <&vddcpu_b>;
+ 	operating-points-v2 = <&cpu_opp_table_0>;
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0010-arm64-dts-meson-add-uart_A-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0010-arm64-dts-meson-add-uart_A-node.patch
@@ -0,0 +1,44 @@
+From 1eeec94aa6dd6f9900e6213025916eb85f6b3b62 Mon Sep 17 00:00:00 2001
+Message-Id: <1eeec94aa6dd6f9900e6213025916eb85f6b3b62.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Fri, 27 Mar 2020 17:05:22 +0900
+Subject: [PATCH 10/11] arm64: dts: meson: add uart_A node
+
+The UART_A is available through J3 pin 8/10 and documented to be
+available as UART by default.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index c4052293ea0d..38a996ed3e19 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -12,6 +12,7 @@
+ / {
+ 	aliases {
+ 		serial0 = &uart_AO;
+		serial1 = &uart_A;
+ 		ethernet0 = &ethmac;
+ 		rtc0 = &rtc;
+ 		rtc1 = &vrtc;
+@@ -728,6 +729,12 @@ &toddr_c {
+ 	status = "okay";
+ };
+ 
+&uart_A {
+	status = "okay";
+	pinctrl-0 = <&uart_a_pins>;
+	pinctrl-names = "default";
+};
+
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.31.1
+
--- a/buildroot-external/board/hardkernel/patches/linux/5.9.16/0011-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/5.9.16/0011-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
@@ -0,0 +1,37 @@
+From 400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82 Mon Sep 17 00:00:00 2001
+Message-Id: <400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82.1622055679.git.stefan@agner.ch>
+In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 29 Apr 2021 21:32:43 +0200
+Subject: [PATCH 11/11] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
+
+The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
+are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
+I2C instance. Enable i2c2 and use the appropriate pinmux.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 38a996ed3e19..45a8998c4a3a 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -586,6 +586,12 @@ &ir {
+ 	linux,rc-map-name = "rc-odroid";
+ };
+ 
+&i2c2 {
+	status = "okay";
+	pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
+	pinctrl-names = "default";
+};
+
+ &i2c3 {
+ 	status = "okay";
+ 	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+-- 
+2.31.1
+
--- a/buildroot-external/board/pc/barebox.config
+++ b/buildroot-external/board/pc/barebox.config
@@ -6,6 +6,5 @@ CONFIG_DRIVER_SERIAL_EFI_STDIO=y
 # CONFIG_SPI is not set
 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
-CONFIG_CLOCKSOURCE_EFI=y
 CONFIG_FS_EFI=y
 CONFIG_FS_EFIVARFS=y
--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@@ -23,3 +23,5 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_X86_INTEL_LPSS=y
+
+CONFIG_THINKPAD_ACPI=m
--- a/buildroot-external/board/pc/ova/hassos-hook.sh
+++ b/buildroot-external/board/pc/ova/hassos-hook.sh
@@ -10,7 +10,7 @@ function hassos_pre_image() {
    cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"

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


--- a/buildroot-external/bootloader/barebox.config
+++ b/buildroot-external/bootloader/barebox.config
@@ -19,7 +19,10 @@ CONFIG_PARTITION_DISK_EFI=y
 CONFIG_STATE=y
 CONFIG_STATE_DRV=y
 CONFIG_BOOTCHOOSER=y
+CONFIG_RESET_SOURCE=y
 CONFIG_CMD_BOOT=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_BOOTCHOOSER=y
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_GLOBAL=y
@@ -27,21 +30,21 @@ CONFIG_CMD_BASENAME=y
 CONFIG_CMD_DIRNAME=y
 CONFIG_CMD_READLINK=y
 CONFIG_CMD_GETOPT=y
+CONFIG_CMD_READF=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_CMD_READF=y

 CONFIG_OFTREE=y
 CONFIG_OFTREE_OVERLAY=y

 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
-
+CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
-CONFIG_FS_EXT4=y
 CONFIG_LZ4_DECOMPRESS=y
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -94,7 +94,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2021.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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"
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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"
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
@@ -94,7 +94,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -3,7 +3,7 @@ BR2_cortex_a7=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
@@ -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-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.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_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/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -96,7 +96,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2021.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_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/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.10.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.42"
 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"
--- a/buildroot-external/kernel/hassos.config
+++ b/buildroot-external/kernel/hassos.config
@@ -37,6 +37,12 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y

+CONFIG_WIRELESS=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
+
 CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
--- a/buildroot-external/rootfs-overlay/etc/motd
+++ b/buildroot-external/rootfs-overlay/etc/motd
@@ -0,0 +1,3 @@
+Welcome to [01;34mHome Assistant OS[00m.
+
+Use `ha` to access the Home Assistant CLI.
--- a/buildroot-external/rootfs-overlay/usr/bin/ha
+++ b/buildroot-external/rootfs-overlay/usr/bin/ha
@@ -3,5 +3,4 @@
 # HA utility
 # ==============================================================================

-# shellcheck disable=SC2048,SC2086
-docker exec hassio_cli ha $*
+docker exec hassio_cli ha "$@"
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ha-cli@.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ha-cli@.service
@@ -22,7 +22,6 @@ Before=rescue.service
 # option to preserve environment (-p), followed by '--' for safety, and then
 # the entered username.
 ExecStart=/usr/sbin/hassos-cli
-RemainAfterExit=yes
 Type=idle
 Restart=always
 RestartSec=0
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -331,5 +331,5 @@ function convert_disk_image_zip() {
    local hdd_img="$(hassos_image_name "${hdd_ext}")"

    rm -f "${hdd_img}.zip"
-    zip -r "${hdd_img}.zip" "${hdd_img}"
+    zip -j -q -r "${hdd_img}.zip" "${hdd_img}"
 }
Author	SHA1	Message	Date
Stefan Agner	cb0fa11eeb	Fix release builds without dev part in version number (#1396 )	2021-06-09 01:18:42 +02:00
Stefan Agner	89c4d57b18	Bump linux to 5.10.42 (#1395 ) * Linux: Update kernel 5.10.42 * Fix kernel version documentation	2021-06-08 23:59:31 +02:00
Stefan Agner	a66f3380e3	Enable Wireless Extension for proc API (#1389 ) (#1394 ) The Wireless Extension framework is deprecated, but it seems that the Wireless Extensions proc API is still popular (/proc/net/wireless). Enable the minimal set of Wireless Extension to get the proc API.	2021-06-08 23:44:06 +02:00
Marius	288f4a0082	Verify Power Supply Rating (#1393 ) * Add paragraph on Power Supply see: https://jamesachambers.com/raspberry-pi-4-ubuntu-20-04-usb-mass-storage-boot-guide/	2021-06-07 11:51:06 +02:00
Stefan Agner	622cbb806d	Restart console on tty1 on exit (#1387 ) (#1391 ) Since we start the HomeAssistant shell directly on tty the service responsible for starting did not restart the shell on exit. Remove the RemainAfterExit flag to make sure that the shell restarts on exit.	2021-06-05 15:17:14 +02:00
Herr Frei	5c8a0307fb	Add thinkpad_acpi module (#1388 ) * Add defconfig entry for thinkpad_acpi module	2021-06-05 15:16:56 +02:00
Stefan Agner	51e80cb7bc	Avoid spurious shutdown on ODROID-XU4 (#1385 ) (#1386 ) It seems that the TPU (thermal monitoring) sometimes reports unreasonable high temperatures, leading the kernel to trigger a thermal shutdown. Add a patch which filters out such spurious temperature readings.	2021-06-04 15:20:10 +02:00
Stefan Agner	9e921ed9ad	Add additional directories to .dockerignore (#1382 )	2021-05-30 21:43:44 +02:00
Stefan Agner	56730adf48	Keep Linux patches for 5.10.37 for other ODROID boards (#1381 )	2021-05-27 11:57:26 +02:00
Stefan Agner	22aa316483	Update Barebox to 2021.05.0 (#1380 ) * Remove CONFIG_CLOCKSOURCE_EFI configuration It seems to cause messages like this on some machines: EFI Event timer too slow freq = 100 Hz The Barebox efi_defconfig configurationd doesn't enable it either. Disable it by default as well. * Enable CONFIG_CMD_ECHO_E to fix menutree It seems that menutree needs CONFIG_CMD_ECHO_E to properly display the boot menu. Also enable other useful commands such as edit or reset. * Bump Barebox to 2021.05.0	2021-05-27 00:33:34 +02:00
Stefan Agner	d60272b79a	Revert ODROID-N2(+) back to use Linux 5.9 (#1379 ) Since the move to 5.10 multiple users experience stability issues leading to random crashes. All reboots follow a SError Interrupt: [48112.247242] SError Interrupt on CPU5, code 0xbf000000 -- SError ... Revert back to Linux 5.9.16 for now.	2021-05-27 00:29:20 +02:00
Stefan Agner	068a57763c	Enable serial console as well (#1339 ) (#1378 ) Using console focused virtualization environments such as virsh having a serial console is the easiest way to interact with a virtual machine. It also saves resources since no video memory needs to be allocated. Enable serial console besides tty1 by default. Note: The bootloader as well as the kernel shows its boot messages on all consoles. However, only the last console is mapped to /dev/console, which systemd is using to show service startup messages. Putting tty1 as last console makes sure that systemd messages are still shown on the console screen.	2021-05-27 00:29:06 +02:00
Stefan Agner	6810659f9b	Pass ha command with quotes to CLI container (#1377 ) When using quotes currently, they are not passed to HA due to $*. This doesn't allow to use some commands properly, e.g. snapshot restore with a passwort with spaces: ``` ha snapshot restore c31f3c93 --password "test test" ... time="2021-05-26T11:24:19+02:00" level=fatal msg="Error while executing rootCmd: accepts 1 arg(s), received 2" ``` Properly pass all arguments using $@ in quotes.	2021-05-26 14:16:43 +02:00
Stefan Agner	8020671ca6	Drop directories when creating zip file (#1372 ) We zip a single file nested in a rather deep directory tree which stems from the build system. This doesn't need to be exposed to users.	2021-05-25 19:32:42 +02:00
Stefan Agner	0f57b55b4c	Add minimal message of the day (#1373 ) Add a minimal motd so users know what kind of system they just logged in. Also add the hint that the Home Assistant CLI is still available using the command ha.	2021-05-25 14:40:54 +02:00