Bump version to 7.6

Linux: Update kernel 5.10.108 (#1816 )
Bump Raspberry Pi kernel/firmware to 1.20220308 for rel-7 (#1810 )
2025-08-02 17:57:42 +00:00 · 2022-03-28 10:46:57 +02:00 · 2022-03-28 10:45:13 +02:00 · 2022-03-25 08:53:17 +01:00 · 2022-03-23 16:00:49 +01:00 · 2022-03-08 17:41:18 +01:00
47 changed files with 589 additions and 150 deletions
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@ -5,15 +5,14 @@ Default Kernel tree: 5.10

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.10.78 |
-| Raspberry Pi | 5.10.63 |
-| Raspberry Pi 0-W | 5.10.63 |
-| Raspberry Pi 2 | 5.10.63 |
-| Raspberry Pi 3 | 5.10.63 |
-| Raspberry Pi 4 | 5.10.63 |
-| Tinker Board | 5.10.78 |
-| Odroid-C2 | 5.10.78 |
-| Odroid-C4 | 5.10.78 |
-| Odroid-N2 | 5.10.78 |
-| Odroid-XU4 | 5.10.78 |
-| Generic x86-64 | 5.10.78 |
+| Open Virtual Appliance | 5.10.108 |
+| Raspberry Pi 0-W | 5.10.103 |
+| Raspberry Pi 2 | 5.10.103 |
+| Raspberry Pi 3 | 5.10.103 |
+| Raspberry Pi 4 | 5.10.103 |
+| Tinker Board | 5.10.108 |
+| Odroid-C2 | 5.10.108 |
+| Odroid-C4 | 5.10.108 |
+| Odroid-N2 | 5.10.108 |
+| Odroid-XU4 | 5.10.108 |
+| Generic x86-64 | 5.10.108 |
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 907739ed48b4841a8084db96516faf0fe6855f3f
+Subproject commit 8d88bd9a35d62e3ab4ec136950865a196cb9813a
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@ -6,7 +6,6 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
--- a/buildroot-external/board/hardkernel/kernel-amlogic.config
+++ b/buildroot-external/board/hardkernel/kernel-amlogic.config
@ -3812,8 +3812,10 @@ CONFIG_IR_MESON=m
 # CONFIG_IR_SIR is not set
 # CONFIG_RC_XBOX_DVD is not set
 # CONFIG_IR_TOY is not set
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
 # CONFIG_CEC_CROS_EC is not set
@ -4362,10 +4364,10 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
-CONFIG_DRM_DW_HDMI_CEC=y
+# CONFIG_DRM_DW_HDMI_CEC is not set
 # end of Display Interface Bridges

 # CONFIG_DRM_ETNAVIV is not set
@ -4373,8 +4375,8 @@ CONFIG_DRM_DW_HDMI_CEC=y
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
 # CONFIG_DRM_MXSFB is not set
-CONFIG_DRM_MESON=y
-CONFIG_DRM_MESON_DW_HDMI=y
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_TINYDRM_HX8357D is not set
--- a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch
@ -1,9 +1,9 @@
 From c7825747afd8bb975dc918f28e4afe8058a518f3 Mon Sep 17 00:00:00 2001
-Message-Id: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 11 Jan 2021 13:58:31 +0000
-Subject: [PATCH 1/9] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases to
- ODROID-N2 dtsi
+Subject: [PATCH 01/10] 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.
@ -49,5 +49,5 @@ index 39a09661c5f6..b78be3e6974d 100644
 	pinctrl-0 = <&pwm_a_e_pins>;
 	pinctrl-names = "default";
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
@ -1,10 +1,10 @@
 From ec3b1240b428c5652ccb7fdadad217a2ff8ab4db Mon Sep 17 00:00:00 2001
-Message-Id: <ec3b1240b428c5652ccb7fdadad217a2ff8ab4db.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <ec3b1240b428c5652ccb7fdadad217a2ff8ab4db.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Wed, 7 Apr 2021 04:26:08 +0000
-Subject: [PATCH 2/9] arm64: dts: meson: add saradc node to ODROID N2/N2+
+Subject: [PATCH 02/10] arm64: dts: meson: add saradc node to ODROID N2/N2+

 Add the meson saradc node to the ODROID N2/N2+ common dtsi.

@ -33,5 +33,5 @@ index b78be3e6974d..8a5e132c4b79 100644
 &sd_emmc_b {
 	status = "okay";
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch
@ -1,10 +1,10 @@
 From 5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f Mon Sep 17 00:00:00 2001
-Message-Id: <5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Wed, 7 Apr 2021 04:26:09 +0000
-Subject: [PATCH 3/9] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
+Subject: [PATCH 03/10] arm64: dts: meson: add GPIO line names to ODROID N2/N2+

 Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.

@ -74,5 +74,5 @@ index 8a5e132c4b79..41b2f9c96b5f 100644
 	 * 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.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch
@ -1,10 +1,10 @@
 From 70e65f906389f7236fe9ad8e1c05dedac0d1988b Mon Sep 17 00:00:00 2001
-Message-Id: <70e65f906389f7236fe9ad8e1c05dedac0d1988b.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <70e65f906389f7236fe9ad8e1c05dedac0d1988b.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:20:48 +0100
-Subject: [PATCH 4/9] arm64: dts: meson: g12b: add power button support
+Subject: [PATCH 04/10] 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
@ -38,5 +38,5 @@ index 41b2f9c96b5f..4b6bb7e74e25 100644
 		compatible = "gpio-leds";
 
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch
@ -1,10 +1,10 @@
 From 86d9151effff69d2a8fc2027a31dd60bd8c6eb05 Mon Sep 17 00:00:00 2001
-Message-Id: <86d9151effff69d2a8fc2027a31dd60bd8c6eb05.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <86d9151effff69d2a8fc2027a31dd60bd8c6eb05.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:38:54 +0100
-Subject: [PATCH 5/9] arm64: dts: meson: g12b: add GPIO fan support
+Subject: [PATCH 05/10] 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
@ -38,5 +38,5 @@ index 4b6bb7e74e25..e8a3ede698b5 100644
 		compatible = "gpio-keys-polled";
 		poll-interval = <100>;
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch
@ -1,10 +1,10 @@
 From f1120f132dbdf2e7f7acf328de55bbdce877d882 Mon Sep 17 00:00:00 2001
-Message-Id: <f1120f132dbdf2e7f7acf328de55bbdce877d882.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <f1120f132dbdf2e7f7acf328de55bbdce877d882.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 15:53:55 +0100
-Subject: [PATCH 6/9] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
+Subject: [PATCH 06/10] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
 device
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@ -70,5 +70,5 @@ index e8a3ede698b5..dd345c6aa4b5 100644
 	cpu-supply = <&vddcpu_b>;
 	operating-points-v2 = <&cpu_opp_table_0>;
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch
@ -1,10 +1,10 @@
 From dcaf2dc71dd62487eb37561682934414a5795e0e Mon Sep 17 00:00:00 2001
-Message-Id: <dcaf2dc71dd62487eb37561682934414a5795e0e.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <dcaf2dc71dd62487eb37561682934414a5795e0e.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Fri, 27 Mar 2020 17:05:22 +0900
-Subject: [PATCH 7/9] arm64: dts: meson: add uart_A node
+Subject: [PATCH 07/10] 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.
@ -40,5 +40,5 @@ index dd345c6aa4b5..cec346178e3d 100644
 	status = "okay";
 	pinctrl-0 = <&uart_ao_a_pins>;
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
@ -1,10 +1,10 @@
 From d5d2d8b9eb93eab85af12f1844975903a7c5a879 Mon Sep 17 00:00:00 2001
-Message-Id: <d5d2d8b9eb93eab85af12f1844975903a7c5a879.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <d5d2d8b9eb93eab85af12f1844975903a7c5a879.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 29 Apr 2021 21:32:43 +0200
-Subject: [PATCH 8/9] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
+Subject: [PATCH 08/10] 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
@ -33,5 +33,5 @@ index cec346178e3d..f1c3356c78a0 100644
 	status = "okay";
 	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch
@ -1,11 +1,11 @@
 From 19c34c0ceb6302b07e1017c426796c4cf7322d13 Mon Sep 17 00:00:00 2001
-Message-Id: <19c34c0ceb6302b07e1017c426796c4cf7322d13.1627311993.git.stefan@agner.ch>
-In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
-References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
+Message-Id: <19c34c0ceb6302b07e1017c426796c4cf7322d13.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 26 Jul 2021 16:59:08 +0200
-Subject: [PATCH 9/9] Revert "of/fdt: Make sure no-map does not remove already
- reserved regions"
+Subject: [PATCH 09/10] Revert "of/fdt: Make sure no-map does not remove
+ already reserved regions"

 U-Boot on Hardkernel ODROID-N2 adds fdt "memreserve" entries alongside
 the reserved-memory nodes present in upstream Linux. This causes
@ -48,5 +48,5 @@ index 57ff31b6b1e4..7ef2246e0b1e 100644
 }
 
 -- 
-2.32.0
+2.34.1

--- a/buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch
@ -0,0 +1,48 @@
+From be21685475a0739d44ca4c63fcb7f50b324593c9 Mon Sep 17 00:00:00 2001
+Message-Id: <be21685475a0739d44ca4c63fcb7f50b324593c9.1642331593.git.stefan@agner.ch>
+In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Sun, 16 Jan 2022 12:12:29 +0100
+Subject: [PATCH 10/10] Revert "drm: meson_drv add shutdown function"
+
+This reverts commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.
+
+It seems that this patch actually breaks reboot on ODROID-N2+.
+---
+ drivers/gpu/drm/meson/meson_drv.c | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
+index 2753067c08e6..3d1de9cbb1c8 100644
+--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
+@@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
+ 	return count;
+ }
+ 
+-static void meson_drv_shutdown(struct platform_device *pdev)
+-{
+-	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
+-
+-	if (!priv)
+-		return;
+-
+-	drm_kms_helper_poll_fini(priv->drm);
+-	drm_atomic_helper_shutdown(priv->drm);
+-}
+-
+ static int meson_drv_probe(struct platform_device *pdev)
+ {
+ 	struct component_match *match = NULL;
+@@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
+ 
+ static struct platform_driver meson_drm_platform_driver = {
+ 	.probe      = meson_drv_probe,
+-	.shutdown   = meson_drv_shutdown,
+ 	.driver     = {
+ 		.name	= "meson-drm",
+ 		.of_match_table = dt_match,
+-- 
+2.34.1
+
--- a/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
+++ b/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
@ -9,6 +9,8 @@ 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"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-A.dtb" "${BOOT_DATA}/EFI/barebox/state-A.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-B.dtb" "${BOOT_DATA}/EFI/barebox/state-B.dtb"
    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }

--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@ -9,6 +9,21 @@ CONFIG_BLK_DEV_NVME=y
 CONFIG_IGB=y
 CONFIG_IGC=m

+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1C=m
+CONFIG_ATL1E=m
+CONFIG_ALX=m
+
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNXT=m
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLMVM=m

@ -24,4 +39,109 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_X86_INTEL_LPSS=y

+CONFIG_SND_SOC=m
+
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+# CONFIG_SND_SOC_SOF_BROADWELL is not set
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
 CONFIG_THINKPAD_ACPI=m
--- a/buildroot-external/board/pc/ova/hassos-hook.sh
+++ b/buildroot-external/board/pc/ova/hassos-hook.sh
@ -9,14 +9,14 @@ 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"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-A.dtb" "${BOOT_DATA}/EFI/barebox/state-A.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-B.dtb" "${BOOT_DATA}/EFI/barebox/state-B.dtb"
    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }


 function hassos_post_image() {
-    local HDD_IMG="$(hassos_image_name img)"
-    local HDD_OVA="$(hassos_image_name ova)"
-    local OVA_DATA="${BINARIES_DIR}/ova"
+    local hdd_img="$(hassos_image_name img)"

    # Virtual Disk images
    convert_disk_image_virtual
@ -27,14 +27,8 @@ function hassos_post_image() {
    convert_disk_image_xz qcow2

    # OVA
-    mkdir -p "${OVA_DATA}"
-    rm -f "${HDD_OVA}"
-
-    cp -a "${BOARD_DIR}/home-assistant.ovf" "${OVA_DATA}/home-assistant.ovf"
-    qemu-img convert -O vmdk -o subformat=streamOptimized "${HDD_IMG}" "${OVA_DATA}/home-assistant.vmdk"
-    (cd "${OVA_DATA}" || exit 1; sha256sum --tag home-assistant.* >home-assistant.mf)
-    tar -C "${OVA_DATA}" --owner=root --group=root -cf "${HDD_OVA}" home-assistant.ovf home-assistant.vmdk home-assistant.mf
+    convert_disk_image_ova

    # Cleanup
-    rm -f "${HDD_IMG}"
+    rm -f "${hdd_img}"
 }
--- a/buildroot-external/board/pc/ova/home-assistant.ovf
+++ b/buildroot-external/board/pc/ova/home-assistant.ovf
@ -53,12 +53,12 @@
      </Item>
      <Item>
        <rasd:Address>0</rasd:Address>
-        <rasd:Caption>sataController0</rasd:Caption>
-        <rasd:Description>SATA Controller</rasd:Description>
-        <rasd:ElementName>sataController0</rasd:ElementName>
+        <rasd:Caption>SCSIController</rasd:Caption>
+        <rasd:Description>SCSI Controller</rasd:Description>
+        <rasd:ElementName>SCSIController</rasd:ElementName>
        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceSubType>AHCI</rasd:ResourceSubType>
-        <rasd:ResourceType>20</rasd:ResourceType>
+        <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
+        <rasd:ResourceType>6</rasd:ResourceType>
      </Item>
      <Item ovf:required="false">
        <rasd:Address>0</rasd:Address>
@ -136,7 +136,7 @@
        <RTC localOrUTC="UTC"/>
      </Hardware>
      <StorageControllers>
-        <StorageController name="SATA" type="AHCI" PortCount="1">
+        <StorageController name="LsiLogic" type="LsiLogic" PortCount="16" useHostIOCache="true" Bootable="true">
          <AttachedDevice type="HardDisk" hotpluggable="false" port="0" device="0">
            <Image uuid="{5f042839-c478-43d9-9eb0-fd8a902146ec}"/>
          </AttachedDevice>
--- a/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch
+++ b/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch
@ -0,0 +1,98 @@
+From 6e5d979ec45555720a6537eb006947dca825afc0 Mon Sep 17 00:00:00 2001
+Message-Id: <6e5d979ec45555720a6537eb006947dca825afc0.1644327234.git.stefan@agner.ch>
+From: Zachary Michaels <mikezackles@gmail.com>
+Date: Thu, 7 Jan 2021 08:13:11 -0800
+Subject: [PATCH 1/2] iwlwifi: Make missed beacon timeout configurable
+
+Makes the beacon timeout a module parameter, allowing the original default (16
+missed beacons) to be kept while also enabling users that experience problems to
+increase the timeout.
+
+See https://bugzilla.kernel.org/show_bug.cgi?id=203709
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c       | 4 ++++
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  | 3 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       | 1 -
+ 4 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+index 30c6d7b18599..d64cec9d593d 100644
+--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+@@ -1741,6 +1741,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
+ 	.power_level = IWL_POWER_INDEX_1,
+ 	.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
+ 	.enable_ini = true,
+	.beacon_timeout = 16,
+ 	/* the rest are 0 by default */
+ };
+ IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
+@@ -1858,6 +1859,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini,
+ 		   bool, S_IRUGO | S_IWUSR);
+ MODULE_PARM_DESC(enable_ini,
+ 		 "Enable debug INI TLV FW debug infrastructure (default: true");
+module_param_named(beacon_timeout, iwlwifi_mod_params.beacon_timeout, uint, 0644);
+MODULE_PARM_DESC(beacon_timeout,
+		 "Number of missed beacons before disconnecting (default: 16)");
+ 
+ /*
+  * set bt_coex_active to true, uCode will do kill/defer
+diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
+index e8ce3a300857..801d12a27354 100644
+--- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
+@@ -115,6 +115,7 @@ enum iwl_uapsd_disable {
+  * @disable_11ac: disable VHT capabilities, default = false.
+  * @remove_when_gone: remove an inaccessible device from the PCIe bus.
+  * @enable_ini: enable new FW debug infratructure (INI TLVs)
+ * @beacon_timeout: number of missed beacons before disconnect, default = 16
+  */
+ struct iwl_mod_params {
+ 	int swcrypto;
+@@ -137,6 +138,7 @@ struct iwl_mod_params {
+ 	bool disable_11ax;
+ 	bool remove_when_gone;
+ 	bool enable_ini;
+	u32 beacon_timeout;
+ };
+ 
+ static inline bool iwl_enable_rx_ampdu(void)
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+index 6a8bf9bb9c45..34dec6fc8f3e 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+@@ -63,6 +63,7 @@
+ #include <linux/etherdevice.h>
+ #include <net/mac80211.h>
+ #include "iwl-io.h"
+#include "iwl-modparams.h"
+ #include "iwl-prph.h"
+ #include "fw-api.h"
+ #include "mvm.h"
+@@ -1430,7 +1431,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
+ 	 * TODO: the threshold should be adjusted based on latency conditions,
+ 	 * and/or in case of a CS flow on one of the other AP vifs.
+ 	 */
+-	if (rx_missed_bcon > IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG)
+	if (rx_missed_bcon > iwlwifi_mod_params.beacon_timeout)
+ 		iwl_mvm_connection_loss(mvm, vif, "missed beacons");
+ 	else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD)
+ 		ieee80211_beacon_loss(vif);
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+index 64f5a4cb3d3a..730638da8fd3 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+@@ -92,7 +92,6 @@
+ /* RSSI offset for WkP */
+ #define IWL_RSSI_OFFSET 50
+ #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8
+-#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16
+ 
+ /* A TimeUnit is 1024 microsecond */
+ #define MSEC_TO_TU(_msec)	(_msec*1000/1024)
+-- 
+2.35.1
+
--- a/buildroot-external/bootloader/barebox-state-efi-A.dtb
+++ b/buildroot-external/bootloader/barebox-state-efi-A.dtb
--- a/buildroot-external/bootloader/barebox-state-efi-A.dts
+++ b/buildroot-external/bootloader/barebox-state-efi-A.dts
@ -0,0 +1,76 @@
+/dts-v1/;
+/ {
+
+	aliases {
+		state = &state;
+	};
+
+	state: state {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		
+		magic = <0xef98423f>;
+		compatible = "barebox,state";
+		backend = <&backend_state>;
+		backend-type = "raw";
+		backend-stridesize = <4048>;
+
+		bootstate {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			A {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@0 {
+					reg = <0x0 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@4 {
+					reg = <0x4 0x4>;
+					type = "uint32";
+					default = <20>;
+				};
+			};
+
+			B {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@8 {
+					reg = <0x8 0x4>;
+					type = "uint32";
+					default = <0>;
+				};
+				priority@c {
+					reg = <0xc 0x4>;
+					type = "uint32";
+					default = <10>;
+				};
+			};
+
+			last_chosen@10 {
+				reg = <0x10 0x4>;
+				type = "uint32";
+			};
+		};
+
+		machine_id@14 {
+			reg = <0x14 0x24>;
+			type = "string";
+			default = "";
+		};
+	};
+
+	partitions {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fixed-partitions";
+
+		backend_state: state {
+			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
+		};
+	};
+
+};
+
--- a/buildroot-external/bootloader/barebox-state-efi-B.dtb
+++ b/buildroot-external/bootloader/barebox-state-efi-B.dtb
--- a/buildroot-external/bootloader/barebox-state-efi-B.dts
+++ b/buildroot-external/bootloader/barebox-state-efi-B.dts
@ -0,0 +1,76 @@
+/dts-v1/;
+/ {
+
+	aliases {
+		state = &state;
+	};
+
+	state: state {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		
+		magic = <0xef98423f>;
+		compatible = "barebox,state";
+		backend = <&backend_state>;
+		backend-type = "raw";
+		backend-stridesize = <4048>;
+
+		bootstate {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			A {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@0 {
+					reg = <0x0 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@4 {
+					reg = <0x4 0x4>;
+					type = "uint32";
+					default = <10>;
+				};
+			};
+
+			B {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@8 {
+					reg = <0x8 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@c {
+					reg = <0xc 0x4>;
+					type = "uint32";
+					default = <20>;
+				};
+			};
+
+			last_chosen@10 {
+				reg = <0x10 0x4>;
+				type = "uint32";
+			};
+		};
+
+		machine_id@14 {
+			reg = <0x14 0x24>;
+			type = "string";
+			default = "";
+		};
+	};
+
+	partitions {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fixed-partitions";
+
+		backend_state: state {
+			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
+		};
+	};
+
+};
+
--- 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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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
@ -39,6 +39,8 @@ BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_UDISKS2=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@ -116,4 +116,4 @@ BR2_PACKAGE_KHADAS_BOOT=y
 BR2_PACKAGE_KHADAS_BOOT_VIM3=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
--- 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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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"
@ -116,7 +116,7 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2=y
--- 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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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"
@ -114,7 +114,7 @@ BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y
-BR2_PACKAGE_RTL8812AU=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4=y
--- 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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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"
@ -116,7 +116,7 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_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-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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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
@ -118,5 +118,5 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_RTL8812AU=y
+BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
 BR2_PACKAGE_RPI_RF_MOD=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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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
@ -40,6 +40,8 @@ BR2_PACKAGE_OS_AGENT=y
 BR2_PACKAGE_UDISKS2=y
 # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set
 BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_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/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20211029.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220308.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_LZ4=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@ -23,12 +23,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20211029.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220308.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_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"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-zero-2"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@ -23,12 +23,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20211029.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220308.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_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"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2-w"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_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/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20211029.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220308.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_LZ4=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_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/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20211029.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220308.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_LZ4=y
--- 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.78"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
 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/meta
+++ b/buildroot-external/meta
@ -1,7 +1,7 @@
 VERSION_MAJOR=7
-VERSION_BUILD=0
+VERSION_BUILD=6

 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"

-DEPLOYMENT="development"
+DEPLOYMENT="production"
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@ -1,5 +1,7 @@
 #!/bin/sh

+set -o errexit
+
 ##
 # Hooks

@ -26,6 +28,25 @@ case "$1" in
    slot-install)
        # Use install handlers below
        ;;
+    slot-post-install)
+        # Handle main slot only
+        test "${RAUC_SLOT_CLASS}" = "kernel" || exit 0
+
+        BOOT_MNT=/mnt/boot
+
+        if ! systemctl -q is-active mnt-boot.mount; then
+            systemctl start mnt-boot.mount
+        fi
+
+        # OS 8+ to 7 and lower downgrade path
+        if ! command -v barebox-state > /dev/null; then
+            cp -f "${BOOT_MNT}/EFI/barebox/state-${RAUC_SLOT_BOOTNAME}.dtb" "${BOOT_MNT}"/EFI/barebox/state.dtb
+            blkdiscard /dev/disk/by-partuuid/33236519-7f32-4dff-8002-3390b62c309d
+            echo "Cleared state and copied default state-${RAUC_SLOT_BOOTNAME}.dtb to state.dtb."
+        fi
+
+        exit 0
+        ;;
    *)
        exit 1
        ;;
@ -65,12 +86,25 @@ if [ "${RAUC_SLOT_CLASS}" = "spl" ]; then
    DEVICE_ROOT="/dev/$(lsblk -no pkname "${DEVICE_CHILD}")"
    PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")"
    PART_LABEL="$(echo "${PART_TABLE}" | jq -r '.partitiontable.label')"
+    FLAGS=""
+
+    if dd oflag=direct if=/dev/null 2> /dev/null; then
+        FLAGS="oflag=direct"
+    fi

    if [ "${PART_LABEL}" = "gpt" ]; then
-        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc oflag=direct bs=512 seek=2 skip=2
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc ${FLAGS} bs=512 seek=2 skip=2
    else
-        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc oflag=direct bs=1 count=440
-        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc oflag=direct bs=512 seek=1 skip=1
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc ${FLAGS} bs=1 count=440
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}" conv=notrunc ${FLAGS} bs=512 seek=1 skip=1
+    fi
+
+    # Flash to eMMC boot partition if necessary
+    if [ "$RAUC_SYSTEM_COMPATIBLE" = "haos-odroid-xu4" ] && [ -b "${DEVICE_ROOT}boot0" ]; then
+        echo "Updating eMMC boot partition"
+        echo 0 > /sys/block/"$(basename "${DEVICE_ROOT}boot0")"/force_ro
+        dd if="${RAUC_IMAGE_NAME}" of="${DEVICE_ROOT}boot0" conv=notrunc ${FLAGS} bs=512 skip=1 count=2047
+        echo 1 > /sys/block/"$(basename "${DEVICE_ROOT}boot0")"/force_ro
    fi
 fi

--- a/buildroot-external/package/generic_raw_uart/generic_raw_uart.hash
+++ b/buildroot-external/package/generic_raw_uart/generic_raw_uart.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  45077e1b2ce89f8ea41c9039153a4e00f398fef80078e968f2861c43d475de45  generic_raw_uart-9510818fa12e52baf40fe5ac84e58fd62db4f70e.tar.gz
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
+sha256  6c054e86c8edebfd7ee5f8c8e3ff2383ae624bb10c4e9936d75af8f57ae5cf56  generic_raw_uart-58b10fff652ad2e67f71e7e07270b50d27e55d40.tar.gz
--- a/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk
+++ b/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk
@ -13,7 +13,7 @@
 #
 ################################################################################

-GENERIC_RAW_UART_VERSION = 9510818fa12e52baf40fe5ac84e58fd62db4f70e
+GENERIC_RAW_UART_VERSION = 58b10fff652ad2e67f71e7e07270b50d27e55d40
 GENERIC_RAW_UART_SITE = $(call github,alexreinert,piVCCU,$(GENERIC_RAW_UART_VERSION))
 GENERIC_RAW_UART_LICENSE = GPL2
 GENERIC_RAW_UART_LICENSE_FILES = LICENSE
--- a/buildroot-external/package/hassio/fetch-container-image.sh
+++ b/buildroot-external/package/hassio/fetch-container-image.sh
@ -24,15 +24,16 @@ image_file_name="${full_image_name//[:\/]/_}@${image_digest//[:\/]/_}"
 image_file_path="${dl_dir}/${image_file_name}.tar"
 dst_image_file_path="${dst_dir}/${image_file_name}.tar"

-if [ -f "${image_file_path}" ]
-then
-	echo "Skipping download of existing image: ${full_image_name} (digest ${image_digest})"
+(
+	# Use file locking to avoid race condition
+	flock --verbose 3
+	if [ ! -f "${image_file_path}" ]
+	then
+		echo "Fetching image: ${full_image_name} (digest ${image_digest})"
+		skopeo copy "docker://${image_name}@${image_digest}" "docker-archive:${image_file_path}:${full_image_name}"
+	else
+		echo "Skipping download of existing image: ${full_image_name} (digest ${image_digest})"
+	fi
+
 	cp "${image_file_path}" "${dst_image_file_path}"
-	exit 0
-fi
-
-# Use digest here to avoid race conditions of any sort...
-echo "Fetching image: ${full_image_name}"
-skopeo copy "docker://${image_name}@${image_digest}" "docker-archive:${image_file_path}:${full_image_name}"
-
-cp "${image_file_path}" "${dst_image_file_path}"
+) 3>"${image_file_path}.lock"
--- a/buildroot-external/package/intel-e1000e/intel-e1000e.mk
+++ b/buildroot-external/package/intel-e1000e/intel-e1000e.mk
@ -8,7 +8,7 @@ INTEL_E1000E_VERSION = 3.8.7
 INTEL_E1000E_LICENSE = GPL-2.0
 INTEL_E1000E_LICENSE_FILES = COPYING
 INTEL_E1000E_SOURCE = e1000e-$(INTEL_E1000E_VERSION).tar.gz
-INTEL_E1000E_SITE = https://downloads.sourceforge.net/project/e1000/e1000e%20stable/$(INTEL_E1000E_VERSION)
+INTEL_E1000E_SITE = https://downloads.sourceforge.net/project/e1000/e1000e%20historic%20archive/$(INTEL_E1000E_VERSION)
 INTEL_E1000E_MODULE_SUBDIRS = src

 INTEL_E1000E_MODULE_MAKE_OPTS = \
--- a/buildroot-external/package/rtl8812au/Config.in
+++ b/buildroot-external/package/rtl8812au/Config.in
@ -1,10 +0,0 @@
-comment "RTL8812AU needs a Linux kernel to be built"
-	depends on !BR2_LINUX_KERNEL
-
-config BR2_PACKAGE_RTL8812AU
-	bool "Realtek RTL8812AU Wi-Fi driver"
-	depends on BR2_LINUX_KERNEL
-	help
-	  Install Realtek RTL8812AU Wi-Fi driver as a kernel module.
-
-	  https://github.com/gnab/rtl8812au/
--- a/buildroot-external/package/rtl8812au/rtl8812au.mk
+++ b/buildroot-external/package/rtl8812au/rtl8812au.mk
@ -1,19 +0,0 @@
-################################################################################
-#
-# Realtek RTL8812AU driver
-#
-################################################################################
-
-RTL8812AU_VERSION = 1c9d034b20aa5c15dbf5bb5dfcb83346a692f827
-RTL8812AU_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_VERSION))
-RTL8812AU_LICENSE = GPL-2.0
-RTL8812AU_LICENSE_FILES = COPYING
-#RTL8812AU_MODULE_SUBDIRS = src
-
-RTL8812AU_MODULE_MAKE_OPTS = \
-	CONFIG_88XXAU=m \
-	KVER=$(LINUX_VERSION_PROBED) \
-	KSRC=$(LINUX_DIR)
-
-$(eval $(kernel-module))
-$(eval $(generic-package))
--- a/buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/99-hmip-rfusb.rules
+++ b/buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/99-hmip-rfusb.rules
@ -1 +0,0 @@
-ACTION=="add", ATTRS{idVendor}=="1b1f", ATTRS{idProduct}=="c020", RUN+="/sbin/modprobe cp210x" RUN+="/bin/sh -c 'echo 1b1f c020 >/sys/bus/usb-serial/drivers/cp210x/new_id'"
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@ -304,12 +304,25 @@ function convert_disk_image_virtual() {
    rm -f "${hdd_vdi}"
    rm -f "${hdd_qcow2}"

-    qemu-img convert -O vmdk "${hdd_img}" "${hdd_vmdk}"
+    qemu-img convert -O vmdk -o adapter_type=lsilogic "${hdd_img}" "${hdd_vmdk}"
    qemu-img convert -O vhdx "${hdd_img}" "${hdd_vhdx}"
    qemu-img convert -O vdi "${hdd_img}" "${hdd_vdi}"
    qemu-img convert -O qcow2 "${hdd_img}" "${hdd_qcow2}"
 }

+function convert_disk_image_ova() {
+    local hdd_img="$(hassos_image_name img)"
+    local hdd_ova="$(hassos_image_name ova)"
+    local ova_data="${BINARIES_DIR}/ova"
+
+    mkdir -p "${ova_data}"
+    rm -f "${hdd_ova}"
+
+    cp -a "${BOARD_DIR}/home-assistant.ovf" "${ova_data}/home-assistant.ovf"
+    qemu-img convert -O vmdk -o subformat=streamOptimized,adapter_type=lsilogic "${hdd_img}" "${ova_data}/home-assistant.vmdk"
+    (cd "${ova_data}" || exit 1; "${HOST_DIR}/bin/openssl" sha256 home-assistant.* >home-assistant.mf)
+    tar -C "${ova_data}" --owner=root --group=root -cf "${hdd_ova}" home-assistant.ovf home-assistant.vmdk home-assistant.mf
+}

 function convert_disk_image_xz() {
    local hdd_ext=${1:-img}
--- a/buildroot-external/scripts/ota.sh
+++ b/buildroot-external/scripts/ota.sh
@ -38,6 +38,9 @@ function create_ota_update() {
        echo "hooks=install"
        echo "[image.kernel]"
        echo "filename=kernel.img"
+        if [ "${BOOTLOADER}" == "barebox" ]; then
+            echo "hooks=post-install"
+        fi
        echo "[image.rootfs]"
        echo "filename=rootfs.img"
    ) > "${rauc_folder}/manifest.raucm"
Author	SHA1	Message	Date
Stefan Agner	2596b6ab3f	Bump version to 7.6	2022-03-28 10:46:57 +02:00
Stefan Agner	5b7d1a60df	Linux: Update kernel 5.10.108 (#1816 )	2022-03-28 10:45:13 +02:00
Stefan Agner	d73087bdea	Bump Raspberry Pi kernel/firmware to 1.20220308 for rel-7 (#1810 ) * RaspberryPi: Update kernel 5.10.103 - 1.20220308 * Bump buildroot * buildroot 8bbb32c16a...8d88bd9a35 (2): > package/rpi-firmware: bump version to 1.20220308 > package/rtl8812au-aircrack-ng: bump version to 3a6402e	2022-03-25 08:53:17 +01:00
Stefan Agner	aaa55848de	Implement A/B switch when moving back to Barebox (#1794 ) * Implement manual boot switch when downgrading to Barebox When installing OS 7 or older from a OS 8 installation, the bootloader is changed back to Barebox. However, in this case Barebox does not know which boot slot is correct (and rauc won't update Barebox' state as it is configured to work with GRUB in OS 8+). This implements a poor mans version to switch the boot partition. It clears Barebox state and deploys one of the two pre-configured default states, booting either boot slot A or B.	2022-03-23 16:00:49 +01:00
Stefan Agner	bd8c6cad40	Bump version to 7.5	2022-03-08 17:41:18 +01:00
Stefan Agner	f189a8bce7	Linux: Update kernel 5.10.103	2022-03-08 17:41:17 +01:00
Stefan Agner	3e689001c4	Bump version to 7.4	2022-02-08 16:14:21 +01:00
Stefan Agner	4b2cb7d680	Add Intel WiFi driver fix to avoid crash on Intel NUC systems (#1739 ) (#1745 )	2022-02-08 16:14:00 +01:00
Stefan Agner	31b83f301b	Linux: Update kernel 5.10.98 (#1744 )	2022-02-08 16:13:53 +01:00
Stefan Agner	7bb4d86809	Bump version to 7.3	2022-02-02 18:02:44 +01:00
Stefan Agner	058fcf5b1a	Add Broadcom BNX2/BNX2X firmware (#1732 ) (#1735 ) * buildroot e2ac9b528a...8bbb32c16a (1): > package/linux-firmware: Add Broadcom BNX2 firmware * Add Broadcom BNX2/BNX2X firmware (#1732) Signed-off-by: Stefan Agner <stefan@agner.ch>	2022-02-02 17:44:34 +01:00
Stefan Agner	1cb597675f	Linux: Update kernel 5.10.96 (#1736 )	2022-02-02 17:44:27 +01:00
Stefan Agner	6e616833a4	Bump raspberry pi kernel firmware to 1.20220120 (#1731 ) * Bump buildroot * buildroot 3cedcad616...e2ac9b528a (1): > package/rpi-firmware: bump version to 1.20220120 * RaspberryPi: Update kernel 5.10.92 - 1.20220120	2022-02-02 17:44:19 +01:00
Jens Maus	d6e1bb2db4	Integrate dual HomeMatic+HomeMatic IP support for HmIP-RFUSB (#1683 ) * updated generic_raw_uart to latest version which comes with dualcopro support for the HmIP-RFUSB usb rf-sticks by eQ3/ELV. * remove 99-hmip-rfusb.rules to keep a HmIP-RFUSB device free from being occupied by the cp210x driver but use the new generic_raw_uart support instead allowing for advanced dualcopro support for HomeMatic/BidCos-RF and homematicIP support in parallel.	2022-02-02 17:44:07 +01:00
Stefan Agner	94266e652c	Bump version to 7.2	2022-01-17 14:09:49 +01:00
Stefan Agner	4616806dbf	Add Intel SoC sound drivers (#1690 ) (#1715 )	2022-01-17 14:09:21 +01:00
Stefan Agner	10a4710248	Fix reboot on ODROID-N2 (again) (#1722 ) To make HDMI CEC work, we have to compile MESON_DRM as a module (see #1717). However, this essentially reverts #1347, which fixed the reboot problem by compiling the driver into the kernel. Hence we need to reintroduce the earlier fix from #1345, which reverts the offending commit causing the reboot problem.	2022-01-17 14:09:12 +01:00
Stefan Agner	fc507a61ab	Fix HDMI CEC on ODROID-N2(+) (#1717 ) Build HDMI graphics driver as a module which seems to fix HDMI CEC on ODROID-N2(+).	2022-01-17 14:09:12 +01:00
Stefan Agner	0719bd1c4d	Disable DW-HDMI CEC driver to avoid non-working CEC device file (#1216 ) (#1714 ) The DW HDMI CEC implementation is not used in Amlogic SoC. Disable the driver to avoid it claiming /dev/cec0 and getting used by user space tools. See also: https://lore.kernel.org/all/20210416092737.1971876-3-narmstrong@baylibre.com/T/	2022-01-17 14:08:29 +01:00
Stefan Agner	faedfa8571	Remove reference to non-existing patch directory to fix ODROID-C2 build (#1718 )	2022-01-17 14:08:13 +01:00
Stefan Agner	60d1a5bb31	Linux: Update kernel 5.10.91 (#1713 )	2022-01-17 14:07:27 +01:00
Stefan Agner	93b4997989	Check if Busybox supports oflag (#1692 ) (#1694 ) * Check if Busybox supports oflag It seems that Busybox' dd shipped with OS release 5 and earlier does not support oflag. Check if the flag is supported before making use of it. * Exit if a command in the update scripts returns an error This makes sure that the update isn't marked as successful in case there is an error in the update script.	2022-01-04 14:40:53 +01:00
Stefan Agner	372d604f7c	Bump version to 7.1	2021-12-29 16:51:06 +01:00
Stefan Agner	bf274e7634	Bump buildroot (#1700 ) * buildroot 4c6c8fb767...3cedcad616 (1): > Merge tag '2021.08.3' into 2021.08.x-haos	2021-12-29 16:50:30 +01:00
Stefan Agner	4529d91e86	ODROID XU4: Update U-Boot on eMMC boot partition (#1699 ) * ODROID XU4: Update U-Boot on eMMC boot partition Update the U-Boot on the eMMC boot partition if present. Only write the first megabyte as the eMMC boot partition might be smaller than the SPL image and only the first megabyte is occupied by FW/BL1/BL2/TZSW (see https://wiki.odroid.com/odroid-xu4/software/partition_table#tab__odroid-xu341).	2021-12-29 15:40:56 +01:00
Stefan Agner	0d52944262	Update Raspberry Pi kernel and firmware to oldstable_20211201/71bd3109/Linux 5.10.63 (#1119 ) (#1696 ) * Bump buildroot * buildroot 907739ed48...4c6c8fb767 (1): > package/rpi-firmware: bump version to 71bd3109 * RaspberryPi: Update kernel 5.10.63 - oldstable_20211201 * Add Raspberry Pi Zero 2 W device tree	2021-12-29 15:40:45 +01:00
Stefan Agner	7b54b565c5	Use LSI Logic SCSI controller (#1695 ) * Use LSI Logic SCSI controller in vmdk descriptor as well For some reason, the vmdk disk format's descriptor contains the controller type as well. By default, qemu-img sets it to "ide", which seems not optimal especially for VMware's ESXi. Set adapter type to commonly supported "lsilogic". * Move ova image generation to hdd-image.sh	2021-12-29 15:37:10 +01:00
Stefan Agner	2a255728e3	Linux: Update kernel 5.10.88 (#1693 )	2021-12-29 15:36:39 +01:00
Stefan Agner	70f1a57a62	Adjust ova to support VMware ESXi (#826 ) (#1674 ) * Use OpenSSL to generate OVA manifest file (#826) It seems that sha256sum adds a space after the hash algorithm which causes "Invalid OVF checksum algorithm" on certain VMware virtualization products. Using OpenSSL avoids the space and makes the manifest file compatible wiht VMware products. * Use Buildroot provided OpenSSL binary * Use SCSI controller by default	2021-12-29 15:35:32 +01:00
Stefan Agner	33ce44a8c2	Avoid race condition when fetching containers during build (#1671 ) * Avoid race condition when fetching containers during build So far only a single builder was active for each architecture. This toghether with the naming scheme to include architecture/machine name made sure that an image could only be fetched or used by a single builder. However, since most systems are now aarch64, multiple runners are now active for a single architecture. This makes it necessary to lock fetching/coping of container images to avoid race conditions.	2021-12-29 15:34:34 +01:00
Stefan Agner	783307cf63	Add patch for iwlwifi to fix beacon timeout (#1655 ) (#1670 ) Allow to configure missed beacons using the iwlwifi.beacon_timeout kernel parameter.	2021-12-29 15:34:16 +01:00
Stefan Agner	3ffdc0fbf4	rtl8812au: use buildroot provided aircrack-ng driver (#1660 ) (#1669 ) Use rtl8812au driver provided by buildroot. This uses a newer verison of the v5.6.4.2 branch which works with newer kernel and seems to be the recommended branch. Note: It seems that our buildroot package currently fails to properly deploy the 88XXau.ko kernel module. Instead of fixing our version, just move to the buildroot version.	2021-12-29 15:33:11 +01:00
geftactics	783df55c0d	Update download URL for package intel-e1000e (#1668 )	2021-12-29 15:32:25 +01:00
Stefan Agner	a6e0e02033	Set deployment type to production	2021-12-03 16:57:11 +01:00
Stefan Agner	caee84c471	Linux: Update kernel 5.10.83	2021-12-03 16:45:14 +01:00
Alexander Reinert	d78743309a	Updated to latest generic_raw_uart package (#1653 )	2021-12-03 16:10:23 +01:00
Stefan Agner	b84e6da15f	Enable Broadcom and Atheros Ethernet drivers (#1650 ) (#1651 )	2021-12-03 16:10:20 +01:00
				`@ -1 +0,0 @@`
				`ACTION=="add", ATTRS{idVendor}=="1b1f", ATTRS{idProduct}=="c020", RUN+="/sbin/modprobe cp210x" RUN+="/bin/sh -c 'echo 1b1f c020 >/sys/bus/usb-serial/drivers/cp210x/new_id'"`