Bump version 5.13

The script looks at the current installations strings, which use haos
and generic-x86-64 respectively. Replace them with the old strings to
make the compare match and allow downgrades.

.github/workflows/dev.yml

@@ -11,15 +11,23 @@ jobs:
     name: Generate version
     runs-on: [ "ubuntu-20.04" ]
     outputs:
-      version_dev: ${{ steps.version.outputs.version_dev }}
+      version_main: ${{ steps.version_main.outputs.version_main }}
+      version_dev: ${{ steps.version_dev.outputs.version_dev }}
     steps:
       - name: Generate Development build version
         shell: bash
-        id: version
+        id: version_dev
         run: |
           version_dev="dev$(date --utc +'%Y%m%d')"
           echo "Development version \"${version_dev}\""
           echo "::set-output name=version_dev::${version_dev}"
+      - uses: actions/checkout@v2
+      - name: Get Major/Minor version
+        id: version_main
+        run: |
+          major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
+          build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
+          echo "::set-output name=version_main::${major}.${build}"
 
   build:
     name: Release build for ${{ matrix.board.name }}
@@ -76,6 +84,6 @@ jobs:
           port: ${{ secrets.DEV_PORT }}
           key: ${{ secrets.DEV_SCP_KEY }}
           source: "release/*"
-          target: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.version.outputs.version_dev }}/
+          target: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}/
           strip_components: 1
 

.github/workflows/release.yml

@@ -92,6 +92,17 @@ jobs:
           asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
           asset_content_type: application/octet-stream
 
+      - name: Upload ova image
+        if: ${{ matrix.board.name == 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_content_type: application/x-tar
+
       - name: Upload qcow2 image
         if: ${{ matrix.board.name == 'ova' }}
         uses: actions/upload-release-asset@v1

Documentation/kernel.md

@@ -5,15 +5,15 @@ Default Kernel tree: 5.4
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.4.80 |
-| Raspberry Pi | 5.4.79 |
-| Raspberry Pi 0-W | 5.4.79 |
-| Raspberry Pi 2 | 5.4.79 |
-| Raspberry Pi 3 | 5.4.79 |
-| Raspberry Pi 4 | 5.4.79 |
-| Tinker Board | 5.4.80 |
-| Odroid-C2 | 5.9.11 |
-| Odroid-C4 | 5.9.11 |
-| Odroid-N2 | 5.9.11 |
-| Odroid-XU4 | 5.9.11 |
-| Intel NUC | 5.4.80 |
+| Open Virtual Appliance | 5.4.109 |
+| Raspberry Pi | 5.4.83 |
+| Raspberry Pi 0-W | 5.4.83 |
+| Raspberry Pi 2 | 5.4.83 |
+| Raspberry Pi 3 | 5.4.83 |
+| Raspberry Pi 4 | 5.4.83 |
+| Tinker Board | 5.4.109 |
+| Odroid-C2 | 5.9.16 |
+| Odroid-C4 | 5.9.16 |
+| Odroid-N2 | 5.9.16 |
+| Odroid-XU4 | 5.9.16 |
+| Intel NUC | 5.4.109 |

Documentation/partition.md

@@ -51,10 +51,13 @@ Log in as `root` to get to the Home Assistant CLI and then enter `login` to cont
 
 Confirm your USB SSD/HD is connected and recognized using `fdisk -l`.
 
-Make sure the drive has no partition named `hassos-data` (or no partition at all). With the drive, use the below command (again, replacing XXX with your drive)
+With the drive connected, use the following command (replacing sdx with your drive, without a partition number):
 
 ```sh
-$ datactl move /dev/xxx
+$ datactl move /dev/sdx
 ```
 
-Hit any key to continue, and then the move will happen after the next reboot. Once complete, the external drive will be owned and used by the system.
+Enter "yes" to confirm the operation. This will prepare the disk, however, the
+actual move will be running on next reboot. Once complete, the external drive
+will contain the data and will need to be plugged in to successfully boot Home
+Assistant OS.

buildroot-external/Config.in

@@ -5,3 +5,4 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-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"

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

@@ -49,8 +49,9 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      if ext4load mmc ${devnum}:4 ${kernel_addr_r} zImage"; then
+      if ext4load mmc ${devnum}:4 ${kernel_addr_r} zImage; then
           setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
+      fi
     fi
   fi
 done

buildroot-external/board/hardkernel/kernel-amlogic.config

@@ -1253,7 +1253,7 @@ CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_CRDA_SUPPORT=y
-# CONFIG_CFG80211_WEXT is not set
+CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y

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

@@ -1,5 +1,5 @@
-From 734f52f38625ce29c964517255538b3b0b546e8d Mon Sep 17 00:00:00 2001
-Message-Id: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
+From 9d2a2b44e67b0ef49e534c097e8b5e3e1173b033 Mon Sep 17 00:00:00 2001
+Message-Id: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 15 Sep 2020 17:24:30 +0200
 Subject: [PATCH 1/7] arm64: dts: meson: convert ODROID-N2 to dtsi
@@ -1282,5 +1282,5 @@ index 000000000000..6982632ae646
 +	phy-supply = <&hub_5v>;
 +};
 -- 
-2.28.0
+2.29.2
 

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

@@ -1,7 +1,7 @@
-From 75f1e8330dac46a0bef8a360be0ae4566d9a470c Mon Sep 17 00:00:00 2001
-Message-Id: <75f1e8330dac46a0bef8a360be0ae4566d9a470c.1603528796.git.stefan@agner.ch>
-In-Reply-To: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
-References: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
+From 258f03fa4fd897a61b5861df1f809e234711dd49 Mon Sep 17 00:00:00 2001
+Message-Id: <258f03fa4fd897a61b5861df1f809e234711dd49.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 15 Sep 2020 17:24:31 +0200
 Subject: [PATCH 2/7] dt-bindings: arm: amlogic: add support for the ODROID-N2+
@@ -32,5 +32,5 @@ index 5eba9f48823e..12ba8d074370 100644
                - ugoos,am6
            - const: amlogic,s922x
 -- 
-2.28.0
+2.29.2
 

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

@@ -1,7 +1,7 @@
-From c714cb26fcb59f5201f7aac68dfd9883319881b2 Mon Sep 17 00:00:00 2001
-Message-Id: <c714cb26fcb59f5201f7aac68dfd9883319881b2.1603528796.git.stefan@agner.ch>
-In-Reply-To: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
-References: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
+From 6cfaddae585e5a87c5253c932b8d58e153159f6b Mon Sep 17 00:00:00 2001
+Message-Id: <6cfaddae585e5a87c5253c932b8d58e153159f6b.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 15 Sep 2020 17:24:32 +0200
 Subject: [PATCH 3/7] arm64: dts: meson: add support for the ODROID-N2+
@@ -74,5 +74,5 @@ index 000000000000..5de2815ba99d
 +};
 +
 -- 
-2.28.0
+2.29.2
 

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-odroid-n2-plus-fix-vddcpu_a-pwm.patch

@@ -1,10 +1,10 @@
-From 0a3a45efeefaf65c170df265126a07da3236e178 Mon Sep 17 00:00:00 2001
-Message-Id: <0a3a45efeefaf65c170df265126a07da3236e178.1603528796.git.stefan@agner.ch>
-In-Reply-To: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
-References: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
+From 47f804dc970e2b1f71f1f032a0da2ef3b8315be0 Mon Sep 17 00:00:00 2001
+Message-Id: <47f804dc970e2b1f71f1f032a0da2ef3b8315be0.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Fri, 23 Oct 2020 11:41:39 +0200
-Subject: [PATCH 5/7] arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm
+Subject: [PATCH 4/7] arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm
 
 On the odroid N2 plus, cpufreq is not available due to an error on the cpu
 regulators. vddcpu a and b get the same PWM. The one provided to vddcpu A
@@ -38,5 +38,5 @@ index 5de2815ba99d..ce1198ad34e4 100644
  
  &vddcpu_b {
 -- 
-2.28.0
+2.29.2
 

buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-RTC-to-ODROID-N2-boards.patch

@@ -1,10 +1,10 @@
-From 75b8900d6750fa9d44546219a9b925c5df73a985 Mon Sep 17 00:00:00 2001
-Message-Id: <75b8900d6750fa9d44546219a9b925c5df73a985.1605564817.git.stefan@agner.ch>
-In-Reply-To: <734f52f38625ce29c964517255538b3b0b546e8d.1605564817.git.stefan@agner.ch>
-References: <734f52f38625ce29c964517255538b3b0b546e8d.1605564817.git.stefan@agner.ch>
+From 2c15ad491233a80d61c811a944b86067e2e74686 Mon Sep 17 00:00:00 2001
+Message-Id: <2c15ad491233a80d61c811a944b86067e2e74686.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 16 Nov 2020 23:11:02 +0100
-Subject: [PATCH 8/8] arm64: dts: meson: add RTC to ODROID-N2 boards
+Subject: [PATCH 5/7] arm64: dts: meson: add RTC to ODROID-N2 boards
 
 All ODROID-N2 boards come with a NXP PCF8563TS RTC connected to I2C bus
 3. This is the RTC which is connected to the on-board RTC backup battery.

buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-fix-PHY-deassert-timi.patch

@@ -0,0 +1,41 @@
+From 35d2de7b27bc3f4bc2d977fb6b7671d9ba889496 Mon Sep 17 00:00:00 2001
+Message-Id: <35d2de7b27bc3f4bc2d977fb6b7671d9ba889496.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 1 Dec 2020 00:32:23 +0100
+Subject: [PATCH 6/7] arm64: dts: meson: g12b: odroid-n2: fix PHY deassert
+ timing requirements
+
+According to the datasheet (Rev. 1.9) the RTL8211F requires at least
+72ms "for internal circuits settling time" before accessing the PHY
+egisters. This fixes an issue where the Ethernet link doesn't come up
+when using ip link set down/up:
+  [   29.360965] meson8b-dwmac ff3f0000.ethernet eth0: Link is Down
+  [   34.569012] meson8b-dwmac ff3f0000.ethernet eth0: PHY [0.0:00] driver [RTL8211F Gigabit Ethernet] (irq=31)
+  [   34.676732] meson8b-dwmac ff3f0000.ethernet: Failed to reset the dma
+  [   34.678874] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
+  [   34.687850] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_open: Hw setup failed
+
+Fixes: 658e4129bb81 ("arm64: dts: meson: g12b: odroid-n2: add the Ethernet PHY reset line")
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+index 40390feba053..445d90d25aa3 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -415,7 +415,7 @@ external_phy: ethernet-phy@0 {
+ 		max-speed = <1000>;
+ 
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+ 
+ 		interrupt-parent = <&gpio_intc>;
+-- 
+2.29.2
+

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

@@ -1,38 +0,0 @@
-From 03041630d824a775b71f6008067955a51d069845 Mon Sep 17 00:00:00 2001
-Message-Id: <03041630d824a775b71f6008067955a51d069845.1603528796.git.stefan@agner.ch>
-In-Reply-To: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
-References: <734f52f38625ce29c964517255538b3b0b546e8d.1603528796.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Thu, 27 Aug 2020 23:29:57 +0200
-Subject: [PATCH 6/7] clk: meson: g12a: mark fclk_div2 as critical
-
-On Amlogic Meson G12b platform, similar to fclk_div3, the fclk_div2
-seems to be necessary for the system to operate correctly as well.
-
-Typically, the clock also gets chosen by the eMMC peripheral. This
-probably masked the problem so far. However, when booting from a SD
-card the clock seems to get disabled which leads to a system freeze.
-
-Let's mark this clock as critical, fixing boot from SD card on G12b
-platforms.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/clk/meson/g12a.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
-index 9803d44bb157..9a6722a1dc19 100644
---- a/drivers/clk/meson/g12a.c
-+++ b/drivers/clk/meson/g12a.c
-@@ -298,6 +298,7 @@ static struct clk_regmap g12a_fclk_div2 = {
- 			&g12a_fclk_div2_div.hw
- 		},
- 		.num_parents = 1,
-+		.flags = CLK_IS_CRITICAL,
- 	},
- };
- 
--- 
-2.28.0
-

buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-fix-PHY-deassert-timing-requirements.patch

@@ -0,0 +1,152 @@
+From 40e8e7e28c44993e352195b359c4d4540bfb2105 Mon Sep 17 00:00:00 2001
+Message-Id: <40e8e7e28c44993e352195b359c4d4540bfb2105.1606829302.git.stefan@agner.ch>
+In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 1 Dec 2020 00:32:23 +0100
+Subject: [PATCH 7/7] arm64: dts: meson: fix PHY deassert timing requirements
+
+According to the datasheet (Rev. 1.9) the RTL8211F requires at least
+72ms "for internal circuits settling time" before accessing the PHY
+egisters. This fixes an issue seen on ODROID-C2 where the Ethernet
+link doesn't come up when using ip link set down/up:
+  [ 6630.714855] meson8b-dwmac c9410000.ethernet eth0: Link is Down
+  [ 6630.785775] meson8b-dwmac c9410000.ethernet eth0: PHY [stmmac-0:00] driver [RTL8211F Gigabit Ethernet] (irq=36)
+  [ 6630.893071] meson8b-dwmac c9410000.ethernet: Failed to reset the dma
+  [ 6630.893800] meson8b-dwmac c9410000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
+  [ 6630.902835] meson8b-dwmac c9410000.ethernet eth0: stmmac_open: Hw setup failed
+
+Fixes: f29cabf240ed ("arm64: dts: meson: use the generic Ethernet PHY reset GPIO bindings")
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts  | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts   | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi  | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi     | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts  | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts   | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts        | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts    | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+index 7be3e354093b..de27beafe9db 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+@@ -165,7 +165,7 @@ eth_phy0: ethernet-phy@0 {
+ 			reg = <0>;
+ 
+ 			reset-assert-us = <10000>;
+-			reset-deassert-us = <30000>;
++			reset-deassert-us = <80000>;
+ 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 			interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 70fcfb7b0683..50de1d01e565 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -200,7 +200,7 @@ eth_phy0: ethernet-phy@0 {
+ 			reg = <0>;
+ 
+ 			reset-assert-us = <10000>;
+-			reset-deassert-us = <30000>;
++			reset-deassert-us = <80000>;
+ 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 			interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+index 222ee8069cfa..9b0b81f191f1 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+@@ -126,7 +126,7 @@ eth_phy0: ethernet-phy@0 {
+ 			reg = <0>;
+ 
+ 			reset-assert-us = <10000>;
+-			reset-deassert-us = <30000>;
++			reset-deassert-us = <80000>;
+ 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 			interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+index ad812854a107..a350fee1264d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+@@ -147,7 +147,7 @@ eth_phy0: ethernet-phy@0 {
+ 			reg = <0>;
+ 
+ 			reset-assert-us = <10000>;
+-			reset-deassert-us = <30000>;
++			reset-deassert-us = <80000>;
+ 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 			interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+index b08c4537f260..b2ab05c22090 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+@@ -82,7 +82,7 @@ external_phy: ethernet-phy@0 {
+ 
+ 		/* External PHY reset is shared with internal PHY Led signal */
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 		interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+index bff8ec2c1c70..e38d9e50caa7 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+@@ -194,7 +194,7 @@ external_phy: ethernet-phy@0 {
+ 		reg = <0>;
+ 
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 		interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+index 83eca3af44ce..dfa7a37a1281 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+@@ -112,7 +112,7 @@ external_phy: ethernet-phy@0 {
+ 		max-speed = <1000>;
+ 
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 	};
+ };
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+index ea45ae0c71b7..8edbfe040805 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+@@ -64,7 +64,7 @@ external_phy: ethernet-phy@0 {
+ 
+ 		/* External PHY reset is shared with internal PHY Led signal */
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 
+ 		interrupt-parent = <&gpio_intc>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+index c89c9f846fb1..dde7cfe12cff 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+@@ -114,7 +114,7 @@ external_phy: ethernet-phy@0 {
+ 		max-speed = <1000>;
+ 
+ 		reset-assert-us = <10000>;
+-		reset-deassert-us = <30000>;
++		reset-deassert-us = <80000>;
+ 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+ 	};
+ };
+-- 
+2.29.2
+

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

@@ -1,8 +1,8 @@
 From f9877c2895d6c05710a828d0cd46d9f25626b070 Mon Sep 17 00:00:00 2001
-Message-Id: <f9877c2895d6c05710a828d0cd46d9f25626b070.1606490648.git.stefan@agner.ch>
+Message-Id: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 31 Aug 2020 13:40:18 +0200
-Subject: [PATCH 1/2] ARM: meson: isolate loading of socinfo
+Subject: [PATCH 1/4] ARM: meson: isolate loading of socinfo
 
 Move loading of socinfo into a separate function so the value can be
 reused later.
@@ -47,5 +47,5 @@ index 3abb27e03b..c585b12ca5 100644
  	       socinfo_to_soc_id(socinfo),
  	       socinfo_to_package_id(socinfo),
 -- 
-2.29.2
+2.30.0
 

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

@@ -1,10 +1,10 @@
 From 31e32295dc261032d7f5540a0b7f79a4f5a5b807 Mon Sep 17 00:00:00 2001
-Message-Id: <31e32295dc261032d7f5540a0b7f79a4f5a5b807.1606490648.git.stefan@agner.ch>
-In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1606490648.git.stefan@agner.ch>
-References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1606490648.git.stefan@agner.ch>
+Message-Id: <31e32295dc261032d7f5540a0b7f79a4f5a5b807.1609421746.git.stefan@agner.ch>
+In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
+References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 4 Aug 2020 13:50:57 +0000
-Subject: [PATCH 2/2] meson: Add board_rev to env
+Subject: [PATCH 2/4] meson: Add board_rev to env
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 Signed-off-by: Stefan Agner <stefan@agner.ch>
@@ -78,5 +78,5 @@ index caf7fd6810..c2a191ba6a 100644
  
  	if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
 -- 
-2.29.2
+2.30.0
 

buildroot-external/board/hardkernel/patches/uboot/0003-HACK-mmc-meson-gx-limit-to-24MHz.patch

@@ -1,7 +1,10 @@
-From 64017a2cc9e501329016d50b701c5e9a9488991d Mon Sep 17 00:00:00 2001
+From 01ba1339ffd095b146b9d9d772aea6f2b3594a06 Mon Sep 17 00:00:00 2001
+Message-Id: <01ba1339ffd095b146b9d9d772aea6f2b3594a06.1609421746.git.stefan@agner.ch>
+In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
+References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 2 Sep 2019 15:42:04 +0200
-Subject: [PATCH 3/3] HACK: mmc: meson-gx: limit to 24MHz
+Subject: [PATCH 3/4] HACK: mmc: meson-gx: limit to 24MHz
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
 ---
@@ -9,10 +12,10 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
-index b5f5122b..00bfa324 100644
+index 719dd1e5e5..dd3dd7c08c 100644
 --- a/drivers/mmc/meson_gx_mmc.c
 +++ b/drivers/mmc/meson_gx_mmc.c
-@@ -252,7 +252,7 @@ static int meson_mmc_probe(struct udevice *dev)
+@@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev)
  	cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
  			MMC_MODE_HS_52MHz | MMC_MODE_HS;
  	cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
@@ -20,6 +23,7 @@ index b5f5122b..00bfa324 100644
 +	cfg->f_max = SD_EMMC_CLKSRC_24M;
  	cfg->b_max = 511; /* max 512 - 1 blocks */
  	cfg->name = dev->name;
+ 
+-- 
+2.30.0
 
---
-2.22.0

buildroot-external/board/hardkernel/patches/uboot/0004-pinctrl-meson-fix-bit-manipulation-of-pin-bias-confi.patch

@@ -0,0 +1,43 @@
+From 26e152c0929702a9dfca4a8967601b59de77a57d Mon Sep 17 00:00:00 2001
+Message-Id: <26e152c0929702a9dfca4a8967601b59de77a57d.1609421746.git.stefan@agner.ch>
+In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
+References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 14 Dec 2020 19:39:07 +0100
+Subject: [PATCH 4/4] pinctrl: meson: fix bit manipulation of pin bias
+ configuration
+
+This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.
+
+Fixes: c4c726c26b ("pinctrl: meson: add pinconf support")
+Reported-by: Anton Arapov <arapov@gmail.com>
+Reported-by: Otto Meier <gf435@gmx.net>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+(cherry picked from commit 5ccd5d2cc98224108ae9fb09593a862c9caa5e80)
+---
+ drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
+index d4539b02d8..5065b62436 100644
+--- a/drivers/pinctrl/meson/pinctrl-meson.c
++++ b/drivers/pinctrl/meson/pinctrl-meson.c
+@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
+ 	}
+ 
+ 	/* othewise, enable the bias and select level */
+-	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
++	clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
+ 	ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, &reg, &bit);
+ 	if (ret)
+ 		return ret;
+ 
+ 	clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
+-			param == PIN_CONFIG_BIAS_PULL_UP);
++			(param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
+ 
+ 	return 0;
+ }
+-- 
+2.30.0
+

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

@@ -15,3 +15,10 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
+
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PCI=y
+CONFIG_X86_INTEL_LPSS=y

buildroot-external/board/intel/ova/home-assistant.ovf

@@ -5,7 +5,7 @@
   </References>
   <DiskSection>
     <Info>List of the virtual disks used in the package</Info>
-    <Disk ovf:capacity="6442450944" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
+    <Disk ovf:capacity="34359738368" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
   </DiskSection>
   <NetworkSection>
     <Info>Logical networks used in the package</Info>

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

@@ -20,6 +20,11 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_SCSI_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y
 
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_SAS=y
+CONFIG_FUSION_MAX_SGE=128
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_BLK_DEV_NVME=y

buildroot-external/board/intel/patches/dt-utils/0001-barebox-state-get-devicetree-from-file.patch

@@ -1,12 +1,18 @@
-From 405590bdb7ae434798010458e810c415e4e99db4 Mon Sep 17 00:00:00 2001
+From 4e9abe7945370765a9e8e88b01a7ef5f266bf7fd Mon Sep 17 00:00:00 2001
+Message-Id: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
 From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
 Date: Fri, 30 Jun 2017 16:53:34 +0200
-Subject: barebox-state: get devicetree from file
+Subject: [PATCH dt-utils 1/3] barebox-state: get devicetree from file
 
 Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
+---
+ src/barebox-state.c | 30 ++++++++++++++++++++++--------
+ src/barebox-state.h |  2 +-
+ src/keystore-blob.c |  2 +-
+ 3 files changed, 24 insertions(+), 10 deletions(-)
 
 diff --git a/src/barebox-state.c b/src/barebox-state.c
-index e68b8cb..3622e76 100644
+index f8b8df6..76f9c41 100644
 --- a/src/barebox-state.c
 +++ b/src/barebox-state.c
 @@ -308,7 +308,7 @@ static int state_set_var(struct state *state, const char *var, const char *val)
@@ -16,11 +22,11 @@ index e68b8cb..3622e76 100644
 -struct state *state_get(const char *name, bool readonly, bool auth)
 +struct state *state_get(const char *name, const char *filename, bool readonly, bool auth)
  {
- 	struct device_node *root, *node, *partition_node;
+ 	struct device_node *root, *node;
  	char *path;
-@@ -320,11 +320,19 @@ struct state *state_get(const char *name, bool readonly, bool auth)
- 	off_t offset;
- 	size_t size;
+@@ -317,11 +317,19 @@ struct state *state_get(const char *name, bool readonly, bool auth)
+ 	const char *backend_type = NULL;
+ 	struct state_variable *v;
  
 -	root = of_read_proc_devicetree();
 -	if (IS_ERR(root)) {
@@ -43,7 +49,7 @@ index e68b8cb..3622e76 100644
  	}
  
  	of_set_root_node(root);
-@@ -387,6 +395,7 @@ static struct option long_options[] = {
+@@ -372,6 +380,7 @@ static struct option long_options[] = {
  	{"get",		required_argument,	0,	'g' },
  	{"set",		required_argument,	0,	's' },
  	{"name",	required_argument,	0,	'n' },
@@ -51,7 +57,7 @@ index e68b8cb..3622e76 100644
  	{"dump",	no_argument,		0,	'd' },
  	{"dump-shell",	no_argument,		0,	OPT_DUMP_SHELL },
  	{"verbose",	no_argument,		0,	'v' },
-@@ -402,6 +411,7 @@ static void usage(char *name)
+@@ -387,6 +396,7 @@ static void usage(char *name)
  "-g, --get <variable>                      get the value of a variable\n"
  "-s, --set <variable>=<value>              set the value of a variable\n"
  "-n, --name <name>                         specify the state to use (default=\"state\"). Multiple states are allowed.\n"
@@ -59,7 +65,7 @@ index e68b8cb..3622e76 100644
  "-d, --dump                                dump the state\n"
  "--dump-shell                              dump the state suitable for shell sourcing\n"
  "-v, --verbose                             increase verbosity\n"
-@@ -439,12 +449,13 @@ int main(int argc, char *argv[])
+@@ -424,12 +434,13 @@ int main(int argc, char *argv[])
  	bool readonly = true;
  	int pr_level = 5;
  	int auth = 1;
@@ -74,7 +80,7 @@ index e68b8cb..3622e76 100644
  		if (c < 0)
  			break;
  		switch (c) {
-@@ -490,6 +501,9 @@ int main(int argc, char *argv[])
+@@ -475,6 +486,9 @@ int main(int argc, char *argv[])
  			++nr_states;
  			break;
  		}
@@ -84,7 +90,7 @@ index e68b8cb..3622e76 100644
  		case ':':
  		case '?':
  		default:
-@@ -530,7 +544,7 @@ int main(int argc, char *argv[])
+@@ -515,7 +529,7 @@ int main(int argc, char *argv[])
  	}
  
  	list_for_each_entry(state, &state_list.list, list) {
@@ -120,4 +126,5 @@ index 028dd8b..4572431 100644
  			return  PTR_ERR(tmp);
  		state = tmp;
 -- 
-cgit v0.10.2
+2.29.2
+

buildroot-external/board/intel/patches/dt-utils/0002-libdt-support-finding-devices-by-partuuid.patch

@@ -1,15 +1,21 @@
-From 26148417fab419a0c7f301fb8f2be015324d5374 Mon Sep 17 00:00:00 2001
+From 4eb260d97419349320aa688866b4cf1eb177df70 Mon Sep 17 00:00:00 2001
+Message-Id: <4eb260d97419349320aa688866b4cf1eb177df70.1606682453.git.stefan@agner.ch>
+In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
+References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
 From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
 Date: Fri, 30 Jun 2017 16:53:17 +0200
-Subject: libdt: support finding devices by partuuid
+Subject: [PATCH dt-utils 2/3] libdt: support finding devices by partuuid
 
 Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
+---
+ src/libdt.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/src/libdt.c b/src/libdt.c
-index 3adeed2..2bc6cc1 100644
+index 4638678..b52f80c 100644
 --- a/src/libdt.c
 +++ b/src/libdt.c
-@@ -2393,6 +2393,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
+@@ -2416,6 +2416,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
  	 */
  	node = partition_node->parent;
  
@@ -29,5 +35,5 @@ index 3adeed2..2bc6cc1 100644
  	 * Respect flash "partitions" subnode. Use parent of parent in this
  	 * case.
 -- 
-cgit v0.10.2
+2.29.2
 

buildroot-external/board/intel/patches/dt-utils/0003-state-use-run-to-store-lockfile.patch

@@ -0,0 +1,52 @@
+From 665603ecadb8385dd6c18840d3b0120859a00369 Mon Sep 17 00:00:00 2001
+Message-Id: <665603ecadb8385dd6c18840d3b0120859a00369.1606682453.git.stefan@agner.ch>
+In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
+References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Fri, 13 Nov 2020 10:39:03 +0100
+Subject: [PATCH dt-utils 3/3] state: use /run to store lockfile
+
+The current location /var/lock is considered legacy (at least by
+systemd). Just use /run to store the lockfile and append the usual .lock
+suffix.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ src/barebox-state.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/barebox-state.c b/src/barebox-state.c
+index 76f9c41..53e5eb6 100644
+--- a/src/barebox-state.c
++++ b/src/barebox-state.c
+@@ -38,6 +38,8 @@
+ #include <dt/dt.h>
+ #include <state.h>
+ 
++#define BAREBOX_STATE_LOCKFILE "/run/barebox-state.lock"
++
+ struct state_variable;
+ 
+ static int __state_uint8_set(struct state_variable *var, const char *val);
+@@ -515,15 +517,15 @@ int main(int argc, char *argv[])
+ 		++nr_states;
+ 	}
+ 
+-	lock_fd = open("/var/lock/barebox-state", O_CREAT | O_RDWR, 0600);
++	lock_fd = open(BAREBOX_STATE_LOCKFILE, O_CREAT | O_RDWR, 0600);
+ 	if (lock_fd < 0) {
+-		pr_err("Failed to open lock-file /var/lock/barebox-state\n");
++		pr_err("Failed to open lock-file " BAREBOX_STATE_LOCKFILE "\n");
+ 		exit(1);
+ 	}
+ 
+ 	ret = flock(lock_fd, LOCK_EX);
+ 	if (ret < 0) {
+-		pr_err("Failed to lock /var/lock/barebox-state: %m\n");
++		pr_err("Failed to lock " BAREBOX_STATE_LOCKFILE ": %m\n");
+ 		close(lock_fd);
+ 		exit(1);
+ 	}
+-- 
+2.29.2
+

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

@@ -14,9 +14,7 @@ function hassos_pre_image() {
     # Firmware
     if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
         cp "${BINARIES_DIR}/rpi-firmware/fixup.dat" "${BOOT_DATA}/fixup4.dat" 
-        cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf" 
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
-        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
+        cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf"
     else
         cp -t "${BOOT_DATA}" \
             "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
@@ -24,6 +22,12 @@ function hassos_pre_image() {
             "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
     fi
 
+    # EEPROM update for Raspberry Pi 4/Compute Module 4
+    if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then
+        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
+        cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
+    fi
+
     # Set cmd options
     echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
 

buildroot-external/board/raspberrypi/kernel.config

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

buildroot-external/board/raspberrypi/patches/linux/0001-dt-bindings-arm-bcm-Convert-BCM2835-firmware-binding.patch

@@ -1,8 +1,8 @@
-From 3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73 Mon Sep 17 00:00:00 2001
-Message-Id: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 625000fe2a9c1f78099895bf14c2f9753e359fba Mon Sep 17 00:00:00 2001
+Message-Id: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Florian Fainelli <f.fainelli@gmail.com>
 Date: Mon, 15 Jun 2020 10:40:41 +0200
-Subject: [PATCH 1/8] dt-bindings: arm: bcm: Convert BCM2835 firmware binding
+Subject: [PATCH 1/7] dt-bindings: arm: bcm: Convert BCM2835 firmware binding
  to YAML
 
 Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
@@ -83,5 +83,5 @@ index 000000000000..cec540c052b6
 +    };
 +...
 -- 
-2.29.2
+2.30.0
 

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

@@ -1,10 +1,10 @@
-From 3ad7fb9329eabd1d7f692f612742ca5ac38854a5 Mon Sep 17 00:00:00 2001
-Message-Id: <3ad7fb9329eabd1d7f692f612742ca5ac38854a5.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 47ebc13878c0bff61aeac05bc376a795b26553cd Mon Sep 17 00:00:00 2001
+Message-Id: <47ebc13878c0bff61aeac05bc376a795b26553cd.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Mon, 15 Jun 2020 10:40:42 +0200
-Subject: [PATCH 2/8] dt-bindings: clock: Add a binding for the RPi Firmware
+Subject: [PATCH 2/7] dt-bindings: clock: Add a binding for the RPi Firmware
  clocks
 
 The firmware running on the RPi VideoCore can be used to discover and
@@ -67,5 +67,5 @@ index cec540c052b6..b48ed875eb8e 100644
      };
  ...
 -- 
-2.29.2
+2.30.0
 

buildroot-external/board/raspberrypi/patches/linux/0003-dt-bindings-arm-bcm-Add-a-select-to-the-RPI-Firmware.patch

@@ -1,10 +1,10 @@
-From 305aeb868929695699e04e26dd590e64ad3c42dd Mon Sep 17 00:00:00 2001
-Message-Id: <305aeb868929695699e04e26dd590e64ad3c42dd.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 0f26a0a4b0a7db1b50ee0f31dde3a23da22945ed Mon Sep 17 00:00:00 2001
+Message-Id: <0f26a0a4b0a7db1b50ee0f31dde3a23da22945ed.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Fri, 26 Jun 2020 13:54:33 +0200
-Subject: [PATCH 3/8] dt-bindings: arm: bcm: Add a select to the RPI Firmware
+Subject: [PATCH 3/7] dt-bindings: arm: bcm: Add a select to the RPI Firmware
  binding
 
 The RaspberryPi firmware binding uses two compatible, include simple-bus.
@@ -46,5 +46,5 @@ index b48ed875eb8e..17e4f20c8d39 100644
    compatible:
      items:
 -- 
-2.29.2
+2.30.0
 

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

@@ -1,10 +1,10 @@
-From 33743cfcff296b1011e46168ecab185a00e0f00d Mon Sep 17 00:00:00 2001
-Message-Id: <33743cfcff296b1011e46168ecab185a00e0f00d.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From eb9b3dff529cba1409ca17191954a7f26c2720ee Mon Sep 17 00:00:00 2001
+Message-Id: <eb9b3dff529cba1409ca17191954a7f26c2720ee.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Mon, 29 Jun 2020 18:18:37 +0200
-Subject: [PATCH 4/8] dt-bindings: reset: Add a binding for the RPi Firmware
+Subject: [PATCH 4/7] dt-bindings: reset: Add a binding for the RPi Firmware
  reset controller
 
 The firmware running on the RPi VideoCore can be used to reset and
@@ -79,5 +79,5 @@ index 000000000000..1a4f4c792723
 +
 +#endif
 -- 
-2.29.2
+2.30.0
 

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

@@ -1,10 +1,10 @@
-From fecb02cc3664de0d1c43ce566ff95c1b68fca51e Mon Sep 17 00:00:00 2001
-Message-Id: <fecb02cc3664de0d1c43ce566ff95c1b68fca51e.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 78ad38829939c60437fd8a11cabc92679cc3e6df Mon Sep 17 00:00:00 2001
+Message-Id: <78ad38829939c60437fd8a11cabc92679cc3e6df.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Mon, 29 Jun 2020 18:18:39 +0200
-Subject: [PATCH 5/8] ARM: dts: bcm2711: Add firmware usb reset node
+Subject: [PATCH 5/7] ARM: dts: bcm2711: Add firmware usb reset node
 
 Now that the reset driver exposing Raspberry Pi 4's firmware based USB
 reset routine is available, let's add the device tree node exposing it.
@@ -16,10 +16,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit b03300db06bed1997a1eecc4c26f3a2895c57726)
 ---
  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 +++++
- 1 file changed, 5 insertions(+)
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 5 +++++
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 5 +++++
+ 3 files changed, 15 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 21b20e334b1a..d77d61d41bbc 100644
+index b5daeee077ec..37f14d7fd4f0 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -72,6 +72,11 @@
@@ -34,6 +36,38 @@ index 21b20e334b1a..d77d61d41bbc 100644
  };
  
  &gpio {
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+index 9454ce193ec5..a4f4e619d83c 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+@@ -72,6 +72,11 @@
+ 				  "SD_OC_N";
+ 		status = "okay";
+ 	};
++
++	reset: reset {
++		compatible = "raspberrypi,firmware-reset";
++		#reset-cells = <1>;
++	};
+ };
+ 
+ &gpio {
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+index fc3f062fd820..aa346b063b2a 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -84,6 +84,11 @@
+ 			output-low;
+ 		};
+ 	};
++
++	reset: reset {
++		compatible = "raspberrypi,firmware-reset";
++		#reset-cells = <1>;
++	};
+ };
+ 
+ &pwm1 {
 -- 
-2.29.2
+2.30.0
 

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

@@ -1,10 +1,10 @@
-From e0231cd65d8c13be1cebae1e6b5fbef61be6be0d Mon Sep 17 00:00:00 2001
-Message-Id: <e0231cd65d8c13be1cebae1e6b5fbef61be6be0d.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 874e651872c2b9e2a2a7f5e139197b9c8c96240b Mon Sep 17 00:00:00 2001
+Message-Id: <874e651872c2b9e2a2a7f5e139197b9c8c96240b.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Mon, 29 Jun 2020 18:18:40 +0200
-Subject: [PATCH 6/8] ARM: dts: bcm2711: Add reset controller to xHCI node
+Subject: [PATCH 6/7] ARM: dts: bcm2711: Add reset controller to xHCI node
 
 The chip is hardwired to the board's PCIe bus and needs to be properly
 setup trough a firmware routine after a PCI fundamental reset. Pass the
@@ -18,10 +18,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 258f92d2f840b6ea62c0b33f04eb4d9270935bba)
 ---
  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 17 +++++++++++++++++
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 12 ++++++++++++
+ 3 files changed, 46 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index d77d61d41bbc..513cae21e64c 100644
+index 37f14d7fd4f0..1139d60a643d 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -3,6 +3,8 @@
@@ -51,10 +53,75 @@ index d77d61d41bbc..513cae21e64c 100644
 +		};
 +	};
 +};
++
+ /* uart0 communicates with the BT module */
+ &uart0 {
+ 	pinctrl-names = "default";
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+index a4f4e619d83c..264f0226f1b0 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+@@ -3,6 +3,8 @@
+ #include "bcm2711.dtsi"
+ #include "bcm2835-rpi.dtsi"
+ 
++#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
++
+ / {
+ 	compatible = "raspberrypi,400", "brcm,bcm2711";
+ 	model = "Raspberry Pi 400";
+@@ -195,6 +197,21 @@
+ 	};
+ };
+ 
++&pcie0 {
++	pci@1,0 {
++		#address-cells = <3>;
++		#size-cells = <2>;
++		ranges;
++
++		reg = <0 0 0 0 0>;
++
++		usb@1,0 {
++			reg = <0x10000 0 0 0 0>;
++			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
++		};
++	};
++};
++
+ /* uart0 communicates with the BT module */
+ &uart0 {
+ 	pinctrl-names = "default";
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+index aa346b063b2a..4c0f6b320656 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -3,6 +3,8 @@
+ #include "bcm2711.dtsi"
+ #include "bcm2835-rpi.dtsi"
+ 
++#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
++
+ / {
+ 	compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
+ 	model = "Raspberry Pi Compute Module 4";
+@@ -134,6 +136,16 @@
+ 	};
+ };
+ 
++&pcie0 {
++	pci@1,0 {
++		#address-cells = <3>;
++		#size-cells = <2>;
++		ranges;
++
++		reg = <0 0 0 0 0>;
++	};
++};
 +
  /* uart0 communicates with the BT module */
  &uart0 {
  	pinctrl-names = "default";
 -- 
-2.29.2
+2.30.0
 

buildroot-external/board/raspberrypi/patches/linux/0007-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch

@@ -1,10 +1,10 @@
-From c18ca341da823bd2ec5aa04ea5970d3867eaae73 Mon Sep 17 00:00:00 2001
-Message-Id: <c18ca341da823bd2ec5aa04ea5970d3867eaae73.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From d862338cd866a6fe9541636b7948e4998d1dd01f Mon Sep 17 00:00:00 2001
+Message-Id: <d862338cd866a6fe9541636b7948e4998d1dd01f.1611839042.git.stefan@agner.ch>
+In-Reply-To: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
+References: <625000fe2a9c1f78099895bf14c2f9753e359fba.1611839042.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 2 Jun 2020 21:20:08 +0000
-Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot
+Subject: [PATCH 7/7] ARM: dts: bcm283x: add compatible picked up by U-Boot
 
 Without brcm,bcm2835-pl011 in compatible U-Boot uses the regular PL011
 driver which seems to crash when enable_uart=1 is not used. Using
@@ -72,5 +72,5 @@ index 4426f9e6ba92..abcf677fe416 100644
  			interrupts = <2 25>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
 -- 
-2.29.2
+2.30.0
 

buildroot-external/board/raspberrypi/patches/linux/0007-arch-pgtable-define-MAX_POSSIBLE_PHYSMEM_BITS-where-.patch

@@ -1,233 +0,0 @@
-From 5038cc5a33a1534bd0e521674314938224838ce4 Mon Sep 17 00:00:00 2001
-Message-Id: <5038cc5a33a1534bd0e521674314938224838ce4.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Fri, 13 Nov 2020 15:59:32 +0100
-Subject: [PATCH 7/8] arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where
- needed
-
-Stefan Agner reported a bug when using zsram on 32-bit Arm machines
-with RAM above the 4GB address boundary:
-
-  Unable to handle kernel NULL pointer dereference at virtual address 00000000
-  pgd = a27bd01c
-  [00000000] *pgd=236a0003, *pmd=1ffa64003
-  Internal error: Oops: 207 [#1] SMP ARM
-  Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet
-  CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1
-  Hardware name: BCM2711
-  PC is at zs_map_object+0x94/0x338
-  LR is at zram_bvec_rw.constprop.0+0x330/0xa64
-  pc : [<c0602b38>]    lr : [<c0bda6a0>]    psr: 60000013
-  sp : e376bbe0  ip : 00000000  fp : c1e2921c
-  r10: 00000002  r9 : c1dda730  r8 : 00000000
-  r7 : e8ff7a00  r6 : 00000000  r5 : 02f9ffa0  r4 : e3710000
-  r3 : 000fdffe  r2 : c1e0ce80  r1 : ebf979a0  r0 : 00000000
-  Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
-  Control: 30c5383d  Table: 235c2a80  DAC: fffffffd
-  Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6)
-  Stack: (0xe376bbe0 to 0xe376c000)
-
-As it turns out, zsram needs to know the maximum memory size, which
-is defined in MAX_PHYSMEM_BITS when CONFIG_SPARSEMEM is set, or in
-MAX_POSSIBLE_PHYSMEM_BITS on the x86 architecture.
-
-The same problem will be hit on all 32-bit architectures that have a
-physical address space larger than 4GB and happen to not enable sparsemem
-and include asm/sparsemem.h from asm/pgtable.h.
-
-After the initial discussion, I suggested just always defining
-MAX_POSSIBLE_PHYSMEM_BITS whenever CONFIG_PHYS_ADDR_T_64BIT is
-set, or provoking a build error otherwise. This addresses all
-configurations that can currently have this runtime bug, but
-leaves all other configurations unchanged.
-
-I looked up the possible number of bits in source code and
-datasheets, here is what I found:
-
- - on ARC, CONFIG_ARC_HAS_PAE40 controls whether 32 or 40 bits are used
- - on ARM, CONFIG_LPAE enables 40 bit addressing, without it we never
-   support more than 32 bits, even though supersections in theory allow
-   up to 40 bits as well.
- - on MIPS, some MIPS32r1 or later chips support 36 bits, and MIPS32r5
-   XPA supports up to 60 bits in theory, but 40 bits are more than
-   anyone will ever ship
- - On PowerPC, there are three different implementations of 36 bit
-   addressing, but 32-bit is used without CONFIG_PTE_64BIT
- - On RISC-V, the normal page table format can support 34 bit
-   addressing. There is no highmem support on RISC-V, so anything
-   above 2GB is unused, but it might be useful to eventually support
-   CONFIG_ZRAM for high pages.
-
-Fixes: 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library")
-Fixes: 02390b87a945 ("mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS")
-Cc: Stefan Agner <stefan@agner.ch>
-Cc: Mike Rapoport <rppt@kernel.org>
-Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-Cc: Nitin Gupta <ngupta@vflare.org>
-Cc: Minchan Kim <minchan@kernel.org>
-Cc: Vineet Gupta <vgupta@synopsys.com>
-Cc: linux-snps-arc@lists.infradead.org
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: linux-arm-kernel@lists.infradead.org
-Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Cc: linux-mips@vger.kernel.org
-Cc: Michael Ellerman <mpe@ellerman.id.au>
-Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Cc: Paul Mackerras <paulus@samba.org>
-Cc: linuxppc-dev@lists.ozlabs.org
-Cc: Paul Walmsley <paul.walmsley@sifive.com>
-Cc: Palmer Dabbelt <palmer@dabbelt.com>
-Cc: Albert Ou <aou@eecs.berkeley.edu>
-Cc: linux-riscv@lists.infradead.org
-Link: https://lore.kernel.org/linux-mm/bdfa44bf1c570b05d6c70898e2bbb0acf234ecdf.1604762181.git.stefan@agner.ch/
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
----
- arch/arc/include/asm/pgtable.h               |  2 ++
- arch/arm/include/asm/pgtable-2level.h        |  2 ++
- arch/arm/include/asm/pgtable-3level.h        |  2 ++
- arch/mips/include/asm/pgtable-32.h           |  3 +++
- arch/powerpc/include/asm/book3s/32/pgtable.h |  2 ++
- arch/powerpc/include/asm/nohash/32/pgtable.h |  2 ++
- arch/riscv/include/asm/pgtable-32.h          |  2 ++
- include/asm-generic/pgtable.h                | 13 +++++++++++++
- 8 files changed, 28 insertions(+)
-
-diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
-index 7addd0301c51..6bdcf9b495b8 100644
---- a/arch/arc/include/asm/pgtable.h
-+++ b/arch/arc/include/asm/pgtable.h
-@@ -135,8 +135,10 @@
- 
- #ifdef CONFIG_ARC_HAS_PAE40
- #define PTE_BITS_NON_RWX_IN_PD1	(0xff00000000 | PAGE_MASK | _PAGE_CACHEABLE)
-+#define MAX_POSSIBLE_PHYSMEM_BITS 40
- #else
- #define PTE_BITS_NON_RWX_IN_PD1	(PAGE_MASK | _PAGE_CACHEABLE)
-+#define MAX_POSSIBLE_PHYSMEM_BITS 32
- #endif
- 
- /**************************************************************************
-diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
-index 51beec41d48c..50b51ac91fcb 100644
---- a/arch/arm/include/asm/pgtable-2level.h
-+++ b/arch/arm/include/asm/pgtable-2level.h
-@@ -75,6 +75,8 @@
- #define PTE_HWTABLE_OFF		(PTE_HWTABLE_PTRS * sizeof(pte_t))
- #define PTE_HWTABLE_SIZE	(PTRS_PER_PTE * sizeof(u32))
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS	32
-+
- /*
-  * PMD_SHIFT determines the size of the area a second-level page table can map
-  * PGDIR_SHIFT determines what a third-level page table entry can map
-diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
-index 5b18295021a0..8006a56cc2ce 100644
---- a/arch/arm/include/asm/pgtable-3level.h
-+++ b/arch/arm/include/asm/pgtable-3level.h
-@@ -25,6 +25,8 @@
- #define PTE_HWTABLE_OFF		(0)
- #define PTE_HWTABLE_SIZE	(PTRS_PER_PTE * sizeof(u64))
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS 40
-+
- /*
-  * PGDIR_SHIFT determines the size a top-level page table entry can map.
-  */
-diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
-index ba967148b016..2604fab8a92d 100644
---- a/arch/mips/include/asm/pgtable-32.h
-+++ b/arch/mips/include/asm/pgtable-32.h
-@@ -155,6 +155,7 @@ static inline void pmd_clear(pmd_t *pmdp)
- 
- #if defined(CONFIG_XPA)
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS 40
- #define pte_pfn(x)		(((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT))
- static inline pte_t
- pfn_pte(unsigned long pfn, pgprot_t prot)
-@@ -170,6 +171,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
- 
- #elif defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS 36
- #define pte_pfn(x)		((unsigned long)((x).pte_high >> 6))
- 
- static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)
-@@ -184,6 +186,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)
- 
- #else
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS 32
- #ifdef CONFIG_CPU_VR41XX
- #define pte_pfn(x)		((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))
- #define pfn_pte(pfn, prot)	__pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))
-diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
-index 0796533d37dd..7b6349be621a 100644
---- a/arch/powerpc/include/asm/book3s/32/pgtable.h
-+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
-@@ -37,8 +37,10 @@ static inline bool pte_user(pte_t pte)
-  */
- #ifdef CONFIG_PTE_64BIT
- #define PTE_RPN_MASK	(~((1ULL << PTE_RPN_SHIFT) - 1))
-+#define MAX_POSSIBLE_PHYSMEM_BITS 36
- #else
- #define PTE_RPN_MASK	(~((1UL << PTE_RPN_SHIFT) - 1))
-+#define MAX_POSSIBLE_PHYSMEM_BITS 32
- #endif
- 
- /*
-diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
-index 552b96eef0c8..3d32d7103ec8 100644
---- a/arch/powerpc/include/asm/nohash/32/pgtable.h
-+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
-@@ -148,8 +148,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
-  */
- #if defined(CONFIG_PPC32) && defined(CONFIG_PTE_64BIT)
- #define PTE_RPN_MASK	(~((1ULL << PTE_RPN_SHIFT) - 1))
-+#define MAX_POSSIBLE_PHYSMEM_BITS 36
- #else
- #define PTE_RPN_MASK	(~((1UL << PTE_RPN_SHIFT) - 1))
-+#define MAX_POSSIBLE_PHYSMEM_BITS 32
- #endif
- 
- /*
-diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h
-index b0ab66e5fdb1..5b2e79e5bfa5 100644
---- a/arch/riscv/include/asm/pgtable-32.h
-+++ b/arch/riscv/include/asm/pgtable-32.h
-@@ -14,4 +14,6 @@
- #define PGDIR_SIZE      (_AC(1, UL) << PGDIR_SHIFT)
- #define PGDIR_MASK      (~(PGDIR_SIZE - 1))
- 
-+#define MAX_POSSIBLE_PHYSMEM_BITS 34
-+
- #endif /* _ASM_RISCV_PGTABLE_32_H */
-diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 6fd08cf04add..7a8c43dee873 100644
---- a/include/asm-generic/pgtable.h
-+++ b/include/asm-generic/pgtable.h
-@@ -1163,6 +1163,19 @@ static inline bool arch_has_pfn_modify_check(void)
- #define io_remap_pfn_range remap_pfn_range
- #endif
- 
-+#if !defined(MAX_POSSIBLE_PHYSMEM_BITS) && !defined(CONFIG_64BIT)
-+#ifdef CONFIG_PHYS_ADDR_T_64BIT
-+/*
-+ * ZSMALLOC needs to know the highest PFN on 32-bit architectures
-+ * with physical address space extension, but falls back to
-+ * BITS_PER_LONG otherwise.
-+ */
-+#error Missing MAX_POSSIBLE_PHYSMEM_BITS definition
-+#else
-+#define MAX_POSSIBLE_PHYSMEM_BITS 32
-+#endif
-+#endif
-+
- #ifndef has_transparent_hugepage
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
- #define has_transparent_hugepage() 1
--- 
-2.29.2
-

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

@@ -1,8 +1,8 @@
 From a04331a6ba7334282836bbaa76e979c4e6be3900 Mon Sep 17 00:00:00 2001
-Message-Id: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+Message-Id: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH 01/15] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
+Subject: [PATCH 01/16] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---

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

@@ -1,10 +1,10 @@
 From cc40a554b003df9b07f8a55f69a94d7393d81cbc Mon Sep 17 00:00:00 2001
-Message-Id: <cc40a554b003df9b07f8a55f69a94d7393d81cbc.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+Message-Id: <cc40a554b003df9b07f8a55f69a94d7393d81cbc.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Florin Sarbu <florin@balena.io>
 Date: Thu, 12 Sep 2019 12:31:31 +0200
-Subject: [PATCH 02/15] raspberrypi: Disable simple framebuffer support
+Subject: [PATCH 02/16] raspberrypi: Disable simple framebuffer support
 
 On 4.19 kernels this u-boot driver clashes with bcm2708_fb.
 So let's disable it from here so that we have bcm2708_fb

buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-force-a-smaller-amount-of-memory.patch

@@ -1,10 +1,10 @@
 From b0895f2384712f3d0d89405c06519da195e9ccc9 Mon Sep 17 00:00:00 2001
-Message-Id: <b0895f2384712f3d0d89405c06519da195e9ccc9.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+Message-Id: <b0895f2384712f3d0d89405c06519da195e9ccc9.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 26 Nov 2020 17:56:01 +0100
-Subject: [PATCH 03/15] rpi: force a smaller amount of memory
+Subject: [PATCH 03/16] rpi: force a smaller amount of memory
 
 This fixes booting from USB on 32-bit installations. It seems not to
 affect the detected memory or SD card boot negatively.

buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-convert-to-TRB_TYPE.patch

@@ -1,10 +1,10 @@
 From 000f636c9ea4909a23119ba65d3a3847687c8c6b Mon Sep 17 00:00:00 2001
-Message-Id: <000f636c9ea4909a23119ba65d3a3847687c8c6b.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+Message-Id: <000f636c9ea4909a23119ba65d3a3847687c8c6b.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Chunfeng Yun <chunfeng.yun@mediatek.com>
 Date: Tue, 8 Sep 2020 18:59:59 +0200
-Subject: [PATCH 04/15] usb: xhci: convert to TRB_TYPE()
+Subject: [PATCH 04/16] usb: xhci: convert to TRB_TYPE()
 
 Use TRB_TYPE(p) instead of ((p) << TRB_TYPE_SHIFT)
 

buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-use-macros-with-parameter-to-fill-ep_info2.patch

@@ -1,10 +1,10 @@
 From bab3fd38c8eec5f3d12e41e706c02c79b4c4a21e Mon Sep 17 00:00:00 2001
-Message-Id: <bab3fd38c8eec5f3d12e41e706c02c79b4c4a21e.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+Message-Id: <bab3fd38c8eec5f3d12e41e706c02c79b4c4a21e.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Chunfeng Yun <chunfeng.yun@mediatek.com>
 Date: Tue, 8 Sep 2020 19:00:02 +0200
-Subject: [PATCH 05/15] usb: xhci: use macros with parameter to fill ep_info2
+Subject: [PATCH 05/16] usb: xhci: use macros with parameter to fill ep_info2
 
 Use macros with parameter to fill ep_info2, then some macros
 for MASK and SHIFT can be removed

buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-xhci_bulk_tx-Don-t-BUG-when-comparing-addre.patch

@@ -0,0 +1,40 @@
+From 0c4bf0c18097807364ee302effc0d0c7a32e4364 Mon Sep 17 00:00:00 2001
+Message-Id: <0c4bf0c18097807364ee302effc0d0c7a32e4364.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+From: Stefan Roese <sr@denx.de>
+Date: Mon, 24 Aug 2020 13:04:37 +0200
+Subject: [PATCH 06/16] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing
+ addresses
+
+Octeon uses mapped addresses for virtual and physical memory. It's not
+that easy to calculate the resulting addresses here. So let's remove
+this BUG_ON() completely, as it's not really helpful.
+
+Please also note, that BUG_ON() is not recommended any more in the Linux
+kernel.
+
+Signed-off-by: Stefan Roese <sr@denx.de>
+Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
+Cc: Bin Meng <bmeng.cn@gmail.com>
+Cc: Marek Vasut <marex@denx.de>
+---
+ drivers/usb/host/xhci-ring.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
+index a893277c75..d912cba2f4 100644
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -726,8 +726,6 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
+ 
+ 	BUG_ON(TRB_TO_SLOT_ID(field) != slot_id);
+ 	BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
+-	BUG_ON(*(void **)(uintptr_t)le64_to_cpu(event->trans_event.buffer) -
+-		buffer > (size_t)length);
+ 
+ 	record_transfer_result(udev, event, length);
+ 	xhci_acknowledge_event(ctrl);
+-- 
+2.29.2
+

buildroot-external/board/raspberrypi/patches/uboot/0007-usb-xhci-avoid-type-conversion-of-void.patch

@@ -1,10 +1,10 @@
-From 8591faf0da31be68ea45fdc8a0485c0163a3eb52 Mon Sep 17 00:00:00 2001
-Message-Id: <8591faf0da31be68ea45fdc8a0485c0163a3eb52.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From 99d6472fd9105c821582f069dfd151466bb5d263 Mon Sep 17 00:00:00 2001
+Message-Id: <99d6472fd9105c821582f069dfd151466bb5d263.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Heinrich Schuchardt <xypron.glpk@gmx.de>
 Date: Tue, 29 Sep 2020 22:03:01 +0200
-Subject: [PATCH 06/15] usb: xhci: avoid type conversion of void *
+Subject: [PATCH 07/16] usb: xhci: avoid type conversion of void *
 
 void * can be assigned to any pointer variable. Avoid unnecessary
 conversions.

buildroot-external/board/raspberrypi/patches/uboot/0008-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch

@@ -1,10 +1,10 @@
-From f12d0a67a79679641299b1b923883e62332ee6d4 Mon Sep 17 00:00:00 2001
-Message-Id: <f12d0a67a79679641299b1b923883e62332ee6d4.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From 361a81dd4eb8c508c882484a69bf85c00570cfe8 Mon Sep 17 00:00:00 2001
+Message-Id: <361a81dd4eb8c508c882484a69bf85c00570cfe8.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Michael Walle <michael@walle.cc>
 Date: Wed, 23 Sep 2020 12:42:51 +0200
-Subject: [PATCH 07/15] mmc: sdhci: move the ADMA2 table handling into own
+Subject: [PATCH 08/16] mmc: sdhci: move the ADMA2 table handling into own
  module
 
 There are other (non-SDHCI) controllers which supports ADMA2 descriptor

buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-RPi400.patch

@@ -1,10 +1,10 @@
-From 0ad1fdab7a52554d1da758b36917c09965495dd9 Mon Sep 17 00:00:00 2001
-Message-Id: <0ad1fdab7a52554d1da758b36917c09965495dd9.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From 47206784cfd0100ea48b8ede65119687a4af8f09 Mon Sep 17 00:00:00 2001
+Message-Id: <47206784cfd0100ea48b8ede65119687a4af8f09.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:15 +0100
-Subject: [PATCH 08/15] rpi: Add identifier for the new RPi400
+Subject: [PATCH 09/16] rpi: Add identifier for the new RPi400
 
 The Raspberry Pi Foundation released the new RPi400 which we want to
 detect, so we can enable Ethernet on it and know the correct device tree

buildroot-external/board/raspberrypi/patches/uboot/0010-rpi-Add-identifier-for-the-new-CM4.patch

@@ -1,10 +1,10 @@
-From f9cb12f4cf902797987fea885fa186ba7d676aa0 Mon Sep 17 00:00:00 2001
-Message-Id: <f9cb12f4cf902797987fea885fa186ba7d676aa0.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From aad1a59f4c8929f46b715e023aa19a224844c3a0 Mon Sep 17 00:00:00 2001
+Message-Id: <aad1a59f4c8929f46b715e023aa19a224844c3a0.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:16 +0100
-Subject: [PATCH 09/15] rpi: Add identifier for the new CM4
+Subject: [PATCH 10/16] rpi: Add identifier for the new CM4
 
 The Raspberry Pi Foundation released the new Compute Module 4which we
 want to detect, so we can enable Ethernet on it and know the correct

buildroot-external/board/raspberrypi/patches/uboot/0011-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch

@@ -1,10 +1,10 @@
-From c576988161912dfcb1bcd8b87640f5f998a87bf3 Mon Sep 17 00:00:00 2001
-Message-Id: <c576988161912dfcb1bcd8b87640f5f998a87bf3.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From ed5a66c3f22d0f01c4f71371714af4180e65b37d Mon Sep 17 00:00:00 2001
+Message-Id: <ed5a66c3f22d0f01c4f71371714af4180e65b37d.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:17 +0100
-Subject: [PATCH 10/15] pci: pcie-brcmstb: Fix inbound window configurations
+Subject: [PATCH 11/16] pci: pcie-brcmstb: Fix inbound window configurations
 
 So far we've assumed a fixed configuration for inbound windows as we had
 a single user for this controller. But the controller's DMA constraints

buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-xxx_get_dma_range.patch

@@ -1,10 +1,10 @@
-From a2052b8361818ec5acb04e5d0c1d229083dfbeb6 Mon Sep 17 00:00:00 2001
-Message-Id: <a2052b8361818ec5acb04e5d0c1d229083dfbeb6.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From 754d53fbedf5f97384f473f6f5a831aecae687f6 Mon Sep 17 00:00:00 2001
+Message-Id: <754d53fbedf5f97384f473f6f5a831aecae687f6.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:18 +0100
-Subject: [PATCH 11/15] dm: Introduce xxx_get_dma_range()
+Subject: [PATCH 12/16] dm: Introduce xxx_get_dma_range()
 
 Add the follwing functions to get a specific device's DMA ranges:
  - dev_get_dma_range()

buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch

@@ -1,10 +1,10 @@
-From ea24a497a84cf0d1efb9c4f285d4d29bd69f3ebb Mon Sep 17 00:00:00 2001
-Message-Id: <ea24a497a84cf0d1efb9c4f285d4d29bd69f3ebb.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From e286d6acbf158bc385d702aafcf1caa8da9ab8ee Mon Sep 17 00:00:00 2001
+Message-Id: <e286d6acbf158bc385d702aafcf1caa8da9ab8ee.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:19 +0100
-Subject: [PATCH 12/15] dm: Introduce DMA constraints into the core device
+Subject: [PATCH 13/16] dm: Introduce DMA constraints into the core device
  model
 
 Calculating the DMA offset between a bus address space and CPU's every

buildroot-external/board/raspberrypi/patches/uboot/0014-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch

@@ -1,10 +1,10 @@
-From 3f75e2303ddb7fa6eed6dc288880f613329ce3bb Mon Sep 17 00:00:00 2001
-Message-Id: <3f75e2303ddb7fa6eed6dc288880f613329ce3bb.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From c5d66c3defc09d5dba273f430d871dd8f7ab6352 Mon Sep 17 00:00:00 2001
+Message-Id: <c5d66c3defc09d5dba273f430d871dd8f7ab6352.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:20 +0100
-Subject: [PATCH 13/15] dm: Introduce dev_phys_to_bus()/dev_bus_to_phys()
+Subject: [PATCH 14/16] dm: Introduce dev_phys_to_bus()/dev_bus_to_phys()
 
 These functions, instead of relying on hard-coded platform-specific
 address translations, make use of the DMA constraints provided by the DM

buildroot-external/board/raspberrypi/patches/uboot/0015-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch

@@ -1,10 +1,10 @@
-From e3c96fd50787aa9ea2e5136593166cc49696d7ea Mon Sep 17 00:00:00 2001
-Message-Id: <e3c96fd50787aa9ea2e5136593166cc49696d7ea.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From edbdacb93fb0372ba456d84dc760314ed7757f86 Mon Sep 17 00:00:00 2001
+Message-Id: <edbdacb93fb0372ba456d84dc760314ed7757f86.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:21 +0100
-Subject: [PATCH 14/15] xhci: translate virtual addresses into the bus's
+Subject: [PATCH 15/16] xhci: translate virtual addresses into the bus's
  address space
 
 So far we've been content with passing physical addresses when
@@ -191,7 +191,7 @@ index b002d6f166..e8d435d644 100644
  
  	/*
 diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index a893277c75..74deaabb9b 100644
+index d912cba2f4..3d4b84f9a1 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
 @@ -275,10 +275,13 @@ void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr, u32 slot_id,
@@ -227,7 +227,7 @@ index a893277c75..74deaabb9b 100644
  
  	debug("dev=%p, pipe=%lx, buffer=%p, length=%d\n",
  		udev, pipe, buffer, length);
-@@ -876,7 +879,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
+@@ -874,7 +877,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
  	if (length > 0) {
  		if (req->requesttype & USB_DIR_IN)
  			field |= TRB_DIR_IN;

buildroot-external/board/raspberrypi/patches/uboot/0016-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch

@@ -1,10 +1,10 @@
-From de9f878b9cc4ab665c6aa4e6bb14193c66f78816 Mon Sep 17 00:00:00 2001
-Message-Id: <de9f878b9cc4ab665c6aa4e6bb14193c66f78816.1606428503.git.stefan@agner.ch>
-In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
-References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1606428503.git.stefan@agner.ch>
+From a92d8e7740d65859f5e08abe110fd9d37aebf4cd Mon Sep 17 00:00:00 2001
+Message-Id: <a92d8e7740d65859f5e08abe110fd9d37aebf4cd.1607085588.git.stefan@agner.ch>
+In-Reply-To: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
+References: <a04331a6ba7334282836bbaa76e979c4e6be3900.1607085588.git.stefan@agner.ch>
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 19 Nov 2020 18:48:22 +0100
-Subject: [PATCH 15/15] mmc: Introduce mmc_phys_to_bus()/mmc_bus_to_phys()
+Subject: [PATCH 16/16] mmc: Introduce mmc_phys_to_bus()/mmc_bus_to_phys()
 
 This will allow us to use DM variants of phys_to_bus()/bus_to_phys()
 when relevant.

buildroot-external/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0
-# Fri Nov 20 14:15:29 2020
+# Thu Dec  3 13:37:18 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -441,33 +441,33 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
 #
 # Finding Utilities
 #
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_EXECUTABLE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_EXEC_PLUS is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_QUIT is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_EMPTY is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_EXECUTABLE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_EXEC_PLUS=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+CONFIG_FEATURE_FIND_QUIT=y
+CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
 # CONFIG_EGREP is not set
 # CONFIG_FGREP is not set
@@ -589,13 +589,13 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKDISCARD=y
-CONFIG_BLKID=y
+# CONFIG_BLKID is not set
 # CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_BLOCKDEV=y
+# CONFIG_BLOCKDEV is not set
 CONFIG_CAL=y
 CONFIG_CHRT=y
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_DMESG is not set
+# CONFIG_FEATURE_DMESG_PRETTY is not set
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FALLOCATE=y
@@ -613,20 +613,20 @@ CONFIG_FEATURE_FBSET_READMODE=y
 # CONFIG_FEATURE_OSF_LABEL is not set
 # CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
-CONFIG_FINDFS=y
-CONFIG_FLOCK=y
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
 CONFIG_FDFLUSH=y
 CONFIG_FREERAMDISK=y
-CONFIG_FSCK_MINIX=y
-CONFIG_FSFREEZE=y
-CONFIG_FSTRIM=y
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_FSFREEZE is not set
+# CONFIG_FSTRIM is not set
+# CONFIG_GETOPT is not set
+# CONFIG_FEATURE_GETOPT_LONG is not set
+# CONFIG_HEXDUMP is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 # CONFIG_HD is not set
 # CONFIG_XXD is not set
-# CONFIG_HWCLOCK is not set
+CONFIG_HWCLOCK=y
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
 CONFIG_IONICE=y
 # CONFIG_IPCRM is not set
@@ -655,14 +655,14 @@ CONFIG_LSUSB=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
+# CONFIG_MOUNT is not set
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
-CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_LABEL is not set
 # CONFIG_FEATURE_MOUNT_NFS is not set
 # CONFIG_FEATURE_MOUNT_CIFS is not set
-CONFIG_FEATURE_MOUNT_FLAGS=y
+# CONFIG_FEATURE_MOUNT_FLAGS is not set
 # CONFIG_FEATURE_MOUNT_FSTAB is not set
 # CONFIG_FEATURE_MOUNT_OTHERTAB is not set
 # CONFIG_MOUNTPOINT is not set
@@ -678,62 +678,54 @@ CONFIG_REV=y
 CONFIG_RTCWAKE=y
 CONFIG_SCRIPT=y
 CONFIG_SCRIPTREPLAY=y
-CONFIG_SETARCH=y
-CONFIG_LINUX32=y
-CONFIG_LINUX64=y
+# CONFIG_SETARCH is not set
+# CONFIG_LINUX32 is not set
+# CONFIG_LINUX64 is not set
 CONFIG_SETPRIV=y
 CONFIG_FEATURE_SETPRIV_DUMP=y
 CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
 CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
 CONFIG_SETSID=y
-CONFIG_SWAPON=y
-CONFIG_FEATURE_SWAPON_DISCARD=y
-CONFIG_FEATURE_SWAPON_PRI=y
-CONFIG_SWAPOFF=y
-CONFIG_FEATURE_SWAPONOFF_LABEL=y
+# CONFIG_SWAPON is not set
+# CONFIG_FEATURE_SWAPON_DISCARD is not set
+# CONFIG_FEATURE_SWAPON_PRI is not set
+# CONFIG_SWAPOFF is not set
+# CONFIG_FEATURE_SWAPONOFF_LABEL is not set
 CONFIG_SWITCH_ROOT=y
 CONFIG_TASKSET=y
 CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_FEATURE_TASKSET_CPULIST=y
 CONFIG_UEVENT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
+# CONFIG_UMOUNT is not set
+# CONFIG_FEATURE_UMOUNT_ALL is not set
 # CONFIG_UNSHARE is not set
 # CONFIG_WALL is not set
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MOUNT_LOOP is not set
 # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
-CONFIG_VOLUMEID=y
-
-#
-# Filesystem/Volume identification
-#
+# CONFIG_VOLUMEID is not set
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
-CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
-CONFIG_FEATURE_VOLUMEID_FAT=y
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
 # CONFIG_FEATURE_VOLUMEID_LFS is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
 # CONFIG_FEATURE_VOLUMEID_LUKS is not set
-CONFIG_FEATURE_VOLUMEID_MINIX=y
+# CONFIG_FEATURE_VOLUMEID_MINIX is not set
 # CONFIG_FEATURE_VOLUMEID_NILFS is not set
-CONFIG_FEATURE_VOLUMEID_NTFS=y
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
 # CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
-CONFIG_FEATURE_VOLUMEID_SYSV=y
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_UBIFS is not set
 # CONFIG_FEATURE_VOLUMEID_UDF is not set
 # CONFIG_FEATURE_VOLUMEID_XFS is not set
@@ -814,8 +806,8 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_MICROCOM is not set
 CONFIG_MIM=y
 # CONFIG_MT is not set
-CONFIG_NANDWRITE=y
-CONFIG_NANDDUMP=y
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
 # CONFIG_PARTPROBE is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
@@ -828,13 +820,13 @@ CONFIG_STRINGS=y
 CONFIG_TIME=y
 CONFIG_TS=y
 CONFIG_TTYSIZE=y
-CONFIG_UBIATTACH=y
-CONFIG_UBIDETACH=y
-CONFIG_UBIMKVOL=y
-CONFIG_UBIRMVOL=y
-CONFIG_UBIRSVOL=y
-CONFIG_UBIUPDATEVOL=y
-CONFIG_UBIRENAME=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 CONFIG_WATCHDOG=y
 

buildroot-external/configs/intel_nuc_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.80"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.109"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -34,7 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
@@ -47,6 +47,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_GPTFDISK=y

buildroot-external/configs/odroid_c2_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -36,8 +36,11 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -100,3 +103,4 @@ 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

buildroot-external/configs/odroid_c4_defconfig

@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_9_X=y
 BR2_OPTIMIZE_2=y
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-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.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -36,8 +36,11 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -98,3 +101,4 @@ BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_APPARMOR_PROFILES=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y
+BR2_PACKAGE_RTL8812AU=y

buildroot-external/configs/odroid_n2_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
@@ -36,8 +36,11 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -100,3 +103,4 @@ 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

buildroot-external/configs/odroid_xu4_defconfig

@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
 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
@@ -36,10 +36,12 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -104,3 +106,4 @@ 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

buildroot-external/configs/ova_defconfig

@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.80"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.109"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -35,8 +35,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_GPTFDISK=y

buildroot-external/configs/rpi0_w_defconfig

@@ -24,7 +24,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/rpi0-w $(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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -37,8 +37,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_CRDA=y

buildroot-external/configs/rpi2_defconfig

@@ -24,7 +24,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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.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
@@ -37,8 +37,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y

buildroot-external/configs/rpi3_64_defconfig

@@ -24,7 +24,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/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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.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
@@ -37,8 +37,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_CRDA=y

buildroot-external/configs/rpi3_defconfig

@@ -24,7 +24,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/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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.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
@@ -37,8 +37,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_CRDA=y

buildroot-external/configs/rpi4_64_defconfig

@@ -24,12 +24,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/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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -37,12 +37,13 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
-BR2_PACKAGE_RPI_EEPROM=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y

buildroot-external/configs/rpi4_defconfig

@@ -24,12 +24,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/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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -37,12 +37,13 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
-BR2_PACKAGE_RPI_EEPROM=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y

buildroot-external/configs/rpi_defconfig

@@ -24,7 +24,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/rpi $(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/9797f1a4938c20139b00a25de93cc99efb5c291b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/76c49e60e742d0bebd798be972d67dd3fd007691.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -37,8 +37,10 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y

buildroot-external/configs/tinker_defconfig

@@ -24,7 +24,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.4.80"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.109"
 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"
@@ -38,10 +38,11 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y

buildroot-external/kernel/hassos.config

@@ -44,3 +44,6 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DFS_UPCALL=y
 
 CONFIG_WIREGUARD=m
+
+CONFIG_HID=m
+CONFIG_HIDRAW=y

buildroot-external/meta

@@ -1,7 +1,7 @@
 VERSION_MAJOR=5
-VERSION_BUILD=6
+VERSION_BUILD=13
 
-HASSOS_NAME="HassOS"
+HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

buildroot-external/ota/rauc-hook

@@ -2,7 +2,34 @@
 
 ##
 # Hooks
-env
+
+case "$1" in
+     install-check)
+         if [ "$RAUC_MF_COMPATIBLE" = "$RAUC_SYSTEM_COMPATIBLE" ]; then
+             exit 0
+         fi
+         # Be compatible with upcomming releases using haos OS ID
+         # shellcheck disable=SC2039
+         rauc_new_os_compatible=${RAUC_SYSTEM_COMPATIBLE/haos-/hassos-}
+         if [ "$RAUC_MF_COMPATIBLE" = "${rauc_new_os_compatible}" ]; then
+             exit 0
+         fi
+         # intel-nuc: Be compatible with upcomming generic-x86-64
+         # shellcheck disable=SC2039
+         rauc_new_board_compatible=${rauc_new_os_compatible/generic-x86-64/intel-nuc}
+         if [ "$RAUC_MF_COMPATIBLE" = "${rauc_new_board_compatible}" ]; then
+             exit 0
+         fi
+         echo "Compatible does not match!" 1>&2
+         exit 10
+         ;;
+    slot-install)
+        # Use install handlers below
+        ;;
+    *)
+        exit 1
+        ;;
+esac
 
 # Handle boot hocks
 if [ "${RAUC_SLOT_CLASS}" = "boot" ]; then

buildroot-external/package/rtl8812au/Config.in

@@ -0,0 +1,10 @@
+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/

buildroot-external/package/rtl8812au/rtl8812au.mk

@@ -0,0 +1,19 @@
+################################################################################
+#
+# Realtek RTL8812AU driver
+#
+################################################################################
+
+RTL8812AU_VERSION = cc4c64deef8090515a3dea8b709bfff0a1007d8b
+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))

buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf

@@ -9,3 +9,13 @@ unmanaged-devices=type:bridge;type:tun;type:veth
 
 [logging]
 backend=journal
+
+[connection]
+connection.mdns=2
+connection.llmnr=2
+
+[connectivity]
+uri=https://version.home-assistant.io/online.txt
+
+[device]
+wifi.scan-rand-mac-address=no

buildroot-external/rootfs-overlay/etc/sysctl.d/10-printk.conf

@@ -0,0 +1,2 @@
+# Only show kernel errors
+kernel.printk = 4 4 1 7

buildroot-external/rootfs-overlay/etc/systemd/logind.conf

@@ -0,0 +1,38 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See logind.conf(5) for details.
+
+[Login]
+#NAutoVTs=6
+#ReserveVT=6
+#KillUserProcesses=yes
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#InhibitDelayMaxSec=5
+#HandlePowerKey=poweroff
+#HandleSuspendKey=suspend
+#HandleHibernateKey=hibernate
+HandleLidSwitch=ignore
+HandleLidSwitchExternalPower=ignore
+HandleLidSwitchDocked=ignore
+#PowerKeyIgnoreInhibited=no
+#SuspendKeyIgnoreInhibited=no
+#HibernateKeyIgnoreInhibited=no
+#LidSwitchIgnoreInhibited=yes
+#HoldoffTimeoutSec=30s
+#IdleAction=ignore
+#IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RuntimeDirectoryInodes=400k
+#RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192

buildroot-external/rootfs-overlay/etc/systemd/resolved.conf

@@ -16,7 +16,7 @@
 #FallbackDNS=1.1.1.1 8.8.8.8 1.0.0.1 8.8.4.4 2606:4700:4700::1111 2001:4860:4860::8888 2606:4700:4700::1001 2001:4860:4860::8844
 #Domains=
 DNSSEC=no
-#DNSOverTLS=opportunistic
+DNSOverTLS=no
 #MulticastDNS=yes
 #LLMNR=yes
 #Cache=yes

buildroot-external/rootfs-overlay/usr/bin/datactl

@@ -1,31 +1,74 @@
 #!/bin/sh
 # ==============================================================================
-# HassOS data partition handling 
+# Home Assistant OS data partition handling
 # ==============================================================================
 set -e
 
-OPTION_FILE=/mnt/overlay/data.opt
-DATA_DEVICE_CHILD="$(findfs LABEL="hassos-data")"
+# Use current mount point. This avoids "Can't be the same disk!" error
+# when using a drive which has been used as a data drive previously.
+DATA_DEVICE_CHILD="$(findmnt --noheadings --output=source /mnt/data)"
 DATA_DEVICE_ROOT="/dev/$(lsblk -no pkname "${DATA_DEVICE_CHILD}")"
 
+if [ "${DATA_DEVICE_ROOT}" = "" ]; then
+    echo "[ERROR] Data disk device not found!"
+    exit 1
+fi
+
 # Move command
 if [ "${1}" = "move" ] && [ -e "${2}" ]; then
-    DEVICE="${2}"
+    NEW_DEVICE_ROOT="${2}"
 
     # Check device
-    if ! lsblk "${DEVICE}" | grep disk > /dev/null 2>&1; then
+    if ! lsblk "${NEW_DEVICE_ROOT}" | grep disk > /dev/null 2>&1; then
         echo "[ERROR] Is not disk!"
         exit 1
-    elif [ "${DEVICE}" = "${DATA_DEVICE_ROOT}" ]; then
+    elif [ "${NEW_DEVICE_ROOT}" = "${DATA_DEVICE_ROOT}" ]; then
         echo "[ERROR] Can't be the same disk!"
         exit 1
     fi
 
     # Flag device
-    echo "WARNING: ${DEVICE} will be reset on next restart!"
-    echo "Press a key to move forward"
-    read -r
+    echo "WARNING: All partitions on ${NEW_DEVICE_ROOT} will be deleted!"
+    printf "Enter \"yes\" to confirm: "
+    read -r confirm
+    if [ "${confirm}" != "yes" ]; then
+        echo "Aborting."
+        exit 1
+    fi
+
+    # Create GPT partition table with a single data partition
+    cat << EOF | sfdisk --wipe-partitions=always --wipe=always "${NEW_DEVICE_ROOT}"
+label: gpt
+uuid=a52a4597-fa3a-4851-aefd-2fbe9f849079, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, name=hassos-data-external
+EOF
+
+    # Since we create a new partition table etc. we are guaranteed the target
+    # partition is partition 1
+    NEW_DEVICE_PART_SIZE=$(cat "/sys/class/block/$(basename "${NEW_DEVICE_ROOT}")1/size")
+    OLD_DEVICE_PART_SIZE=$(cat "/sys/class/block/$(basename "${DATA_DEVICE_CHILD}")/size")
+
+    if [ "${NEW_DEVICE_PART_SIZE}" -lt "${OLD_DEVICE_PART_SIZE}" ]; then
+        echo "[INFO] Target device too small!"
+        echo "label: gpt" | sfdisk "${NEW_DEVICE_ROOT}"
+        exit 1
+    fi
+
+    touch "/mnt/overlay/move-data"
+    cat << EOF
+
+Disk ${NEW_DEVICE_ROOT} has been prepared to be used as data drive and the data
+move has been scheduled for the next reboot. Please reboot the device now and
+make sure to leave the disk connected to the system from now on.
+EOF
+
+else
+    cat << EOF
+Usage: datactl move <device>
+
+Moves data partition to external device provided by <device> (without partition
+number). A new partition table and a partition for the complete device will be
+created by datactl.
+EOF
 
-    echo "${DEVICE}" > ${OPTION_FILE}
 fi
 

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

@@ -1,16 +1,17 @@
 [Unit]
-Description=HassOS data partition
+Description=Home Assistant OS data partition migration
 DefaultDependencies=no
 RefuseManualStart=true
 RefuseManualStop=true
 Requires=mnt-overlay.mount dev-disk-by\x2dlabel-hassos\x2ddata.device
 Wants=hassos-expand.service
-After=mnt-overlay.mount dev-disk-by\x2dlabel-hassos\x2ddata.device systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
+After=mnt-overlay.mount dev-disk-by\x2dlabel-hassos\x2ddata.device systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service dev-disk-by\x2dpartlabel-hassos\x2ddata\x2dexternal.device
 Before=hassos-expand.service
-ConditionPathExists=/mnt/overlay/data.opt
+ConditionPathExists=/mnt/overlay/move-data
 
 [Service]
 Type=oneshot
+ExecStartPre=-/usr/bin/rm -f /mnt/overlay/move-data
 ExecStart=/usr/libexec/hassos-data
 
 [Install]

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount

@@ -3,13 +3,12 @@ Description=HassOS boot partition
 DefaultDependencies=no
 Before=umount.target local-fs.target
 Conflicts=umount.target
-After=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2dboot.service
-Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2dboot.service
 
 [Mount]
 What=/dev/disk/by-label/hassos-boot
 Where=/mnt/boot
 Type=auto
+Options=sync
 
 [Install]
 WantedBy=local-fs.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount

@@ -6,7 +6,7 @@ After=hassos-expand.service
 Before=umount.target local-fs.target
 Conflicts=umount.target
 After=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
-Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
+Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service systemd-growfs@mnt-data.service
 
 [Mount]
 What=/dev/disk/by-label/hassos-data

buildroot-external/rootfs-overlay/usr/lib/systemd/system/systemd-growfs@.service

@@ -0,0 +1,18 @@
+#
+# Extracted from fstab-generator
+#
+
+[Unit]
+Description=Grow File System on %f
+Documentation=man:systemd-growfs@.service(8)
+DefaultDependencies=no
+BindsTo=%i.mount
+Conflicts=shutdown.target
+After=%i.mount
+Before=shutdown.target local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/lib/systemd/systemd-growfs %f
+TimeoutSec=0

buildroot-external/rootfs-overlay/usr/libexec/hassos-data

@@ -1,83 +1,43 @@
 #!/bin/sh
-# shellcheck disable=SC2039
 # ==============================================================================
-# HassOS data partition handler
+# Home Assistant OS data partition migration script
 # ==============================================================================
 set -e
 
-OPTION_FILE=/mnt/overlay/data.opt
+# Rely on systemd-udev symlinks to find current data partition by fs label
+OLD_DEVICE_CHILD="$(readlink -f "/dev/disk/by-label/hassos-data")"
 
-# New data partition exits
-if ! [ -e "${OPTION_FILE}" ]; then
-    echo "[INFO] No data option found"
-    exit 0
-else
-    NEW_DEVICE_ROOT="$(cat ${OPTION_FILE})"
-    rm ${OPTION_FILE}
-fi
-
-# Get device information
-OLD_DEVICE_CHILD="$(findfs LABEL="hassos-data")"
-OLD_DEVICE_ROOT="/dev/$(lsblk -no pkname "${OLD_DEVICE_CHILD}")"
-OLD_PART_NUM="${OLD_DEVICE_CHILD: -1}"
-
-# Wait for devices
-timeout 90 \
-    ash -c \
-        "until [ -e \"${NEW_DEVICE_ROOT}\" ]; do sleep 5; done" \
-            > /dev/null 2>&1 || true;
-
-# Check if block device is exists
-if [ ! -b "${NEW_DEVICE_ROOT}" ]; then
-    echo "[ERROR] No block device ${NEW_DEVICE_ROOT}!"
-    exit 1
-fi
-echo "[INFO] Cleanup device ${NEW_DEVICE_ROOT}!"
-sgdisk -Z "${NEW_DEVICE_ROOT}"
-
-# Create new partition
-echo "[INFO] Create new hassos-data partition"
-sgdisk -o "${NEW_DEVICE_ROOT}"
-sgdisk \
-    -n "0:0:0" \
-    -c "0:hassos-data" \
-    -t "0:0FC63DAF-8483-4772-8E79-3D69D8477DE4" \
-    -u "0:a52a4597-fa3a-4851-aefd-2fbe9f849079" \
-    "${NEW_DEVICE_ROOT}"
-sgdisk -v "${NEW_DEVICE_ROOT}"
-partx -u "${NEW_DEVICE_ROOT}"
-
-NEW_DEVICE_CHILD="$(fdisk -l "${NEW_DEVICE_ROOT}" | grep '^/dev' | cut -d' ' -f1 | head -n 1)"
-
-echo "[INFO] Move hassos-data from ${OLD_DEVICE_CHILD} to ${NEW_DEVICE_CHILD}"
-if ! dd if="${OLD_DEVICE_CHILD}" of="${NEW_DEVICE_CHILD}" status=none; then
-    echo "[ERROR] Data copy fails!"
-
-    # Reset new data partition
-    sgdisk -o "${NEW_DEVICE_ROOT}"
-    partx -u "${NEW_DEVICE_ROOT}"
+# We cannot rely on systemd Wants/Requires since this is evaluated before
+# ConditionPathExists, and would make us wait for an external device on
+# every boot.
+# Instead, just start the unit here, which makes sure a device with the
+# partlabel "hassos-data-external" is present.
+if ! systemctl start "dev-disk-by\\x2dpartlabel-hassos\\x2ddata\\x2dexternal.device"; then
+    echo "[ERROR] External data device ${NEW_DEVICE} not found!"
     exit 1
 fi
 
-echo "[INFO] Remove old hassos-data partition ${OLD_PART_NUM} / ${OLD_DEVICE_ROOT}"
-if sfdisk -dq "${OLD_DEVICE_ROOT}" | grep -q 'label: gpt'; then
-    sgdisk -d "${OLD_PART_NUM}" "${OLD_DEVICE_ROOT}"
-    sgdisk -v "${OLD_DEVICE_ROOT}"
+# Rely on systemd-udev symlinks to find external data partition by partlabel
+NEW_DEVICE_CHILD="$(readlink -f "/dev/disk/by-partlabel/hassos-data-external")"
 
-else
-    sfdisk --delete "${OLD_DEVICE_ROOT}" "${OLD_PART_NUM}" --force
-    sfdisk -V "${OLD_DEVICE_ROOT}"
+NEW_DEVICE_PART_SIZE=$(cat "/sys/class/block/$(basename "${NEW_DEVICE_CHILD}")/size")
+OLD_DEVICE_PART_SIZE=$(cat "/sys/class/block/$(basename "${OLD_DEVICE_CHILD}")/size")
+if [ "${NEW_DEVICE_PART_SIZE}" -lt "${OLD_DEVICE_PART_SIZE}" ]; then
+    echo "[INFO] Target device too small!"
+    exit 1
 fi
 
-echo "[INFO] fix filesystem & layout"
+echo "[INFO] Moving data from ${OLD_DEVICE_CHILD} to ${NEW_DEVICE_CHILD}"
+if ! e2image -ra -p "${OLD_DEVICE_CHILD}" "${NEW_DEVICE_CHILD}"; then
+    echo "[ERROR] Copying data partition to external device failed!"
+    # Rename partition to make sure HAOS does not try to mount a failed copy attempt.
+    e2label "${NEW_DEVICE_CHILD}" hassos-data-failed || true
+    exit 1
+fi
 
-# Fix filesystem
-e2fsck -y "${NEW_DEVICE_CHILD}"
-resize2fs -f "${NEW_DEVICE_CHILD}"
+# At this point we have two partition with the same fs label. Make sure
+# to rename the internal partition so we won't mount it anymore.
+echo "[INFO] Rename old hassos-data partition ${OLD_DEVICE_CHILD}"
+e2label "${OLD_DEVICE_CHILD}" hassos-data-old
 
-# Fix partition layout
-partx -d "${OLD_DEVICE_CHILD}"
-partx -u "${OLD_DEVICE_ROOT}"
-partx -u "${NEW_DEVICE_ROOT}"
-
-echo "[INFO] Finish hassos data movement"
+echo "[INFO] Data move has been completed successfully"

buildroot-external/rootfs-overlay/usr/libexec/hassos-expand

@@ -13,24 +13,35 @@ PART_NUM="$(cat "/sys/class/block/${DEVICE_CHILD_NAME}/partition")"
 # Get partition label type
 PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")"
 PART_LABEL="$(echo "${PART_TABLE}" | jq -r '.partitiontable.label')"
+echo "[INFO] Checking if expanding data partition on ${DEVICE_CHILD} is necessary"
 
 if [ "${PART_LABEL}" = "gpt" ]; then
-    echo "[INFO] Detected GPT partition label"
-    # We cannot use .partitiontable.lastlba from the json output as we might
-    # still have the backup GPT not at the end of the disk. Calculate last
-    # usable LBA using disk size
-    LAST_USABLE_LBA=$(( $(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size") - 34 ))
+    echo "[INFO] Detected GPT partition label on ${DEVICE_ROOT}"
+
+    if sfdisk --verify "${DEVICE_ROOT}" 2>&1 | grep "The backup GPT table is not on the end of the device."; then
+        echo "[INFO] Moving GPT backup header to the end"
+        sfdisk --relocate gpt-bak-std "${DEVICE_ROOT}"
+
+        # Reload partition label to get correct .partitiontable.lastlba
+        PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")"
+    fi
+    LAST_USABLE_LBA="$(echo "${PART_TABLE}" | jq -r '.partitiontable.lastlba')"
 else
-    echo "[INFO] Detected MBR partition label"
-    LAST_USABLE_LBA=$(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size")
+    echo "[INFO] Detected MBR partition label on ${DEVICE_ROOT}"
+
+    # For MBR, we have to calculate the last usable sector by ourselfs
+    DEVICE_SIZE=$(blockdev --getsize64 "${DEVICE_ROOT}")
+    LAST_USABLE_LBA=$(echo "${PART_TABLE}" | jq -r "${DEVICE_SIZE} / .partitiontable.sectorsize")
 fi
+echo "[INFO] Last usable logical block ${LAST_USABLE_LBA}"
 
 # Calculate end of data partition
 JQ_FILTER=".partitiontable.partitions[] | select ( .node == \"${DEVICE_CHILD}\" ) | .start + .size"
 DATA_PARTITION_END="$(echo "${PART_TABLE}" | jq "${JQ_FILTER}")"
+echo "[INFO] Data partition end block ${DATA_PARTITION_END}"
 
-# Need resize? Ignore everything less than 8MB since that could be partition
-# alignment rounding...
+# Need resize? Ignore free space if its less than 8MB/64MB (4k sectors) since
+# that could be partition alignment rounding...
 UNUSED_BLOCKS=$(( LAST_USABLE_LBA - DATA_PARTITION_END ))
 if [ "${UNUSED_BLOCKS}" -le "16384" ]; then
     echo "[INFO] No resize of data partition needed"
@@ -38,25 +49,20 @@ if [ "${UNUSED_BLOCKS}" -le "16384" ]; then
 fi
 
 echo "[INFO] Update hassos-data partition ${PART_NUM}"
-if [ "${PART_LABEL}" = "gpt" ]; then
-    sgdisk -e "${DEVICE_ROOT}"
-    sgdisk -d "${PART_NUM}" \
-        -n "${PART_NUM}:0:0" \
-        -c "${PART_NUM}:hassos-data" \
-        -t "${PART_NUM}:0FC63DAF-8483-4772-8E79-3D69D8477DE4" \
-        -u "${PART_NUM}:a52a4597-fa3a-4851-aefd-2fbe9f849079" \
-        "${DEVICE_ROOT}"
-    sgdisk -v "${DEVICE_ROOT}"
-else
-    echo ", +" | sfdisk -N "${PART_NUM}" "${DEVICE_ROOT}" --force
-    sfdisk -V "${DEVICE_ROOT}"
+echo ", +" | sfdisk --no-reread --no-tell-kernel -N "${PART_NUM}" "${DEVICE_ROOT}"
+sfdisk -V "${DEVICE_ROOT}"
+
+# Update the kernel's partition table
+partx -u "${DEVICE_ROOT}"
+udevadm settle
+
+# Make sure /dev/disk/by-label/hassos-data is actually present before exiting.
+# This avoids a race condition with mnt-data.mount which might fail to bind
+# otherwise:
+# Bound to unit dev-disk-by\x2dlabel-hassos\x2ddata.device, but unit isn't active.
+if ! systemctl start "dev-disk-by\\x2dlabel-hassos\\x2ddata.device"; then
+    echo "[ERROR] Data partition not found!"
+    exit 1
 fi
 
-partx -u "${DEVICE_ROOT}"
-
-# Resize filesystem
-echo "[INFO] Resize hassos-data filesystem"
-e2fsck -y "${DEVICE_CHILD}"
-resize2fs -f "${DEVICE_CHILD}"
-
-echo "[INFO] Finish hassos-data resizing"
+echo "[INFO] Finished hassos-data partition resizing"

buildroot-external/rootfs-overlay/usr/sbin/hassos-cli

@@ -10,6 +10,11 @@ if [ "${TERM}" = "vt220" ] || [ "${TERM}" = "vt102" ] || \
 fi
 
 # Run CLI container
+if [ ! "$(findmnt /mnt/data)" ]; then
+    echo "[WARN] Data partition not mounted! Jump into emergency console..."
+    exec /bin/ash -l
+fi
+
 if [ "$(docker ps -q -f name=hassio_cli)" ]; then
     docker container exec \
         -ti hassio_cli \
@@ -21,7 +26,7 @@ if [ "$(docker ps -q -f name=hassio_cli)" ]; then
     fi
 else
     echo "[WARN] Home Assistant CLI is not running! Jump into emergency console..."
-    /bin/ash -l
+    exec /bin/ash -l
 fi
 
 exit

buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor

@@ -69,9 +69,10 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
     docker container create \
         --name hassio_supervisor \
         --privileged --security-opt apparmor="hassio-supervisor" \
-        -v /var/run/docker.sock:/var/run/docker.sock \
-        -v /var/run/dbus:/var/run/dbus \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        -v /run/dbus:/run/dbus:ro \
         -v /run/supervisor:/run/os:rw \
+        -v /run/udev:/run/udev:ro \
         -v /etc/machine-id:/etc/machine-id:ro \
         -v ${SUPERVISOR_DATA}:/data:rw \
         -v /mnt/overlay:/os/overlay:rw \

buildroot-external/scripts/ota.sh

@@ -32,6 +32,7 @@ function create_ota_update() {
         echo "version=$(hassos_version)"
         echo "[hooks]"
         echo "filename=hook"
+        echo "hooks=install-check"
         echo "[image.boot]"
         echo "filename=boot.vfat"
         echo "hooks=install"

buildroot-external/scripts/post-build.sh

@@ -21,7 +21,7 @@ install_hassos_cli
 # Write os-release
 # shellcheck disable=SC2153
 (
-    echo "NAME=${HASSOS_NAME}"
+    echo "NAME=\"${HASSOS_NAME}\""
     echo "VERSION=\"$(hassos_version) (${BOARD_NAME})\""
     echo "ID=${HASSOS_ID}"
     echo "VERSION_ID=$(hassos_version)"

buildroot-patches/0001-Docker-AppArmor-support.patch

@@ -1,54 +0,0 @@
-From 8aa12f1835721959d0d1999fceee632404f28366 Mon Sep 17 00:00:00 2001
-Message-Id: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Mon, 13 Jan 2020 12:27:06 +0000
-Subject: [PATCH 1/7] Docker: AppArmor support
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/docker-containerd/docker-containerd.mk | 1 +
- package/docker-engine/docker-engine.mk         | 2 +-
- package/runc/runc.mk                           | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
-index 71f9b4c065..e4a4105018 100644
---- a/package/docker-containerd/docker-containerd.mk
-+++ b/package/docker-containerd/docker-containerd.mk
-@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
- DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
- 
- DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
-+DOCKER_CONTAINERD_TAGS = apparmor
- 
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
- DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
-diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
-index 8cedf307ba..370cfdbaee 100644
---- a/package/docker-engine/docker-engine.mk
-+++ b/package/docker-engine/docker-engine.mk
-@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
- 	-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
- 	-X main.Version=$(DOCKER_ENGINE_VERSION)
- 
--DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
-+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
- DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
- 
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-diff --git a/package/runc/runc.mk b/package/runc/runc.mk
-index 3d177d23d5..d9e953c640 100644
---- a/package/runc/runc.mk
-+++ b/package/runc/runc.mk
-@@ -10,7 +10,7 @@ RUNC_LICENSE = Apache-2.0
- RUNC_LICENSE_FILES = LICENSE
- 
- RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
--RUNC_TAGS = cgo static_build
-+RUNC_TAGS = cgo static_build apparmor
- 
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
- RUNC_TAGS += seccomp
--- 
-2.29.2
-

buildroot-patches/0001-docker-add-AppArmor-support.patch

@@ -0,0 +1,65 @@
+From 53aff7f049c974ab861db563c24d31c5512d1fbc Mon Sep 17 00:00:00 2001
+Message-Id: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Mon, 13 Jan 2020 12:27:06 +0000
+Subject: [PATCH 1/9] docker: add AppArmor support
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ package/docker-containerd/docker-containerd.mk | 5 +++++
+ package/docker-engine/docker-engine.mk         | 5 +++++
+ package/runc/runc.mk                           | 5 +++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
+index 6b79bd14ae..2eed6e346b 100644
+--- a/package/docker-containerd/docker-containerd.mk
++++ b/package/docker-containerd/docker-containerd.mk
+@@ -18,6 +18,11 @@ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
+ 
+ DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+ 
++ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
++DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
++DOCKER_CONTAINERD_TAGS += apparmor
++endif
++
+ ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+ DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
+ DOCKER_CONTAINERD_TAGS += seccomp
+diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
+index 8cedf307ba..7f898680b7 100644
+--- a/package/docker-engine/docker-engine.mk
++++ b/package/docker-engine/docker-engine.mk
+@@ -20,6 +20,11 @@ DOCKER_ENGINE_LDFLAGS = \
+ DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
+ DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
+ 
++ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
++DOCKER_ENGINE_DEPENDENCIES += libapparmor
++DOCKER_ENGINE_TAGS += apparmor
++endif
++
+ ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+ DOCKER_ENGINE_TAGS += seccomp
+ DOCKER_ENGINE_DEPENDENCIES += libseccomp
+diff --git a/package/runc/runc.mk b/package/runc/runc.mk
+index 393bd7b22f..45fe1442ad 100644
+--- a/package/runc/runc.mk
++++ b/package/runc/runc.mk
+@@ -12,6 +12,11 @@ RUNC_LICENSE_FILES = LICENSE
+ RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION)
+ RUNC_TAGS = cgo static_build
+ 
++ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
++RUNC_DEPENDENCIES += libapparmor
++RUNC_TAGS += apparmor
++endif
++
+ ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+ RUNC_TAGS += seccomp
+ RUNC_DEPENDENCIES += libseccomp host-pkgconf
+-- 
+2.30.0
+

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

@@ -1,10 +1,10 @@
-From 05fa58fbff93719044a9d1bb9e7c82d67068e346 Mon Sep 17 00:00:00 2001
-Message-Id: <05fa58fbff93719044a9d1bb9e7c82d67068e346.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From b24a9853bf61b59c44f5b5e0c02a41e07b6d776f Mon Sep 17 00:00:00 2001
+Message-Id: <b24a9853bf61b59c44f5b5e0c02a41e07b6d776f.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 11:51:46 +0000
-Subject: [PATCH 2/7] rpi-firmware: Bump firmware
+Subject: [PATCH 2/9] rpi-firmware: Bump firmware
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -19,7 +19,7 @@ index 8730ec959b..49a600903c 100644
 @@ -1,3 +1,3 @@
  # Locally computed
 -sha256  c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b  rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz
-+sha256  30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7  rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz
++sha256  e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243  rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz
  sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 8b2b2c7154..fe7a099407 100644
@@ -30,10 +30,10 @@ index 8b2b2c7154..fe7a099407 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44
-+RPI_FIRMWARE_VERSION = 2ba11f2a07760588546821aed578010252c9ecb3
++RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0003-network-manager-wpa_supplicant.patch

@@ -1,10 +1,10 @@
-From d1f588ab003b001079b6fab1cfd5d43401989b3b Mon Sep 17 00:00:00 2001
-Message-Id: <d1f588ab003b001079b6fab1cfd5d43401989b3b.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From 15db6339b4bdd202c44c663edcdc82b6d2f07652 Mon Sep 17 00:00:00 2001
+Message-Id: <15db6339b4bdd202c44c663edcdc82b6d2f07652.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 14:32:45 +0000
-Subject: [PATCH 3/7] network-manager: wpa_supplicant
+Subject: [PATCH 3/9] network-manager: wpa_supplicant
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -42,5 +42,5 @@ index 3dc3188f32..2a04b00cee 100644
  NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING
  
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0004-Fix-dhcp-client.patch

@@ -1,10 +1,10 @@
-From fe8fec1b597f65938376451c7cf84a462c492fd9 Mon Sep 17 00:00:00 2001
-Message-Id: <fe8fec1b597f65938376451c7cf84a462c492fd9.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From bd1542bc2e242b189b4a778cb879e3416c40b60a Mon Sep 17 00:00:00 2001
+Message-Id: <bd1542bc2e242b189b4a778cb879e3416c40b60a.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 12:01:44 +0000
-Subject: [PATCH 4/7] Fix dhcp client
+Subject: [PATCH 4/9] Fix dhcp client
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -26,5 +26,5 @@ index ad59804d3b..f1ffa81d9a 100644
  		install-sbinPROGRAMS
  	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0005-rpi-use-latest-wifi-driver.patch

@@ -1,10 +1,10 @@
-From baba5ba468fe84e1a85818dd5a2a111e1391d822 Mon Sep 17 00:00:00 2001
-Message-Id: <baba5ba468fe84e1a85818dd5a2a111e1391d822.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From ff288c78226a2e61abf75bb285b429299e384edd Mon Sep 17 00:00:00 2001
+Message-Id: <ff288c78226a2e61abf75bb285b429299e384edd.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 12:05:21 +0000
-Subject: [PATCH 5/7] rpi: use latest wifi driver
+Subject: [PATCH 5/9] rpi: use latest wifi driver
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -44,5 +44,5 @@ index 6be02509fe..0c697bddbe 100644
  
  $(eval $(generic-package))
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch

@@ -1,35 +1,39 @@
-From 502b35edadbac3d51c3f37b4c74917ffff6f1332 Mon Sep 17 00:00:00 2001
-Message-Id: <502b35edadbac3d51c3f37b4c74917ffff6f1332.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From 3a34b131d0d7a1630e70f60c3bd62240d3b1b654 Mon Sep 17 00:00:00 2001
+Message-Id: <3a34b131d0d7a1630e70f60c3bd62240d3b1b654.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 11 Nov 2020 22:16:10 +0100
-Subject: [PATCH 6/7] ODROID-XU4: video firmware
+Subject: [PATCH 6/9] package/linux-firmware: add new option for Samsung MFC
+ firmware
 
+Multi format codec (MFC) is the IP present in Samsung Exynos
+series SoCs for video encoding/decoding operations.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- package/linux-firmware/Config.in         | 6 ++++++
+ package/linux-firmware/Config.in         | 5 +++++
  package/linux-firmware/linux-firmware.mk | 6 ++++++
- 2 files changed, 12 insertions(+)
+ 2 files changed, 11 insertions(+)
 
 diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
-index 9b999034da..d3b7a2b79b 100644
+index 105daf42b8..dbdfdb52b3 100644
 --- a/package/linux-firmware/Config.in
 +++ b/package/linux-firmware/Config.in
-@@ -44,6 +44,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO
+@@ -44,6 +44,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO
  	help
  	  Firmware files for Qualcomm Adreno GPU firmware
  
-+
 +config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8
-+	bool "Samsung MFC video encoder/decoder driver v8"
++	bool "Samsung MFC video encoder/decoder v8 firmware"
 +	help
-+	  Firmware files for samsung MFC video encoder/decoder driver v8
++	  Firmware files for Samsung MFC video encoder/decoder driver v8
 +
  endmenu # Video
  
  menu "Bluetooth firmware"
 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
-index d9ad942903..5474377a36 100644
+index 8808b5284c..f1c84a134d 100644
 --- a/package/linux-firmware/linux-firmware.mk
 +++ b/package/linux-firmware/linux-firmware.mk
 @@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a*
@@ -46,5 +50,5 @@ index d9ad942903..5474377a36 100644
  ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y)
  LINUX_FIRMWARE_FILES += intel/ibt-*
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0007-docker-proxy-Bump-version.patch

@@ -1,10 +1,10 @@
-From 14cd8a7e9eec46e0cdd243db17827335de2803c5 Mon Sep 17 00:00:00 2001
-Message-Id: <14cd8a7e9eec46e0cdd243db17827335de2803c5.1605131156.git.stefan@agner.ch>
-In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
-References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch>
+From dc54a32cb53394e21bc5dd65c10a847944864a2b Mon Sep 17 00:00:00 2001
+Message-Id: <dc54a32cb53394e21bc5dd65c10a847944864a2b.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 7 May 2020 09:02:05 +0000
-Subject: [PATCH 7/7] docker-proxy: Bump version
+Subject: [PATCH 7/9] docker-proxy: Bump version
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -37,5 +37,5 @@ index 6600b24ed9..d0e940db93 100644
  DOCKER_PROXY_LICENSE = Apache-2.0
  DOCKER_PROXY_LICENSE_FILES = LICENSE
 -- 
-2.29.2
+2.30.0
 

buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch

@@ -0,0 +1,82 @@
+From 6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11 Mon Sep 17 00:00:00 2001
+Message-Id: <6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Sun, 20 Dec 2020 16:57:09 +0100
+Subject: [PATCH 8/9] systemd: Bump to latest systemd-stable release 246.10
+
+---
+ ...o-not-fail-with-read-only-etc-or-var.patch | 34 -------------------
+ package/systemd/systemd.hash                  |  2 +-
+ package/systemd/systemd.mk                    |  2 +-
+ 3 files changed, 2 insertions(+), 36 deletions(-)
+ delete mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
+
+diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
+deleted file mode 100644
+index 01e7f1e906..0000000000
+--- a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
++++ /dev/null
+@@ -1,34 +0,0 @@
+-From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001
+-From: Felix Riemann <felix.riemann@sma.de>
+-Date: Mon, 19 Oct 2020 18:54:53 +0200
+-Subject: [PATCH] update-done: Do not fail with read-only /etc or /var
+-
+-With the switch from log_debug() to log_debug_errno() in commit c413bb28df
+-systemd-update-done would fail without any error message if /etc
+-or /var were read-only. This restores the previous behaviour to
+-silently ignore these directories again.
+-
+-[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280]
+-Signed-off-by: Romain Naour <romain.naour@gmail.com>
+----
+- src/update-done/update-done.c | 4 ++--
+- 1 file changed, 2 insertions(+), 2 deletions(-)
+-
+-diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
+-index e9d589e0e5..92c348d83b 100644
+---- a/src/update-done/update-done.c
+-+++ b/src/update-done/update-done.c
+-@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
+- 
+-         r = write_string_file_atomic_label_ts(path, message, ts);
+-         if (r == -EROFS)
+--                return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
+--        if (r < 0)
+-+                log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
+-+        else if (r < 0)
+-                 return log_error_errno(r, "Failed to write \"%s\": %m", path);
+-         return 0;
+- }
+--- 
+-2.25.4
+-
+diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
+index cad249199c..0c2ba1e1c3 100644
+--- a/package/systemd/systemd.hash
++++ b/package/systemd/systemd.hash
+@@ -1,5 +1,5 @@
+ # sha256 locally computed
+-sha256  f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178  systemd-246.5.tar.gz
++sha256  3a972d287edd864e0b33321bc74dfe6083d390306461fa7e958895eaa4be6b67  systemd-246.10.tar.gz
+ sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  LICENSE.GPL2
+ sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENSE.LGPL2.1
+ sha256  b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9  README
+diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
+index ddd3f4380e..51a3160050 100644
+--- a/package/systemd/systemd.mk
++++ b/package/systemd/systemd.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-SYSTEMD_VERSION = 246.5
++SYSTEMD_VERSION = 246.10
+ SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
+ SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
+ SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
+-- 
+2.30.0
+

buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch

@@ -0,0 +1,53 @@
+From 5296f74bba93a16fe1db5493f36e35fad434f9ee Mon Sep 17 00:00:00 2001
+Message-Id: <5296f74bba93a16fe1db5493f36e35fad434f9ee.1612369715.git.stefan@agner.ch>
+In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Wed, 23 Dec 2020 10:53:20 +0100
+Subject: [PATCH 9/9] package/linux-firmware: add new option for USB TI
+ 3410/5052 firmware
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ package/linux-firmware/Config.in         | 9 +++++++++
+ package/linux-firmware/linux-firmware.mk | 6 ++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
+index dbdfdb52b3..6d5e961527 100644
+--- a/package/linux-firmware/Config.in
++++ b/package/linux-firmware/Config.in
+@@ -490,4 +490,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X
+ 
+ endmenu
+ 
++menu "USB to Serial Firmware"
++
++config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI
++	bool "USB TI 3410/5052 Serial Firmware"
++	help
++	  Firmware files for TI 3410/5052
++
++endmenu
++
+ endif
+diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
+index f1c84a134d..f00fb2e6ae 100644
+--- a/package/linux-firmware/linux-firmware.mk
++++ b/package/linux-firmware/linux-firmware.mk
+@@ -620,6 +620,12 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin
+ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
+ endif
+ 
++ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y)
++LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw
++# No license file; the license is in the file WHENCE
++# which is installed unconditionally
++endif
++
+ ifneq ($(LINUX_FIRMWARE_FILES),)
+ define LINUX_FIRMWARE_INSTALL_FILES
+ 	cd $(@D) && \
+-- 
+2.30.0
+

buildroot/CHANGES

@@ -1,3 +1,106 @@
+2020.11.3, released February 17th, 2021
+
+	meson: Fix ccache detection handling when per-package builds
+	are used.
+
+	Fakeroot: Fix compatibility issue with glibc 2.33
+
+	Updated/fixed packages: atftp, binutils, busybox, cereal,
+	chartjs, connman, dhcpcd, dnsmasq, docker-cli, docker-engine,
+	ebtables, fakeroot, flashrom, go, gst1-python, guile,
+	intel-mediadriver, intel-microcode, jasper,
+	kodi-inputstream-adaptive, lcms2, libbsd, libopenssl,
+	makedumpfile, memtester, mosquitto, ne10, openblas, orc, php,
+	postgresql, privoxy, pugixml, python-bottle, python-django,
+	python3, rauc, sox, stress-ng, subversion, tzdate,
+	uboot-tools, uclibc, webkitgtk, wireguard-linux-compat,
+	wireshark, wpa_supplicant, wpewebkit, xenomai,
+	xserver_xorg-server, xterm
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11706: binman (U-boot tool) cannot find libfdt "binman: No mod..
+	#13506: BR2_PACKAGE_DHCPCD missing directory creation
+
+2020.11.2, released January 31st, 2021
+
+	Important / security related fixes.
+
+	Download: Ensure git submodules are correctly fetched if
+	enabled for a package with <pkg>_GIT_SUBMODULES = YES and the
+	host variant is downloaded first.
+
+	Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not
+	having libatomic. Bootlin PowerPC-440 FP toolchain updated for
+	SecurePLT fix.
+
+	pkg-stats: Fix python 3.8+ deprecation warning.
+
+	meson: Ensure ccache is not detected and used, as it may
+	conflict with the ccache handling in Buildroot.
+
+	Updated/fixed packages: barebox, boost, brltty, dbus,
+	docker-containerd, dovecot, dovecot-pigeonhole,
+	environment-setup, firmware-imx, gcc, gerbera, glibc,
+	gmrender-resurrect, igd2-for-linux, kodi-pvr-zattoo, libclc,
+	libfuse3, libllcp, libodb-mysql, libtorrent-rasterbar,
+	libupnp, lpc32xxcdl, luarocks, mpd, multipath-tools, mutt,
+	nfs-utils, nodejs, openjpeg, openldap, opentracing-cpp,
+	openvpn, p11-kit, paho-mqtt-c, php, poppler, postgresql,
+	python3, redis, resiprocate, rpm, runc, socat, sslh, sudo,
+	sunxi-mali-mainline-driver, syslog-ng, systemd, tini,
+	tpm2-tss, trace-cmd, tzdata, uboot-tools, uhd, ushare,
+	util-linux, vlc, wavpack, wireguard-linux-compat, wolfssl,
+	xapp_xload, xorriso, zic
+
+	Removed packages: libupnp18
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13471: package/mpd/mpd.conf make use of path not created
+
+2020.11.1, released December 27th, 2020
+
+	Important / security related fixes.
+
+	Infrastructure:
+	- cmake: fix host ccache handling for CMake 3.19
+	- meson: Forcibly disable binary stripping for
+	  target builds, enable for host builds
+	- golang: Fix HOST / TARGET directories for per-package builds
+
+	Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues
+
+	Updated/fixed packages: apitrace, arm-trusted-firmware,
+	ca-certificates, cryptopp, dhcpcd, dtv-scan-tables,
+	flare-engine, ghostscript, go, haproxy, imagemagick,
+	imx-gpu-viv, jasper, kismet, libcurl, libglib2, libhtp,
+	libopenssl, libressl, libuv, libuvw, lua, mbedtls, mongodb,
+	mutt, ncurses, netsnmp, nodejs, opencv3, openldap, opkg-utils,
+	paho-mqtt-c, python-crc16, python-lxml, python-pyparsing,
+	python-pyqt5, qt5base, rauc, shadowsocks-libev, sqlcipher,
+	suricata, ti-sgx-demos, tinycbor, uclibc-ng-test, unbound,
+	webkitgtk, wpewebkit, wireshark, x11vnc, xen,
+	xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13316: beaglebone_qt5_defconfig: PowerVR fails to start
+	#13416: dhcpcd start warning message: no such user dhcpcd
+
+2020.11, released December 2nd, 2020
+
+	Various fixes.
+
+	Updated/fixed packages: bustle, docker-containerd, gnuplot,
+	gst1-plugins-good, jemalloc, kmsxx, libcap, libplist,
+	libuhttpd, libxkbcommon, lynx, mariadb, netsurf, privoxy,
+	s390-tools, setserial, xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13276: libcap builds libcap.pc incorrectly
+
 2020.11-rc3, released November 28th, 2020
 
 	Fixes all over the tree.

buildroot/Config.in.legacy

@@ -146,6 +146,16 @@ endif
 
 comment "Legacy options removed in 2020.11"
 
+config BR2_PACKAGE_LIBUPNP18
+	bool "libupnp18 package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBUPNP
+	help
+	  Version 1.8.x of libupnp (i.e. libupnp18) has been removed
+	  because it will never be fixed against CallStranger a.k.a.
+	  CVE-2020-12695. The libupnp package (which has been updated to
+	  version 1.14.x) has been selected instead.
+
 config BR2_PACKAGE_OPENCV
 	bool "opencv package was removed"
 	select BR2_LEGACY

buildroot/DEVELOPERS

@@ -405,6 +405,7 @@ F:	package/perl-netaddr-ip/
 F:	package/perl-timedate/
 F:	package/perl-uri/
 F:	package/perl-www-robotrules/
+F:	package/php/
 F:	package/pixman/
 F:	package/pngquant/
 F:	package/pound/
@@ -851,7 +852,6 @@ F:	package/librsync/
 F:	package/libsoup/
 F:	package/libsoxr/
 F:	package/libupnp/
-F:	package/libupnp18/
 F:	package/libv4l/
 F:	package/libxslt/
 F:	package/mbedtls/
@@ -1033,11 +1033,6 @@ F:	package/python-redis/
 F:	package/python-rpi-ws281x/
 F:	package/python-wtforms/
 
-N:	Guillaume Gardet <guillaume.gardet@oliseo.fr>
-F:	package/c-icap/
-F:	package/c-icap-modules/
-F:	package/sdl2/
-
 N:	Guillaume William Brs <guillaume.bressaix@gmail.com>
 F:	package/libnids/
 F:	package/liquid-dsp/
@@ -1960,9 +1955,6 @@ F:	package/openjpeg/
 N:	Olivier Singla <olivier.singla@gmail.com>
 F:	package/shellinabox/
 
-N:	Owen Walpole <owen@walpole.dev>
-F:	package/parprouted/
-
 N:	Parnell Springmeyer <parnell@digitalmentat.com>
 F:	package/scrypt/
 
@@ -2168,10 +2160,6 @@ F:	package/gupnp-av/
 F:	package/let-me-create/
 F:	package/nanomsg/
 
-N:	Rahul Jain <rahul.jain@imgtec.com>
-F:	package/uhttpd/
-F:	package/ustream-ssl/
-
 N:	Ramon Fried <rfried.dev@gmail.com>
 F:	package/bitwise/
 
@@ -2257,6 +2245,7 @@ F:	package/ogre/
 F:	package/openpowerlink/
 F:	package/physfs/
 F:	package/piglit/
+F:	package/qemu/
 F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
@@ -2496,9 +2485,6 @@ N:	Thomas Claveirole <thomas.claveirole@green-communications.fr>
 F:	package/fcgiwrap/
 F:	package/openlayers/
 
-N:	Thomas Davis <sunsetbrew@sunsetbrew.com>
-F:	package/civetweb/
-
 N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/cereal/
@@ -2597,7 +2583,7 @@ F:	toolchain/
 N:	Timo Ketola <timo.ketola@exertus.fi>
 F:	package/fbgrab/
 
-N:	Titouan Christophe <titouan.christophe@railnova.eu>
+N:	Titouan Christophe <titouanchristophe@gmail.com>
 F:	package/avro-c/
 F:	package/mosquitto/
 F:	package/python-avro/

buildroot/Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2020.11-rc3
+export BR2_VERSION := 2020.11.3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1606558000
+BR2_VERSION_EPOCH = 1613586000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)