2025-08-01 01:07:42 +00:00
51 changed files with 728 additions and 580 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,5 +1,6 @@
-name: Report an issue with Home Assistant Operating System
+name: Bug Report Form
 description: Report an issue related to the Home Assistant Operating System.
+labels: bug
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -9,7 +9,7 @@ contact_links:
    about: Our developer documentation has its own issue tracker. Please report issues with the website there.

  - name: Request a feature for the Operating System
-    url: https://github.com/orgs/home-assistant/discussions
+    url: https://community.home-assistant.io/c/feature-requests
    about: Request an new feature for the Operating System.

  - name: I have a question or need support
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -163,7 +163,7 @@ jobs:
            }

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v3.10.0
      - name: Log in to the GitHub container registry
        uses: docker/login-action@v3.4.0
        with:
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@ -3,7 +3,7 @@

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.12.40 |
+| Open Virtual Appliance | 6.12.33 |
 | Raspberry Pi | 6.12.25 |
 | Raspberry Pi 0-W | 6.12.25 |
 | Raspberry Pi 2 | 6.12.25 |
@ -11,14 +11,14 @@
 | Raspberry Pi 4 | 6.12.25 |
 | Raspberry Pi 5 | 6.12.25 |
 | Home Assistant Yellow | 6.12.25 |
-| Home Assistant Green | 6.12.40 |
-| Tinker Board | 6.12.40 |
-| ODROID-C2 | 6.12.40 |
-| ODROID-C4 | 6.12.40 |
-| ODROID-M1 | 6.12.40 |
-| ODROID-M1S | 6.12.40 |
-| ODROID-N2 | 6.12.40 |
-| ODROID-XU4 | 6.12.40 |
-| Generic aarch64 | 6.12.40 |
-| Generic x86-64 | 6.12.40 |
-| Khadas VIM3 | 6.12.40 |
+| Home Assistant Green | 6.12.33 |
+| Tinker Board | 6.12.33 |
+| ODROID-C2 | 6.12.33 |
+| ODROID-C4 | 6.12.33 |
+| ODROID-M1 | 6.12.33 |
+| ODROID-M1S | 6.12.33 |
+| ODROID-N2 | 6.12.33 |
+| ODROID-XU4 | 6.12.33 |
+| Generic aarch64 | 6.12.33 |
+| Generic x86-64 | 6.12.33 |
+| Khadas VIM3 | 6.12.33 |
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 01604756d2d0fc42e6ad7061fe1eb5bead732374
+Subproject commit 30ef1047d9e4b353ed7679d3da39e382f24a9b59
--- a/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh
@ -20,11 +20,9 @@ function hassos_pre_image() {

 function hassos_post_image() {
    convert_disk_image_virtual vmdk
-    convert_disk_image_virtual vdi
    convert_disk_image_virtual qcow2

    convert_disk_image_zip vmdk
-    convert_disk_image_zip vdi
    convert_disk_image_xz qcow2

    convert_disk_image_xz
--- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
@ -75,10 +75,3 @@ CONFIG_I2C_CADENCE=y
 # 1-wire
 CONFIG_W1_MASTER_AMD_AXI=m
 CONFIG_W1_SLAVE_THERM=m
-
-# IIO
-CONFIG_XILINX_AMS=m
-
-# Audio drivers
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_GENERIC=m
--- a/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0001-r8169-add-support-for-RTL8125D.patch
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0001-r8169-add-support-for-RTL8125D.patch
@ -0,0 +1,154 @@
+From bb1ca7f6ce619e93492c95d355ae735df794186b Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 24 Oct 2024 22:42:33 +0200
+Subject: [PATCH] r8169: add support for RTL8125D
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for new chip version RTL8125D, which can be found on
+boards like Gigabyte X870E AORUS ELITE WIFI7. Firmware rtl8125d-1.fw
+for this chip version is available in linux-firmware already.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Link: https://patch.msgid.link/d0306912-e88e-4c25-8b5d-545ae8834c0c@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f75d1fbe7809bc5ed134204b920fd9e2fc5db1df
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/ethernet/realtek/r8169.h          |  1 +
+ drivers/net/ethernet/realtek/r8169_main.c     | 23 +++++++++++++------
+ .../net/ethernet/realtek/r8169_phy_config.c   | 10 ++++++++
+ 3 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
+index e2db944e6fa8..be4c9622618d 100644
+--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
+@@ -68,6 +68,7 @@ enum mac_version {
+ 	/* support for RTL_GIGA_MAC_VER_60 has been removed */
+ 	RTL_GIGA_MAC_VER_61,
+ 	RTL_GIGA_MAC_VER_63,
+	RTL_GIGA_MAC_VER_64,
+ 	RTL_GIGA_MAC_VER_65,
+ 	RTL_GIGA_MAC_VER_66,
+ 	RTL_GIGA_MAC_NONE
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index 85bb5121cd24..7b82779e4cd5 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -55,6 +55,7 @@
+ #define FIRMWARE_8107E_2	"rtl_nic/rtl8107e-2.fw"
+ #define FIRMWARE_8125A_3	"rtl_nic/rtl8125a-3.fw"
+ #define FIRMWARE_8125B_2	"rtl_nic/rtl8125b-2.fw"
+#define FIRMWARE_8125D_1	"rtl_nic/rtl8125d-1.fw"
+ #define FIRMWARE_8126A_2	"rtl_nic/rtl8126a-2.fw"
+ #define FIRMWARE_8126A_3	"rtl_nic/rtl8126a-3.fw"
+ 
+@@ -138,6 +139,7 @@ static const struct {
+ 	[RTL_GIGA_MAC_VER_61] = {"RTL8125A",		FIRMWARE_8125A_3},
+ 	/* reserve 62 for CFG_METHOD_4 in the vendor driver */
+ 	[RTL_GIGA_MAC_VER_63] = {"RTL8125B",		FIRMWARE_8125B_2},
+	[RTL_GIGA_MAC_VER_64] = {"RTL8125D",		FIRMWARE_8125D_1},
+ 	[RTL_GIGA_MAC_VER_65] = {"RTL8126A",		FIRMWARE_8126A_2},
+ 	[RTL_GIGA_MAC_VER_66] = {"RTL8126A",		FIRMWARE_8126A_3},
+ };
+@@ -707,6 +709,7 @@ MODULE_FIRMWARE(FIRMWARE_8168FP_3);
+ MODULE_FIRMWARE(FIRMWARE_8107E_2);
+ MODULE_FIRMWARE(FIRMWARE_8125A_3);
+ MODULE_FIRMWARE(FIRMWARE_8125B_2);
+MODULE_FIRMWARE(FIRMWARE_8125D_1);
+ MODULE_FIRMWARE(FIRMWARE_8126A_2);
+ MODULE_FIRMWARE(FIRMWARE_8126A_3);
+ 
+@@ -2098,10 +2101,7 @@ static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp)
+ 		tp->tx_lpi_timer = timer_val;
+ 		r8168_mac_ocp_write(tp, 0xe048, timer_val);
+ 		break;
+-	case RTL_GIGA_MAC_VER_61:
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
+	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_66:
+ 		tp->tx_lpi_timer = timer_val;
+ 		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
+ 		break;
+@@ -2233,6 +2233,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
+ 		{ 0x7cf, 0x64a,	RTL_GIGA_MAC_VER_66 },
+ 		{ 0x7cf, 0x649,	RTL_GIGA_MAC_VER_65 },
+ 
+		/* 8125D family. */
+		{ 0x7cf, 0x688,	RTL_GIGA_MAC_VER_64 },
+
+ 		/* 8125B family. */
+ 		{ 0x7cf, 0x641,	RTL_GIGA_MAC_VER_63 },
+ 
+@@ -2500,9 +2503,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
+ 	case RTL_GIGA_MAC_VER_61:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
+ 		break;
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
+	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_66:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
+ 			RX_PAUSE_SLOT_ON);
+ 		break;
+@@ -3840,6 +3841,12 @@ static void rtl_hw_start_8125b(struct rtl8169_private *tp)
+ 	rtl_hw_start_8125_common(tp);
+ }
+ 
+static void rtl_hw_start_8125d(struct rtl8169_private *tp)
+{
+	rtl_set_def_aspm_entry_latency(tp);
+	rtl_hw_start_8125_common(tp);
+}
+
+ static void rtl_hw_start_8126a(struct rtl8169_private *tp)
+ {
+ 	rtl_disable_zrxdc_timeout(tp);
+@@ -3889,6 +3896,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
+ 		[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
+ 		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
+ 		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
+		[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
+ 		[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8126a,
+ 		[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
+ 	};
+@@ -3906,6 +3914,7 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
+ 	/* disable interrupt coalescing */
+ 	switch (tp->mac_version) {
+ 	case RTL_GIGA_MAC_VER_61:
+	case RTL_GIGA_MAC_VER_64:
+ 		for (i = 0xa00; i < 0xb00; i += 4)
+ 			RTL_W32(tp, i, 0);
+ 		break;
+diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
+index cf29b1208482..d09b2a41cd06 100644
+--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
+@@ -1104,6 +1104,15 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
+ 	rtl8125b_config_eee_phy(phydev);
+ }
+ 
+static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
+				   struct phy_device *phydev)
+{
+	r8169_apply_firmware(tp);
+	rtl8125_legacy_force_mode(phydev);
+	rtl8168g_disable_aldps(phydev);
+	rtl8125b_config_eee_phy(phydev);
+}
+
+ static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,
+ 				   struct phy_device *phydev)
+ {
+@@ -1160,6 +1169,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
+ 		[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
+		[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_65] = rtl8126a_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_66] = rtl8126a_hw_phy_config,
+ 	};
--- a/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
@ -0,0 +1,143 @@
+From acc8d5ec4b6cdbf0a9625a9f9d3710b52555f3b2 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Tue, 15 Oct 2024 07:47:14 +0200
+Subject: [PATCH] net: phy: realtek: merge the drivers for internal NBase-T
+ PHY's
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Realtek RTL8125/RTL8126 NBase-T MAC/PHY chips have internal PHY's
+which are register-compatible, at least for the registers we use here.
+So let's use just one PHY driver to support all of them.
+These internal PHY's exist also as external C45 PHY's, but on the
+internal PHY's no access to MMD registers is possible. This can be
+used to differentiate between the internal and external version.
+
+As a side effect the drivers for two now external-only drivers don't
+require read_mmd/write_mmd hooks any longer.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Link: https://patch.msgid.link/c57081a6-811f-4571-ab35-34f4ca6de9af@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f87a17ed3b51fba4dfdd8f8b643b5423a85fc551
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 53 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 166f6a7283731..830a0d337de5d 100644
+--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
+@@ -92,6 +92,7 @@
+ 
+ #define RTL_GENERIC_PHYID			0x001cc800
+ #define RTL_8211FVD_PHYID			0x001cc878
+#define RTL_8221B				0x001cc840
+ #define RTL_8221B_VB_CG				0x001cc849
+ #define RTL_8221B_VN_CG				0x001cc84a
+ #define RTL_8251B				0x001cc862
+@@ -1040,6 +1041,23 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
+ 	return val >= 0 && val & MDIO_PMA_SPEED_2_5G;
+ }
+ 
+/* On internal PHY's MMD reads over C22 always return 0.
+ * Check a MMD register which is known to be non-zero.
+ */
+static bool rtlgen_supports_mmd(struct phy_device *phydev)
+{
+	int val;
+
+	phy_lock_mdio_bus(phydev);
+	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS);
+	__phy_write(phydev, MII_MMD_DATA, MDIO_PCS_EEE_ABLE);
+	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS | MII_MMD_CTRL_NOINCR);
+	val = __phy_read(phydev, MII_MMD_DATA);
+	phy_unlock_mdio_bus(phydev);
+
+	return val > 0;
+}
+
+ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+@@ -1049,7 +1067,8 @@ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ static int rtl8226_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+-	       rtlgen_supports_2_5gbps(phydev);
+	       rtlgen_supports_2_5gbps(phydev) &&
+	       rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+@@ -1061,6 +1080,11 @@ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+ 		return !is_c45 && (id == phydev->phy_id);
+ }
+ 
+static int rtl8221b_match_phy_device(struct phy_device *phydev)
+{
+	return phydev->phy_id == RTL_8221B && rtlgen_supports_mmd(phydev);
+}
+
+ static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)
+ {
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false);
+@@ -1081,9 +1105,21 @@ static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev)
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
+ }
+ 
+-static int rtl8251b_c22_match_phy_device(struct phy_device *phydev)
+static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ {
+-	return rtlgen_is_c45_match(phydev, RTL_8251B, false);
+	if (phydev->is_c45)
+		return false;
+
+	switch (phydev->phy_id) {
+	case RTL_GENERIC_PHYID:
+	case RTL_8221B:
+	case RTL_8251B:
+		break;
+	default:
+		return false;
+	}
+
+	return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtl8251b_c45_match_phy_device(struct phy_device *phydev)
+@@ -1345,10 +1381,8 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+-		PHY_ID_MATCH_EXACT(0x001cc840),
+		.match_phy_device = rtl8221b_match_phy_device,
+ 		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
+ 		.get_features	= rtl822x_get_features,
+ 		.config_aneg	= rtl822x_config_aneg,
+@@ -1359,8 +1393,6 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+ 		PHY_ID_MATCH_EXACT(0x001cc838),
+ 		.name           = "RTL8226-CG 2.5Gbps PHY",
+@@ -1438,8 +1470,9 @@ static struct phy_driver realtek_drvs[] = {
+ 		.read_page      = rtl821x_read_page,
+ 		.write_page     = rtl821x_write_page,
+ 	}, {
+-		.match_phy_device = rtl8251b_c22_match_phy_device,
+-		.name           = "RTL8126A-internal 5Gbps PHY",
+		.match_phy_device = rtl_internal_nbaset_match_phy_device,
+		.name           = "Realtek Internal NBASE-T PHY",
+		.flags		= PHY_IS_INTERNAL,
+ 		.get_features   = rtl822x_get_features,
+ 		.config_aneg    = rtl822x_config_aneg,
+ 		.read_status    = rtl822x_read_status,
--- a/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch
@ -0,0 +1,36 @@
+From 7ab842c714924784cae4b6ab229997905b096b4f Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 17 Oct 2024 18:01:13 +0200
+Subject: [PATCH] net: phy: realtek: add RTL8125D-internal PHY
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first boards show up with Realtek's RTL8125D. This MAC/PHY chip
+comes with an integrated 2.5Gbps PHY with ID 0x001cc841. It's not
+clear yet whether there's an external version of this PHY and how
+Realtek calls it, therefore use the numeric id for now.
+
+Link: https://lore.kernel.org/netdev/2ada65e1-5dfa-456c-9334-2bc51272e9da@gmail.com/T/
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Message-ID: <7d2924de-053b-44d2-a479-870dc3878170@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8989bad541133c43550bff2b80edbe37b8fb9659
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 830a0d337de5d..8ce5705af69c5 100644
+--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
+@@ -1114,6 +1114,7 @@ static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ 	case RTL_GENERIC_PHYID:
+ 	case RTL_8221B:
+ 	case RTL_8251B:
+	case 0x001cc841:
+ 		break;
+ 	default:
+ 		return false;
--- a/buildroot-external/board/hardkernel/kernel-amlogic.config
+++ b/buildroot-external/board/hardkernel/kernel-amlogic.config
@ -285,6 +285,8 @@ CONFIG_HNS3=y
 CONFIG_HNS3_HCLGE=y
 CONFIG_HNS3_ENET=y
 CONFIG_E1000E=y
+CONFIG_IGB=y
+CONFIG_IGBVF=y
 CONFIG_MVMDIO=y
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
--- a/buildroot-external/board/khadas/kernel-vim.config
+++ b/buildroot-external/board/khadas/kernel-vim.config
@ -209,6 +209,8 @@ CONFIG_HNS3=y
 CONFIG_HNS3_HCLGE=y
 CONFIG_HNS3_ENET=y
 CONFIG_E1000E=y
+CONFIG_IGB=y
+CONFIG_IGBVF=y
 CONFIG_MVMDIO=y
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@ -162,9 +162,3 @@ CONFIG_BMP280=m

 # Required for some PCIe devices such as ath12k
 CONFIG_IRQ_REMAP=y
-
-# Pin control support
-CONFIG_PINCTRL_CANNONLAKE=m
-
-# Network devices
-CONFIG_MARVELL_PHY=m
--- a/buildroot-external/board/pc/patches/linux/0001-r8169-add-support-for-RTL8125D.patch
+++ b/buildroot-external/board/pc/patches/linux/0001-r8169-add-support-for-RTL8125D.patch
@ -0,0 +1,154 @@
+From bb1ca7f6ce619e93492c95d355ae735df794186b Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 24 Oct 2024 22:42:33 +0200
+Subject: [PATCH] r8169: add support for RTL8125D
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for new chip version RTL8125D, which can be found on
+boards like Gigabyte X870E AORUS ELITE WIFI7. Firmware rtl8125d-1.fw
+for this chip version is available in linux-firmware already.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Link: https://patch.msgid.link/d0306912-e88e-4c25-8b5d-545ae8834c0c@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f75d1fbe7809bc5ed134204b920fd9e2fc5db1df
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/ethernet/realtek/r8169.h          |  1 +
+ drivers/net/ethernet/realtek/r8169_main.c     | 23 +++++++++++++------
+ .../net/ethernet/realtek/r8169_phy_config.c   | 10 ++++++++
+ 3 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
+index e2db944e6fa8..be4c9622618d 100644
+--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
+@@ -68,6 +68,7 @@ enum mac_version {
+ 	/* support for RTL_GIGA_MAC_VER_60 has been removed */
+ 	RTL_GIGA_MAC_VER_61,
+ 	RTL_GIGA_MAC_VER_63,
+	RTL_GIGA_MAC_VER_64,
+ 	RTL_GIGA_MAC_VER_65,
+ 	RTL_GIGA_MAC_VER_66,
+ 	RTL_GIGA_MAC_NONE
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index 85bb5121cd24..7b82779e4cd5 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -55,6 +55,7 @@
+ #define FIRMWARE_8107E_2	"rtl_nic/rtl8107e-2.fw"
+ #define FIRMWARE_8125A_3	"rtl_nic/rtl8125a-3.fw"
+ #define FIRMWARE_8125B_2	"rtl_nic/rtl8125b-2.fw"
+#define FIRMWARE_8125D_1	"rtl_nic/rtl8125d-1.fw"
+ #define FIRMWARE_8126A_2	"rtl_nic/rtl8126a-2.fw"
+ #define FIRMWARE_8126A_3	"rtl_nic/rtl8126a-3.fw"
+ 
+@@ -138,6 +139,7 @@ static const struct {
+ 	[RTL_GIGA_MAC_VER_61] = {"RTL8125A",		FIRMWARE_8125A_3},
+ 	/* reserve 62 for CFG_METHOD_4 in the vendor driver */
+ 	[RTL_GIGA_MAC_VER_63] = {"RTL8125B",		FIRMWARE_8125B_2},
+	[RTL_GIGA_MAC_VER_64] = {"RTL8125D",		FIRMWARE_8125D_1},
+ 	[RTL_GIGA_MAC_VER_65] = {"RTL8126A",		FIRMWARE_8126A_2},
+ 	[RTL_GIGA_MAC_VER_66] = {"RTL8126A",		FIRMWARE_8126A_3},
+ };
+@@ -707,6 +709,7 @@ MODULE_FIRMWARE(FIRMWARE_8168FP_3);
+ MODULE_FIRMWARE(FIRMWARE_8107E_2);
+ MODULE_FIRMWARE(FIRMWARE_8125A_3);
+ MODULE_FIRMWARE(FIRMWARE_8125B_2);
+MODULE_FIRMWARE(FIRMWARE_8125D_1);
+ MODULE_FIRMWARE(FIRMWARE_8126A_2);
+ MODULE_FIRMWARE(FIRMWARE_8126A_3);
+ 
+@@ -2098,10 +2101,7 @@ static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp)
+ 		tp->tx_lpi_timer = timer_val;
+ 		r8168_mac_ocp_write(tp, 0xe048, timer_val);
+ 		break;
+-	case RTL_GIGA_MAC_VER_61:
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
+	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_66:
+ 		tp->tx_lpi_timer = timer_val;
+ 		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
+ 		break;
+@@ -2233,6 +2233,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
+ 		{ 0x7cf, 0x64a,	RTL_GIGA_MAC_VER_66 },
+ 		{ 0x7cf, 0x649,	RTL_GIGA_MAC_VER_65 },
+ 
+		/* 8125D family. */
+		{ 0x7cf, 0x688,	RTL_GIGA_MAC_VER_64 },
+
+ 		/* 8125B family. */
+ 		{ 0x7cf, 0x641,	RTL_GIGA_MAC_VER_63 },
+ 
+@@ -2500,9 +2503,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
+ 	case RTL_GIGA_MAC_VER_61:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
+ 		break;
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
+	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_66:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
+ 			RX_PAUSE_SLOT_ON);
+ 		break;
+@@ -3840,6 +3841,12 @@ static void rtl_hw_start_8125b(struct rtl8169_private *tp)
+ 	rtl_hw_start_8125_common(tp);
+ }
+ 
+static void rtl_hw_start_8125d(struct rtl8169_private *tp)
+{
+	rtl_set_def_aspm_entry_latency(tp);
+	rtl_hw_start_8125_common(tp);
+}
+
+ static void rtl_hw_start_8126a(struct rtl8169_private *tp)
+ {
+ 	rtl_disable_zrxdc_timeout(tp);
+@@ -3889,6 +3896,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
+ 		[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
+ 		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
+ 		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
+		[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
+ 		[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8126a,
+ 		[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
+ 	};
+@@ -3906,6 +3914,7 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
+ 	/* disable interrupt coalescing */
+ 	switch (tp->mac_version) {
+ 	case RTL_GIGA_MAC_VER_61:
+	case RTL_GIGA_MAC_VER_64:
+ 		for (i = 0xa00; i < 0xb00; i += 4)
+ 			RTL_W32(tp, i, 0);
+ 		break;
+diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
+index cf29b1208482..d09b2a41cd06 100644
+--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
+@@ -1104,6 +1104,15 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
+ 	rtl8125b_config_eee_phy(phydev);
+ }
+ 
+static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
+				   struct phy_device *phydev)
+{
+	r8169_apply_firmware(tp);
+	rtl8125_legacy_force_mode(phydev);
+	rtl8168g_disable_aldps(phydev);
+	rtl8125b_config_eee_phy(phydev);
+}
+
+ static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,
+ 				   struct phy_device *phydev)
+ {
+@@ -1160,6 +1169,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
+ 		[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
+		[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_65] = rtl8126a_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_66] = rtl8126a_hw_phy_config,
+ 	};
--- a/buildroot-external/board/pc/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
+++ b/buildroot-external/board/pc/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
@ -0,0 +1,143 @@
+From acc8d5ec4b6cdbf0a9625a9f9d3710b52555f3b2 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Tue, 15 Oct 2024 07:47:14 +0200
+Subject: [PATCH] net: phy: realtek: merge the drivers for internal NBase-T
+ PHY's
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Realtek RTL8125/RTL8126 NBase-T MAC/PHY chips have internal PHY's
+which are register-compatible, at least for the registers we use here.
+So let's use just one PHY driver to support all of them.
+These internal PHY's exist also as external C45 PHY's, but on the
+internal PHY's no access to MMD registers is possible. This can be
+used to differentiate between the internal and external version.
+
+As a side effect the drivers for two now external-only drivers don't
+require read_mmd/write_mmd hooks any longer.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Link: https://patch.msgid.link/c57081a6-811f-4571-ab35-34f4ca6de9af@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f87a17ed3b51fba4dfdd8f8b643b5423a85fc551
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 53 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 166f6a7283731..830a0d337de5d 100644
+--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
+@@ -92,6 +92,7 @@
+ 
+ #define RTL_GENERIC_PHYID			0x001cc800
+ #define RTL_8211FVD_PHYID			0x001cc878
+#define RTL_8221B				0x001cc840
+ #define RTL_8221B_VB_CG				0x001cc849
+ #define RTL_8221B_VN_CG				0x001cc84a
+ #define RTL_8251B				0x001cc862
+@@ -1040,6 +1041,23 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
+ 	return val >= 0 && val & MDIO_PMA_SPEED_2_5G;
+ }
+ 
+/* On internal PHY's MMD reads over C22 always return 0.
+ * Check a MMD register which is known to be non-zero.
+ */
+static bool rtlgen_supports_mmd(struct phy_device *phydev)
+{
+	int val;
+
+	phy_lock_mdio_bus(phydev);
+	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS);
+	__phy_write(phydev, MII_MMD_DATA, MDIO_PCS_EEE_ABLE);
+	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS | MII_MMD_CTRL_NOINCR);
+	val = __phy_read(phydev, MII_MMD_DATA);
+	phy_unlock_mdio_bus(phydev);
+
+	return val > 0;
+}
+
+ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+@@ -1049,7 +1067,8 @@ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ static int rtl8226_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+-	       rtlgen_supports_2_5gbps(phydev);
+	       rtlgen_supports_2_5gbps(phydev) &&
+	       rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+@@ -1061,6 +1080,11 @@ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+ 		return !is_c45 && (id == phydev->phy_id);
+ }
+ 
+static int rtl8221b_match_phy_device(struct phy_device *phydev)
+{
+	return phydev->phy_id == RTL_8221B && rtlgen_supports_mmd(phydev);
+}
+
+ static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)
+ {
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false);
+@@ -1081,9 +1105,21 @@ static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev)
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
+ }
+ 
+-static int rtl8251b_c22_match_phy_device(struct phy_device *phydev)
+static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ {
+-	return rtlgen_is_c45_match(phydev, RTL_8251B, false);
+	if (phydev->is_c45)
+		return false;
+
+	switch (phydev->phy_id) {
+	case RTL_GENERIC_PHYID:
+	case RTL_8221B:
+	case RTL_8251B:
+		break;
+	default:
+		return false;
+	}
+
+	return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtl8251b_c45_match_phy_device(struct phy_device *phydev)
+@@ -1345,10 +1381,8 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+-		PHY_ID_MATCH_EXACT(0x001cc840),
+		.match_phy_device = rtl8221b_match_phy_device,
+ 		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
+ 		.get_features	= rtl822x_get_features,
+ 		.config_aneg	= rtl822x_config_aneg,
+@@ -1359,8 +1393,6 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+ 		PHY_ID_MATCH_EXACT(0x001cc838),
+ 		.name           = "RTL8226-CG 2.5Gbps PHY",
+@@ -1438,8 +1470,9 @@ static struct phy_driver realtek_drvs[] = {
+ 		.read_page      = rtl821x_read_page,
+ 		.write_page     = rtl821x_write_page,
+ 	}, {
+-		.match_phy_device = rtl8251b_c22_match_phy_device,
+-		.name           = "RTL8126A-internal 5Gbps PHY",
+		.match_phy_device = rtl_internal_nbaset_match_phy_device,
+		.name           = "Realtek Internal NBASE-T PHY",
+		.flags		= PHY_IS_INTERNAL,
+ 		.get_features   = rtl822x_get_features,
+ 		.config_aneg    = rtl822x_config_aneg,
+ 		.read_status    = rtl822x_read_status,
--- a/buildroot-external/board/pc/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch
+++ b/buildroot-external/board/pc/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch
@ -0,0 +1,36 @@
+From 7ab842c714924784cae4b6ab229997905b096b4f Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 17 Oct 2024 18:01:13 +0200
+Subject: [PATCH] net: phy: realtek: add RTL8125D-internal PHY
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first boards show up with Realtek's RTL8125D. This MAC/PHY chip
+comes with an integrated 2.5Gbps PHY with ID 0x001cc841. It's not
+clear yet whether there's an external version of this PHY and how
+Realtek calls it, therefore use the numeric id for now.
+
+Link: https://lore.kernel.org/netdev/2ada65e1-5dfa-456c-9334-2bc51272e9da@gmail.com/T/
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Message-ID: <7d2924de-053b-44d2-a479-870dc3878170@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8989bad541133c43550bff2b80edbe37b8fb9659
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 830a0d337de5d..8ce5705af69c5 100644
+--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
+@@ -1114,6 +1114,7 @@ static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ 	case RTL_GENERIC_PHYID:
+ 	case RTL_8221B:
+ 	case RTL_8251B:
+	case 0x001cc841:
+ 		break;
+ 	default:
+ 		return false;
--- a/buildroot-external/board/raspberrypi/kernel.config
+++ b/buildroot-external/board/raspberrypi/kernel.config
@ -8,17 +8,5 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=y

-# make sure all network drivers are built-in
-# RPi 3B USB LAN drivers - 3B uses SMSC95XX, 3B+ uses LAN78XX
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_USBNET=y
-CONFIG_USB_LAN78XX=y
-CONFIG_USB_NET_SMSC95XX=y
-# RPi 4 uses bcmgenet driver and BCM54213PE PHY
-CONFIG_BCMGENET=y
-CONFIG_BROADCOM_PHY=y
-# RPi 5 uses Cadence driver and BCM54213PE PHY (above)
-CONFIG_MACB=y
-
 # do not use RPi in-tree driver, use one from BR package instead
 # CONFIG_MEDIA_PCI_HAILO is not set
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@ -5,7 +5,7 @@ BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
 BR2_ENABLE_LTO=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/patches"
 BR2_SSP_REGULAR=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@ -139,7 +139,6 @@ BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@ -5,7 +5,7 @@ BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
 BR2_ENABLE_LTO=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
 BR2_SSP_REGULAR=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@ -17,7 +17,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@ -141,7 +141,6 @@ BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/green_defconfig
+++ b/buildroot-external/configs/green_defconfig
@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green $(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green/kernel.config"
@ -117,7 +117,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3 $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@ -17,7 +17,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 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/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@ -17,7 +17,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 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/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
@ -110,7 +110,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_m1_defconfig
+++ b/buildroot-external/configs/odroid_m1_defconfig
@ -17,7 +17,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-m1 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/kernel.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_m1s_defconfig
+++ b/buildroot-external/configs/odroid_m1s_defconfig
@ -17,7 +17,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-m1s $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s/kernel.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@ -17,7 +17,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 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/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@ -18,7 +18,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@ -5,7 +5,7 @@ BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
 BR2_ENABLE_LTO=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
 BR2_SSP_REGULAR=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@ -17,7 +17,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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@ -142,7 +142,6 @@ BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@ -115,7 +115,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@ -116,7 +116,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@ -117,7 +117,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@ -117,7 +117,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@ -116,7 +116,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/rpi5_64_defconfig
+++ b/buildroot-external/configs/rpi5_64_defconfig
@ -116,7 +116,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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="6.12.40"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.33"
 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/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
@ -112,7 +112,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@ -120,7 +120,6 @@ BR2_PACKAGE_TINI=y
 BR2_PACKAGE_AUDIT=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
-BR2_PACKAGE_PIGZ=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
--- a/buildroot-external/kernel/v6.12.y/device-support-pci.config
+++ b/buildroot-external/kernel/v6.12.y/device-support-pci.config
@ -2,7 +2,6 @@
 CONFIG_PCI_IOV=y

 CONFIG_IGB=y
-CONFIG_IXGBE=y
 CONFIG_I40E=m
 CONFIG_IGC=m

--- a/buildroot-external/kernel/v6.12.y/hassos.config
+++ b/buildroot-external/kernel/v6.12.y/hassos.config
@ -156,7 +156,6 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

 CONFIG_IP_SET=m
--- a/buildroot-external/kernel/v6.12.y/kernel-arm64-rockchip.config
+++ b/buildroot-external/kernel/v6.12.y/kernel-arm64-rockchip.config
@ -1053,6 +1053,14 @@ CONFIG_HNS3_ENET=y
 CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_I40EVF=m
+CONFIG_FM10K=m
 CONFIG_JME=m
 CONFIG_ADIN1110=m
 CONFIG_LITEX_LITEETH=m
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@ -1,8 +1,8 @@
 VERSION_MAJOR="16"
-VERSION_MINOR="1"
-VERSION_SUFFIX="dev0"
+VERSION_MINOR="0"
+VERSION_SUFFIX="rc1"

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

-DEPLOYMENT="development"
+DEPLOYMENT="staging"
--- a/buildroot-external/package/hailo-pci/0001-Add-missing-lock-around-current-mm.patch
+++ b/buildroot-external/package/hailo-pci/0001-Add-missing-lock-around-current-mm.patch
@ -1,64 +0,0 @@
-From 6c80e322d23337a8b9e5df85677be89f50561d10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Wed, 2 Jul 2025 14:09:30 +0200
-Subject: [PATCH] Add missing lock around current->mm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport patch on top of v4.21.0 to hold lock during mmap access.
-Without this patch, kernel traces are generated when e.g. Frigate uses the driver:
-
-WARNING: CPU: 3 PID: 5063 at include/linux/rwsem.h:80 find_vma+0x6c/0x80
-Modules linked in: broadcom bcm_phy_ptp wireguard libchacha20poly1305 chacha_neon poly1305_neon ip6_udp_tunnel udp_tunnel libcurve25519_generic libchacha rfcomm nf_conntrack_netlink xt_set ip_set nft_chain_nat nft_compat nf_tables xfrm_user algif_hash algif_skcipher af_alg bnep btsdio sch_fq_codel brcmfmac_wcc vc4 snd_soc_hdmi_codec drm_display_helper brcmfmac cec hci_uart btqca btrtl btbcm btintel spidev drm_dma_helper brcmutil bluetooth snd_soc_core snd_compress snd_pcm_dmaengine v3d ecdh_generic rpi_hevc_dec snd_pcm pisp_be cfg80211 aes_ce_blk aes_ce_cipher v4l2_mem2mem ghash_ce videobuf2_dma_contig videobuf2_memops snd_timer ecc gpu_sched videobuf2_v4l2 sha2_ce sha256_arm64 sha1_ce libaes sha1_generic raspberrypi_hwmon rfkill snd videobuf2_common rp1_pio spi_bcm2835 drm_shmem_helper gpio_keys raspberrypi_gpiomem hailo_pci(O) rp1_mailbox i2c_brcmstb drm_kms_helper pwm_fan rp1_adc nvmem_rmem rp1 uio_pdrv_genirq uio fuse drm drm_panel_orientation_quirks backlight nfnetlink
-CPU: 3 UID: 0 PID: 5063 Comm: frigate.detecto Tainted: G        W  O       6.12.25-haos-raspi #1
-Tainted: [W]=WARN, [O]=OOT_MODULE
-Hardware name: Raspberry Pi 5 Model B Rev 1.1 (DT)
-pstate: 80400009 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-pc : find_vma+0x6c/0x80
-lr : hailo_vdma_buffer_map+0xe4/0x620 [hailo_pci]
-sp : ffffffc082f0bc20
-x29: ffffffc082f0bc30 x28: ffffff8194dea100 x27: 0000000000000000
-x26: 0000000000000000 x25: ffffff8109c04c80 x24: ffffffd03ff91000
-x23: 0000000000040f70 x22: 0000000000000001 x21: ffffff8101d570c8
-x20: 0000000000000000 x19: 0000007f8c087000 x18: 0000000000000000
-x17: 0000000000000000 x16: ffffffd08c730828 x15: 0000007f81bdcb48
-x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000
-x11: 0000000000000000 x10: 0000007f81bdcb48 x9 : ffffffd03ff8b744
-x8 : ffffff8109c04d00 x7 : 0000000000000000 x6 : 000000000000003f
-x5 : 0000000000000040 x4 : 0000000000000080 x3 : 0000000000000000
-x2 : 0000000000000000 x1 : 0000007f8c087000 x0 : ffffff8177b56880
-Call trace:
- find_vma+0x6c/0x80
- hailo_vdma_buffer_map+0xe4/0x620 [hailo_pci]
- hailo_vdma_buffer_map_ioctl+0xdc/0x348 [hailo_pci]
- hailo_vdma_ioctl+0xcc/0x258 [hailo_pci]
- hailo_pcie_fops_unlockedioctl+0x1e4/0x798 [hailo_pci]
- __arm64_sys_ioctl+0xb0/0x100
- invoke_syscall+0x50/0x120
- el0_svc_common.constprop.0+0xc8/0xf0
- do_el0_svc+0x24/0x38
- el0_svc+0x30/0xd0
- el0t_64_sync_handler+0x120/0x130
- el0t_64_sync+0x190/0x198
-
-Upstream: https://github.com/hailo-ai/hailort-drivers/commit/8edb23bdb6130f89f9f73d6dc90f9db3d1f407c6
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
- linux/vdma/memory.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/linux/vdma/memory.c b/linux/vdma/memory.c
-index 7ad4a68..7a78cc5 100644
--- a/linux/vdma/memory.c
-+++ b/linux/vdma/memory.c
-@@ -167,7 +167,9 @@ struct hailo_vdma_buffer *hailo_vdma_buffer_map(struct device *dev,
-     }
- 
-     if (HAILO_DMA_DMABUF_BUFFER != buffer_type) {
-+        mmap_read_lock(current->mm);
-         vma = find_vma(current->mm, addr_or_fd);
-+        mmap_read_unlock(current->mm);
-         if (IS_ENABLED(HAILO_SUPPORT_MMIO_DMA_MAPPING)) {
-             if (NULL == vma) {
-                 dev_err(dev, "no vma for virt_addr/size = 0x%08lx/0x%08zx\n", addr_or_fd, size);
--- a/buildroot-external/package/pi-bluetooth/hcidisable.service
+++ b/buildroot-external/package/pi-bluetooth/hcidisable.service
@ -0,0 +1,10 @@
+[Unit]
+Description=Remove HCI kernel driver if WiFi/Bluetooth module is not present
+ConditionPathExists=!/sys/bus/sdio/devices/mmc1:0001:1
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/modprobe -r hci_uart
+
+[Install]
+WantedBy=hassos-hardware.target
--- a/buildroot-external/package/pi-bluetooth/hciunbind.service
+++ b/buildroot-external/package/pi-bluetooth/hciunbind.service
@ -1,14 +0,0 @@
-[Unit]
-Description=Unbind Broadcom HCI driver if WiFi/Bluetooth module is not present
-ConditionPathExists=!/sys/bus/sdio/devices/mmc1:0001:1
-ConditionPathExists=/sys/bus/serial/drivers/hci_uart_bcm/unbind
-ConditionPathExists=/proc/device-tree/chosen/rpi-boardrev-ext
-Before=bluetooth.service
-
-[Service]
-Type=oneshot
-ExecCondition=/bin/sh -c 'test $((16#$(xxd -p -g4 /proc/device-tree/chosen/rpi-boardrev-ext) & 16#40000000)) -gt 0'
-ExecStart=/bin/sh -c 'echo "serial0-0" > /sys/bus/serial/drivers/hci_uart_bcm/unbind'
-
-[Install]
-WantedBy=hassos-hardware.target
--- a/buildroot-external/package/pi-bluetooth/pi-bluetooth.mk
+++ b/buildroot-external/package/pi-bluetooth/pi-bluetooth.mk
@ -12,7 +12,7 @@ PI_BLUETOOTH_LICENSE_FILES = debian/copyright
 define PI_BLUETOOTH_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
 	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/hciuart.service $(TARGET_DIR)/usr/lib/systemd/system/
-	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/hciunbind.service $(TARGET_DIR)/usr/lib/systemd/system/
+	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/hcidisable.service $(TARGET_DIR)/usr/lib/systemd/system/
 	$(INSTALL) -m 0644 $(BR2_EXTERNAL_HASSOS_PATH)/package/pi-bluetooth/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/

 	$(INSTALL) -d $(TARGET_DIR)/usr/bin
--- a/buildroot-external/patches/systemd/0005-journal-gatewayd-make-num_entries-in-Range-header-op.patch
+++ b/buildroot-external/patches/systemd/0005-journal-gatewayd-make-num_entries-in-Range-header-op.patch
@ -1,147 +0,0 @@
-From a7a18e1be478c0114a7f8e285ce238aacd4c2ba7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Wed, 18 Jun 2025 17:32:49 +0200
-Subject: [PATCH] journal-gatewayd: make num_entries in Range header optional
- again
-
-Since 435c372ce5059082212d37ac7039844f14f34a80 added in v256,
-num_entries part of the Range header is mandatory and error is returned
-when it's not filled in. This makes using the "follow" argument clumsy,
-because for an indefinite following of the logs, arbitrary high number
-must be specified. This change makes it possible to omit it again and
-documents this behavior in the man page.
-
-Moreover, as the cursor part of the header was never mandatory, enclose
-it in square brackets in the documentation as well and elaborate how
-indexing works.
-
-Following are some concrete examples of the Range header which are now
-accepted:
-
- entries= (or entries=:)
-  - everything starting from the first event
-
- entries=cursor
-  - everything starting from `cursor`
-
- entries=:-9:10
-  - last 10 events and close the connection
-
-If the follow flag is set:
-
- entries=:-4:10
-  - last 5 events, wait for 5 new and close connection
-
- entries=:-9:
-  - last 10 events and keep streaming
-
-Note that only the very last one is changing current behavior, but
-reintroduces pre-v256 compatibility.
-
-Fixes #37172
---
-(Backported for v256.x)
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
-Upstream: https://github.com/systemd/systemd/pull/37883
---
- man/systemd-journal-gatewayd.service.xml       | 13 ++++++++-----
- src/journal-remote/journal-gatewayd.c          | 14 ++++++++------
- test/units/TEST-04-JOURNAL.journal-gatewayd.sh | 15 +++++++++++++++
- 3 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
-index 38adfe6b4e..5dbdace78e 100644
--- a/man/systemd-journal-gatewayd.service.xml
-+++ b/man/systemd-journal-gatewayd.service.xml
-@@ -275,20 +275,23 @@
-     <title>Range header</title>
- 
-     <para>
-      <option>Range: entries=<replaceable>cursor</replaceable>[[:<replaceable>num_skip</replaceable>]:<replaceable>num_entries</replaceable>]</option>
-+      <option>Range: entries=[<replaceable>cursor</replaceable>][[:<replaceable>num_skip</replaceable>]:[<replaceable>num_entries</replaceable>]]</option>
-     </para>
-     <para>
-       <option>Range: realtime=[<replaceable>since</replaceable>]:[<replaceable>until</replaceable>][[:<replaceable>num_skip</replaceable>]:<replaceable>num_entries</replaceable>]</option>
-     </para>
- 
-     <para>where
-      <replaceable>cursor</replaceable> is a cursor string,
-+      <replaceable>cursor</replaceable> is a cursor string, defaults to the first entry,
-       <replaceable>since</replaceable> and <replaceable>until</replaceable> are timestamps (seconds since 1970-01-01 00:00:00 UTC),
-       <replaceable>num_skip</replaceable> is an integer,
-       <replaceable>num_entries</replaceable> is an unsigned integer.
-     </para>
- 
-     <para>Range defaults to all available events.</para>
-+
-+    <para>If <replaceable>num_skip</replaceable> is negative and no <replaceable>cursor</replaceable> is
-+    given, the last entry will be the reference point.</para>
-   </refsect1>
- 
-   <refsect1>
-@@ -300,9 +303,9 @@
-       <varlistentry>
-         <term><uri>follow</uri></term>
- 
-        <listitem><para>wait for new events
-        (like <command>journalctl --follow</command>, except that
-        the number of events returned is not limited).</para>
-+        <listitem><para>wait for new events (like <command>journalctl --follow</command>, the number of
-+        events returned is not limited, unless <replaceable>num_entries</replaceable> is specified in the
-+        <replaceable>Range</replaceable> header).</para>
- 
-         <xi:include href="version-info.xml" xpointer="v197"/>
-         </listitem>
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 0999234f42..0661ecb1cf 100644
--- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -332,14 +332,16 @@ static int request_parse_range_skip_and_n_entries(
-         }
- 
-         p = (colon2 ?: colon) + 1;
-        r = safe_atou64(p, &m->n_entries);
-        if (r < 0)
-                return r;
-+        if (!isempty(p)) {
-+                r = safe_atou64(p, &m->n_entries);
-+                if (r < 0)
-+                        return r;
- 
-        if (m->n_entries <= 0)
-                return -EINVAL;
-+                if (m->n_entries <= 0)
-+                        return -EINVAL;
- 
-        m->n_entries_set = true;
-+                m->n_entries_set = true;
-+        }
- 
-         return 0;
- }
-diff --git a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-index 35ac91ba40..ef85dc17c6 100755
--- a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-+++ b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-@@ -67,6 +67,21 @@ curl -LSfs \
-      --header "Range: entries=$BOOT_CURSOR:5:10" \
-      http://localhost:19531/entries >"$LOG_FILE"
- jq -se "length == 10" "$LOG_FILE"
-+# Check that follow with no num_entries follows "indefinitely"
-+(
-+    set +e; \
-+    timeout 5 curl -LSfs \
-+         --header "Accept: application/json" \
-+         --header "Range: entries=:-1:" \
-+         http://localhost:19531/entries?follow >"$LOG_FILE" ; \
-+    test $? -eq 124 # timeout should kill the curl process waiting for new entries
-+)
-+# Check that follow with num_entries returns the specified number of entries and exits
-+timeout 5 curl -LSfs \
-+     --header "Accept: application/json" \
-+     --header "Range: entries=:-20:10" \
-+     http://localhost:19531/entries?follow >"$LOG_FILE"
-+jq -se "length == 10" "$LOG_FILE"
- # Check if the specified cursor refers to an existing entry and return just that entry
- curl -LSfs \
-      --header "Accept: application/json" \
--- a/buildroot-external/patches/systemd/0006-journal-gatewayd-fix-handling-of-num_skip-pointing-b.patch
+++ b/buildroot-external/patches/systemd/0006-journal-gatewayd-fix-handling-of-num_skip-pointing-b.patch
@ -1,73 +0,0 @@
-From 56e744bc45713ef7575032cfdb20073013ec0a8d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Tue, 24 Jun 2025 18:54:44 +0200
-Subject: [PATCH] journal-gatewayd: fix handling of num_skip pointing beyond
- the last entry
-
-When `num_skip` is supplied to the `Range` header, journal-gatewayd
-always returns the very last record even though it should have been
-skipped. This is because the `sd_journal_next_skip` always returns
-non-zero value on the first call, leading to one iteration of the
-`request_reader_entries` returning the last record.
-
-To avoid this unexpected behavior, check that the number of lines we
-have skipped by is not lower than the requested skip value. If it is,
-then it means there are lines which should not be returned now -
-decrement the n_skip counter then and return from the function, closing
-the stream if follow flag is not set.
-
-Fixes #37954
---
-(Backported for v256.x)
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
-Upstream: https://github.com/systemd/systemd/pull/37955
---
-src/journal-remote/journal-gatewayd.c          | 16 ++++++++++++++--
- test/units/TEST-04-JOURNAL.journal-gatewayd.sh |  6 ++++++
- 2 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 0661ecb1cf..5bce48d485 100644
--- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -181,9 +181,21 @@ static ssize_t request_reader_entries(
- 
-                 if (m->n_skip < 0)
-                         r = sd_journal_previous_skip(m->journal, (uint64_t) -m->n_skip + 1);
-                else if (m->n_skip > 0)
-+                else if (m->n_skip > 0) {
-                         r = sd_journal_next_skip(m->journal, (uint64_t) m->n_skip + 1);
-                else
-+                        if (r < 0) {
-+                                log_error_errno(r, "Failed to skip journal entries: %m");
-+                                return MHD_CONTENT_READER_END_WITH_ERROR;
-+                        }
-+                        /* We skipped beyond the end, make sure entries between the cursor and n_skip offset
-+                         * from it are not returned. */
-+                        if (r < m->n_skip + 1) {
-+                                m->n_skip -= r;
-+                                if (m->follow)
-+                                        return 0;
-+                                return MHD_CONTENT_READER_END_OF_STREAM;
-+                        }
-+                } else
-                         r = sd_journal_next(m->journal);
- 
-                 if (r < 0) {
-diff --git a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-index ef85dc17c6..b6dc860b63 100755
--- a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-+++ b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
-@@ -82,6 +82,12 @@ timeout 5 curl -LSfs \
-      --header "Range: entries=:-20:10" \
-      http://localhost:19531/entries?follow >"$LOG_FILE"
- jq -se "length == 10" "$LOG_FILE"
-+# Test positive skip beyond the last entry
-+curl -LSfs \
-+     --header "Accept: application/json" \
-+     --header "Range: entries=$TEST_CURSOR:1:1" \
-+     http://localhost:19531/entries?SYSLOG_IDENTIFIER="$TEST_TAG" >"$LOG_FILE"
-+jq -se "length == 0" "$LOG_FILE"
- # Check if the specified cursor refers to an existing entry and return just that entry
- curl -LSfs \
-      --header "Accept: application/json" \
--- a/buildroot-external/patches/systemd/0007-journal-gatewayd-fix-busy-loop-when-following-way-be.patch
+++ b/buildroot-external/patches/systemd/0007-journal-gatewayd-fix-busy-loop-when-following-way-be.patch
@ -1,88 +0,0 @@
-From d93da906a2148429f21c201aeb20e8738c22f4a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Wed, 30 Jul 2025 19:18:13 +0200
-Subject: [PATCH] journal-gatewayd: fix busy loop when following way beyond
- journal end
-
-Fix regression introduced in a7bfb9f76b96888d60b4f287f29dcbf758ba34c0,
-where busy loop can be started with a request for following logs with a
-range header set with num_skip value pointing beyond the end of the
-journal. In that case the reader callback returns 0 and is called
-immediately again, usually causing an endless loop that is not recovered
-even when new journal events are added.
-
-The bug does not occur if num_skip is not set - in that case if no
-journal entries matching the filters are added, the tight loop is
-avoided by the sd_journal_wait().
-
-To fix the issue, when no matching journal events are available, set a
-flag and reuse the backoff mechanism using the sd_journal_wait().
-
-Link: https://github.com/home-assistant/operating-system/issues/4190
---
-(Backported for v256.x)
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
-Upstream: https://github.com/systemd/systemd/pull/38422
---
- src/journal-remote/journal-gatewayd.c | 31 +++++++++++++++------------
- 1 file changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 5bce48d485..f7ecc352cc 100644
--- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -171,6 +171,7 @@ static ssize_t request_reader_entries(
- 
-         while (pos >= m->size) {
-                 off_t sz;
-+                bool wait_for_events = false;
- 
-                 /* End of this entry, so let's serialize the next
-                  * one */
-@@ -191,9 +192,10 @@ static ssize_t request_reader_entries(
-                          * from it are not returned. */
-                         if (r < m->n_skip + 1) {
-                                 m->n_skip -= r;
-                                if (m->follow)
-                                        return 0;
-                                return MHD_CONTENT_READER_END_OF_STREAM;
-+
-+                                if (!m->follow)
-+                                        return MHD_CONTENT_READER_END_OF_STREAM;
-+                                wait_for_events = true;
-                         }
-                 } else
-                         r = sd_journal_next(m->journal);
-@@ -202,20 +204,21 @@ static ssize_t request_reader_entries(
-                         log_error_errno(r, "Failed to advance journal pointer: %m");
-                         return MHD_CONTENT_READER_END_WITH_ERROR;
-                 } else if (r == 0) {
-+                        if (!m->follow)
-+                                return MHD_CONTENT_READER_END_OF_STREAM;
-+                        wait_for_events = true;
-+                }
- 
-                        if (m->follow) {
-                                r = sd_journal_wait(m->journal, (uint64_t) JOURNAL_WAIT_TIMEOUT);
-                                if (r < 0) {
-                                        log_error_errno(r, "Couldn't wait for journal event: %m");
-                                        return MHD_CONTENT_READER_END_WITH_ERROR;
-                                }
-                                if (r == SD_JOURNAL_NOP)
-                                        break;
-
-                                continue;
-+                if (wait_for_events) {
-+                        r = sd_journal_wait(m->journal, (uint64_t) JOURNAL_WAIT_TIMEOUT);
-+                        if (r < 0) {
-+                                log_error_errno(r, "Couldn't wait for journal event: %m");
-+                                return MHD_CONTENT_READER_END_WITH_ERROR;
-                         }
-+                        if (r == SD_JOURNAL_NOP)
-+                                break;
- 
-                        return MHD_CONTENT_READER_END_OF_STREAM;
-+                        continue;
-                 }
- 
-                 if (m->discrete) {
--- a/buildroot-external/rootfs-overlay/etc/docker/daemon.json
+++ b/buildroot-external/rootfs-overlay/etc/docker/daemon.json
@ -1,6 +1,8 @@
 {
    "storage-driver": "overlay2",
    "log-driver": "journald",
+    "experimental": true,
+    "ip6tables": true,
    "log-opts": {
        "tag": "{{.Name}}"
    },
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@ -95,7 +95,6 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
        --oom-score-adj=-300 \
        -v /run/docker.sock:/run/docker.sock:rw \
        -v /run/containerd/containerd.sock:/run/containerd/containerd.sock:rw \
-        -v /run/systemd/journal/socket:/run/systemd/journal/socket:rw \
        -v /run/systemd-journal-gatewayd.sock:/run/systemd-journal-gatewayd.sock:rw \
        -v /run/dbus:/run/dbus:ro \
        -v /run/supervisor:/run/os:rw \
--- a/tests/smoke_test/test_basic.py
+++ b/tests/smoke_test/test_basic.py
@ -115,8 +115,7 @@ def test_custom_swap_size(shell, target):
    output = shell.run_check("stat -c '%s' /mnt/data/swapfile")
    # set new swap size to half of the previous size - round to 4k blocks
    new_swap_size = (int(output[0]) // 2 // 4096) * 4096
-    shell.console.sendline(f"echo 'SWAPSIZE={new_swap_size/1024/1024}M' > /etc/default/haos-swapfile; reboot")
-    shell.console.expect("Booting `Slot ", timeout=60)
+    shell.run_check(f"echo 'SWAPSIZE={new_swap_size/1024/1024}M' > /etc/default/haos-swapfile; reboot")
    # reactivate ShellDriver to handle login again
    target.deactivate(shell)
    target.activate(shell)
@ -126,8 +125,7 @@ def test_custom_swap_size(shell, target):

@pytest.mark.dependency(depends=["test_custom_swap_size"])
 def test_no_swap(shell, target):
-    shell.console.sendline("echo 'SWAPSIZE=0' > /etc/default/haos-swapfile; reboot")
-    shell.console.expect("Booting `Slot ", timeout=60)
+    output = shell.run_check("echo 'SWAPSIZE=0' > /etc/default/haos-swapfile; reboot")
    # reactivate ShellDriver to handle login again
    target.deactivate(shell)
    target.activate(shell)
--- a/tests/smoke_test/test_os_update.py
+++ b/tests/smoke_test/test_os_update.py
@ -1,106 +0,0 @@
-import json
-import logging
-from time import sleep
-
-import pytest
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@pytest.mark.dependency()
-@pytest.mark.timeout(120)
-def test_init(shell, shell_json):
-    def check_container_running(container_name):
-        out = shell.run_check(
-            f"docker container inspect -f '{{{{.State.Status}}}}' {container_name} || true"
-        )
-        return "running" in out
-
-    # wait for important containers first
-    while True:
-        if check_container_running("homeassistant") and check_container_running("hassio_supervisor"):
-            break
-
-        sleep(1)
-
-    # wait for the system ready and Supervisor at the latest version
-    while True:
-        supervisor_info = "\n".join(shell.run_check("ha supervisor info --no-progress --raw-json || true"))
-        # make sure not to fail when Supervisor is restarting
-        supervisor_info = json.loads(supervisor_info) if supervisor_info.startswith("{") else None
-        # make sure not to fail when Supervisor is in setup state
-        supervisor_data = supervisor_info.get("data") if supervisor_info else None
-        if supervisor_data and supervisor_data["version"] == supervisor_data["version_latest"]:
-            output = "\n".join(shell.run_check("ha os info || true"))
-            if "System is not ready" not in output:
-                break
-
-        sleep(5)
-
-
-@pytest.mark.dependency(depends=["test_init"])
-@pytest.mark.timeout(300)
-def test_os_update(shell, shell_json, target):
-    # fetch version info and OTA URL
-    shell.run_check("ha su reload --no-progress")
-
-    # update OS to latest stable - in tests it should never be the same version
-    stable_version = shell_json("curl -sSL https://version.home-assistant.io/stable.json")["hassos"]["ova"]
-
-    # Core (and maybe Supervisor) might be downloaded at this point, so we need to keep trying
-    while True:
-        output = "\n".join(shell.run_check(f"ha os update --no-progress --version {stable_version} || true", timeout=120))
-        if "Don't have an URL for OTA updates" in output:
-            shell.run_check("ha su reload --no-progress")
-        elif "Command completed successfully" in output:
-            break
-
-        sleep(5)
-
-    shell.console.expect("Booting `Slot ", timeout=60)
-
-    # reactivate ShellDriver to handle login again
-    target.deactivate(shell)
-    target.activate(shell)
-
-    # wait for the system to be ready after update
-    while True:
-        output = "\n".join(shell.run_check("ha os info || true"))
-        if "System is not ready" not in output:
-            break
-
-        sleep(1)
-
-    # check the updated version
-    os_info = shell_json("ha os info --no-progress --raw-json")
-    assert os_info["data"]["version"] == stable_version, "OS did not update successfully"
-
-
-@pytest.mark.dependency(depends=["test_os_update"])
-@pytest.mark.timeout(180)
-def test_boot_other_slot(shell, shell_json, target):
-    # switch to the other slot
-    os_info = shell_json("ha os info --no-progress --raw-json")
-    other_version = os_info["data"]["boot_slots"]["A"]["version"]
-
-    # as we sometimes don't get another shell prompt after the boot slot switch,
-    # use plain sendline instead of the run_check method
-    shell.console.sendline(f"ha os boot-slot other --no-progress || true")
-
-    shell.console.expect("Booting `Slot ", timeout=60)
-
-    # reactivate ShellDriver to handle login again
-    target.deactivate(shell)
-    target.activate(shell)
-
-    # wait for the system to be ready after switching slots
-    while True:
-        output = "\n".join(shell.run_check("ha os info || true"))
-        if "System is not ready" not in output:
-            break
-
-        sleep(1)
-
-    # check that the boot slot has changed
-    os_info = shell_json("ha os info --no-progress --raw-json")
-    assert os_info["data"]["version"] == other_version