Merge pull request #432 from home-assistant/dev

Release 3.3

.github/release-drafter.yml

@@ -4,13 +4,11 @@ categories:
   - title: 'Build'
     label: 'build'
   - title: 'Raspberry Pi'
-    label: 'board/raspberrypi'
+    label: 'board/raspberry'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
   - title: 'Intel-Nuc'
     label: 'board/intel-nuc'
-  - title: 'Hardkernel'
-    label: 'board/hardkernel'
 template: |
   ## Changes
 

Documentation/boards/ova.md

@@ -4,7 +4,6 @@ Using this VMDK in a virtual machine requires the following:
 
 - Operating system: Other 4.x or later Linux (64-bit)
 - Enabled support for UEFI boot
-- SATA disk controller
 - Minimal of 1GB RAM
 - At least 2x vCPU
 - An assigned network
@@ -15,4 +14,6 @@ Currently, we only publish a VMDK virtual disk, due to issues with our previous
 
 - HyperV
 - VirtualBox
-- VMware
+- VMware
+
+You might need to convert the VMDK into a different format that is accepted by your virtualization platform of choice.

Documentation/boards/raspberrypi.md

@@ -2,7 +2,7 @@
 
 Supported Hardware:
 
-| Device | Board |
+| Device | Board | 
 |--------|-----------|
 | Raspberry Pi A+/B/B+| rpi |
 | Raspberry Pi Zero | rpi |
@@ -21,7 +21,7 @@ For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmd
 
 ## I2C
 
-Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
+Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`. 
 
 rpi-i2c.conf:
 ```
@@ -29,19 +29,6 @@ i2c-dev
 i2c-bcm2708
 ```
 
-## USB Boot
-
-USB mass storage boot is available on Raspberry Pi 3B, 3B+, 3A+, and 2B v1.2.
-To enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
-
-For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
-
-### Caveats
-
-* All bootable SD cards must be removed.
-* Boot time can be significantly longer with USB. This is due to the boot process first attempting to boot from SD card, failing, and resorting to USB.
-* Many USB drives simply do not work for boot. This is likely due to minimal driver support in uboot and will not be fixed. If you can't get it to boot on one drive, try a different brand/model. SanDisk Cruzer drives seem to have a higher rate of issues.
-
 ## Tweaks
 
 If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.

Documentation/kernel.md

@@ -3,10 +3,10 @@
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 4.19.88 |
-| Raspberry Pi | 4.19.88 |
-| Tinker Board | 4.19.88 |
-| Odroid-C2 | 4.19.88 |
-| Odroid-XU4 | 4.19.88 |
-| Orangepi-Prime | 4.19.88 |
-| Intel NUC | 4.19.88 |
+| Open Virtual Applicance | 4.19.56 |
+| Raspberry Pi | 4.19.58 |
+| Tinker Board | 4.19.56 |
+| Odroid-C2 | 4.19.56 |
+| Odroid-XU4 | 4.19.56 |
+| Orangepi-Prime | 4.19.56 |
+| Intel NUC | 4.19.56 |

buildroot-external/Config.in

@@ -4,4 +4,3 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"

buildroot-external/board/asus/tinker/patches/linux/1008-rockchip-dwc2-usb-partial-power-down.patch

@@ -0,0 +1,44 @@
+From 04fbf78e4e569bf872f1ffcb0a6f9b89569dc913 Mon Sep 17 00:00:00 2001
+From: Hal Emmerich <hal@halemmerich.com>
+Date: Thu, 19 Jul 2018 21:48:08 -0500
+Subject: [PATCH] usb: dwc2: disable power_down on rockchip devices
+
+ The bug would let the usb controller enter partial power down,
+ which was formally known as hibernate, upon boot if nothing was plugged
+ in to the port. Partial power down couldn't be exited properly, so any
+ usb devices plugged in after boot would not be usable.
+
+ Before the name change, params.hibernation was false by default, so
+ _dwc2_hcd_suspend() would skip entering hibernation. With the
+ rename, _dwc2_hcd_suspend() was changed to use  params.power_down
+ to decide whether or not to enter partial power down.
+
+ Since params.power_down is non-zero by default, it needs to be set
+ to 0 for rockchip devices to restore functionality.
+
+ This bug was reported in the linux-usb thread:
+ REGRESSION: usb: dwc2: USB device not seen after boot
+
+ The commit that caused this regression is:
+ 6d23ee9caa6790aea047f9aca7f3c03cb8d96eb6
+
+Signed-off-by: Hal Emmerich <hal@halemmerich.com>
+---
+ drivers/usb/dwc2/params.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
+index f03e418..492607a 100644
+--- a/drivers/usb/dwc2/params.c
++++ b/drivers/usb/dwc2/params.c
+@@ -82,6 +82,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
+ 	p->host_perio_tx_fifo_size = 256;
+ 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
+ 		GAHBCFG_HBSTLEN_SHIFT;
++	p->power_down = 0;
+ }
+ 
+ static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
+-- 
+2.11.0
+

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

@@ -3,6 +3,8 @@ CONFIG_EFI_STUB=y
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_USB_XHCI_HCD=y
 
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+
 CONFIG_IGB=y
 
 CONFIG_IWLWIFI=m

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

@@ -5,7 +5,6 @@ CONFIG_VMWARE_PVSCSI=y
 CONFIG_VMWARE_VMCI_VSOCKETS=y
 CONFIG_VMWARE_VMCI=y
 CONFIG_VMWARE_BALLOON=y
-CONFIG_VMWARE_PVSCSI=y
 
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
@@ -13,9 +12,6 @@ CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_SCSI_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y
 
 CONFIG_SCSI_LOWLEVEL=y
@@ -31,5 +27,4 @@ CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV_STORAGE=y
 CONFIG_HYPERV_NET=y
-CONFIG_HYPERV_VSOCKETS=m
 CONFIG_FB_HYPERV=y

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

@@ -7,9 +7,11 @@ function hassos_pre_image() {
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/u-boot.bin" \
         "${BINARIES_DIR}/boot.scr"
-    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
+    cp -t "${BOOT_DATA}" \
+        "${BINARIES_DIR}"/*.dtb \
+        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
     cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
-    cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
+    cp -f "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
 
     # Firmware
     if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
@@ -19,8 +21,7 @@ function hassos_pre_image() {
     else
         cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start.elf" \
-        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
+        "${BINARIES_DIR}/rpi-firmware/start.elf"
     fi
 
     # Set cmd options
@@ -28,7 +29,7 @@ function hassos_pre_image() {
 
     # Enable 64bit support
     if [[ "${BOARD_ID}" =~ "64" ]]; then
-        sed -i "s|#arm_64bit|arm_64bit|g" "${BOOT_DATA}/config.txt"
+        echo "arm_64bit=1" >> "${BOOT_DATA}/config.txt"
     fi
 }
 

buildroot-external/board/raspberrypi/kernel.config

@@ -0,0 +1 @@
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

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

@@ -1,62 +0,0 @@
-From 68e65b1e3859d4baf41d1e5f6525ff7ace778ba1 Mon Sep 17 00:00:00 2001
-From: Florin Sarbu <florin@balena.io>
-Date: Thu, 12 Sep 2019 12:31:31 +0200
-Subject: [PATCH] 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
-enabled in the kernel, just as Raspbian users might expect.
-See https://github.com/raspberrypi/linux/issues/3139
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Florin Sarbu <florin@balena.io>
----
- board/raspberrypi/rpi/rpi.c | 2 +-
- common/Makefile             | 2 +-
- include/configs/rpi.h       | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index 153a1fd..c7bd399 100644
---- a/board/raspberrypi/rpi/rpi.c
-+++ b/board/raspberrypi/rpi/rpi.c
-@@ -482,7 +482,7 @@ int ft_board_setup(void *blob, bd_t *bd)
- 	 * should be more intelligent, and e.g. only do this if no enabled DT
- 	 * node exists for the "real" graphics driver.
- 	 */
--	lcd_dt_simplefb_add_node(blob);
-+	//lcd_dt_simplefb_add_node(blob);
- 
- #ifdef CONFIG_EFI_LOADER
- 	/* Reserve the spin table */
-diff --git a/common/Makefile b/common/Makefile
-index 0de60b3..2848d98 100644
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -50,7 +50,7 @@ ifndef CONFIG_DM_VIDEO
- obj-$(CONFIG_LCD) += lcd.o lcd_console.o
- endif
- obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
--obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
-+//obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
- obj-$(CONFIG_LYNXKDI) += lynxkdi.o
- obj-$(CONFIG_MENU) += menu.o
- obj-$(CONFIG_UPDATE_TFTP) += update.o
-diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index a38bf20..e2760b0 100644
---- a/include/configs/rpi.h
-+++ b/include/configs/rpi.h
-@@ -60,8 +60,8 @@
- /* GPIO */
- #define CONFIG_BCM2835_GPIO
- /* LCD */
--#define CONFIG_LCD_DT_SIMPLEFB
--#define CONFIG_VIDEO_BCM2835
-+//#define CONFIG_LCD_DT_SIMPLEFB
-+//#define CONFIG_VIDEO_BCM2835
- 
- #ifdef CONFIG_CMD_USB
- #define CONFIG_TFTP_TSIZE
--- 
-2.7.4
-

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

@@ -1,82 +0,0 @@
-From 0f45c3f2f46b62f767ef225b258f927ad88ca360 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 10 Dec 2019 09:48:46 +0000
-Subject: [PATCH 1/1] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- configs/rpi_0_w_defconfig   | 2 +-
- configs/rpi_2_defconfig     | 2 +-
- configs/rpi_3_32b_defconfig | 2 +-
- configs/rpi_3_defconfig     | 2 +-
- configs/rpi_defconfig       | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index fe5a7763a6..ed7f9381e9 100644
---- a/configs/rpi_0_w_defconfig
-+++ b/configs/rpi_0_w_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index bf331c0ad0..52e3c3b234 100644
---- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index c2417a0ec9..191962f0f7 100644
---- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 4fa682539c..03a2356d3d 100644
---- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index 2c04b3334e..bf00d8b669 100644
---- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
- CONFIG_ENV_FAT_INTERFACE="mmc"
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
--- 
-2.17.1
-

buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/udev/rules.d/99-rpi.rules

@@ -1,21 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-	ALIASES=/proc/device-tree/aliases; \
-	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
-		echo 0;\
-	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
-		echo 1; \
-	else \
-		exit 1; \
-	fi\
-'", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-	ALIASES=/proc/device-tree/aliases; \
-	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
-		echo 0; \
-	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
-		echo 1; \
-	else \
-		exit 1; \
-	fi \
-'", SYMLINK+="serial%c"

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0001-configs-rpi4-Add-defconfig-for-rpi4-64.patch

@@ -0,0 +1,65 @@
+From 9f471bee7e230bc9b99155506388fb98903bd3c3 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sat, 6 Jul 2019 23:49:47 +0100
+Subject: [PATCH 01/17] configs: rpi4: Add defconfig for rpi4-64
+
+This config is based on the the rpi3 counterpart.
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ configs/rpi_4_defconfig | 43 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+ create mode 100644 configs/rpi_4_defconfig
+
+diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
+new file mode 100644
+index 0000000000..83d1bd0cdb
+--- /dev/null
++++ b/configs/rpi_4_defconfig
+@@ -0,0 +1,43 @@
++CONFIG_ARM=y
++CONFIG_ARCH_BCM283X=y
++CONFIG_SYS_TEXT_BASE=0x00080000
++CONFIG_TARGET_RPI_4=y
++CONFIG_SYS_MALLOC_F_LEN=0x2000
++CONFIG_DISTRO_DEFAULTS=y
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_OF_BOARD_SETUP=y
++CONFIG_MISC_INIT_R=y
++# CONFIG_DISPLAY_CPUINFO is not set
++# CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_SYS_PROMPT="U-Boot> "
++# CONFIG_CMD_FLASH is not set
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_MMC=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_FS_UUID=y
++CONFIG_OF_EMBED=y
++CONFIG_DEFAULT_DEVICE_TREE="bcm2838-rpi-4-b"
++CONFIG_ENV_FAT_INTERFACE="mmc"
++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
++CONFIG_DM_KEYBOARD=y
++CONFIG_DM_MMC=y
++CONFIG_MMC_SDHCI=y
++CONFIG_MMC_SDHCI_BCM2835=y
++CONFIG_PHYLIB=y
++CONFIG_DM_ETH=y
++CONFIG_PINCTRL=y
++# CONFIG_PINCTRL_GENERIC is not set
++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
++CONFIG_USB=y
++CONFIG_DM_USB=y
++CONFIG_USB_DWC2=y
++CONFIG_USB_KEYBOARD=y
++CONFIG_USB_HOST_ETHER=y
++CONFIG_USB_ETHER_LAN78XX=y
++CONFIG_USB_ETHER_SMSC95XX=y
++CONFIG_DM_VIDEO=y
++CONFIG_SYS_WHITE_ON_BLACK=y
++CONFIG_CONSOLE_SCROLL_LINES=10
++CONFIG_PHYS_TO_BUS=y
++CONFIG_OF_LIBFDT_OVERLAY=y
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0002-dts-Create-a-dtsi-for-BCM2835-6-7-specific-configura.patch

@@ -0,0 +1,208 @@
+From 24f5e0b88b88f2e47e420e6f2f123b8726c9f396 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sat, 6 Jul 2019 23:58:44 +0100
+Subject: [PATCH 02/17] dts: Create a dtsi for BCM2835/6/7 specific
+ configuration
+
+This follows a similar change in kernel[1]. The change moves
+configuration that was not applicable for all bcm2835/6/7/8 out of
+bcm283x.dtsi. The new file is bcm2835-common.dtsi and contains
+conifguration that is common for bcm2835/6/7 (not bcm2838).
+
+[1] https://github.com/raspberrypi/linux/commit/769a7330aa5bebcc98b1ff12ecb767db4e5c644d#diff-5979fba23a5bab2cf66dde09db872dfc
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ arch/arm/dts/bcm2835-common.dtsi | 53 ++++++++++++++++++++++++++++++++
+ arch/arm/dts/bcm2835.dtsi        |  1 +
+ arch/arm/dts/bcm2836.dtsi        |  1 +
+ arch/arm/dts/bcm2837.dtsi        |  1 +
+ arch/arm/dts/bcm283x.dtsi        | 45 +--------------------------
+ 5 files changed, 57 insertions(+), 44 deletions(-)
+ create mode 100644 arch/arm/dts/bcm2835-common.dtsi
+
+diff --git a/arch/arm/dts/bcm2835-common.dtsi b/arch/arm/dts/bcm2835-common.dtsi
+new file mode 100644
+index 0000000000..17771730a3
+--- /dev/null
++++ b/arch/arm/dts/bcm2835-common.dtsi
+@@ -0,0 +1,53 @@
++// SPDX-License-Identifier: GPL-2.0
++
++/* This include file covers the common peripherals and configuration between
++ * bcm2835, bcm2836 and bcm2837 implementations.
++ */
++
++/ {
++	soc {
++		timer@7e003000 {
++			compatible = "brcm,bcm2835-system-timer";
++			reg = <0x7e003000 0x1000>;
++			interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
++			/* This could be a reference to BCM2835_CLOCK_TIMER,
++			 * but we don't have the driver using the common clock
++			 * support yet.
++			 */
++			clock-frequency = <1000000>;
++		};
++
++		intc: interrupt-controller@7e00b200 {
++			compatible = "brcm,bcm2835-armctrl-ic";
++			reg = <0x7e00b200 0x200>;
++			interrupt-controller;
++			#interrupt-cells = <2>;
++		};
++
++		thermal: thermal@7e212000 {
++			compatible = "brcm,bcm2835-thermal";
++			reg = <0x7e212000 0x8>;
++			clocks = <&clocks BCM2835_CLOCK_TSENS>;
++			#thermal-sensor-cells = <0>;
++			status = "disabled";
++		};
++
++		v3d: v3d@7ec00000 {
++			compatible = "brcm,bcm2835-v3d";
++			reg = <0x7ec00000 0x1000>;
++			interrupts = <1 10>;
++		};
++	};
++};
++
++&gpio {
++	i2c_slave_gpio18: i2c_slave_gpio18 {
++		brcm,pins = <18 19 20 21>;
++		brcm,function = <BCM2835_FSEL_ALT3>;
++	};
++
++	jtag_gpio4: jtag_gpio4 {
++		brcm,pins = <4 5 6 12 13>;
++		brcm,function = <BCM2835_FSEL_ALT5>;
++	};
++};
+diff --git a/arch/arm/dts/bcm2835.dtsi b/arch/arm/dts/bcm2835.dtsi
+index a5c3824c80..53bf4579cc 100644
+--- a/arch/arm/dts/bcm2835.dtsi
++++ b/arch/arm/dts/bcm2835.dtsi
+@@ -1,5 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0
+ #include "bcm283x.dtsi"
++#include "bcm2835-common.dtsi"
+ 
+ / {
+ 	compatible = "brcm,bcm2835";
+diff --git a/arch/arm/dts/bcm2836.dtsi b/arch/arm/dts/bcm2836.dtsi
+index c933e84138..82d6c4662a 100644
+--- a/arch/arm/dts/bcm2836.dtsi
++++ b/arch/arm/dts/bcm2836.dtsi
+@@ -1,5 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0
+ #include "bcm283x.dtsi"
++#include "bcm2835-common.dtsi"
+ 
+ / {
+ 	compatible = "brcm,bcm2836";
+diff --git a/arch/arm/dts/bcm2837.dtsi b/arch/arm/dts/bcm2837.dtsi
+index beb6c502da..9e95fee78e 100644
+--- a/arch/arm/dts/bcm2837.dtsi
++++ b/arch/arm/dts/bcm2837.dtsi
+@@ -1,4 +1,5 @@
+ #include "bcm283x.dtsi"
++#include "bcm2835-common.dtsi"
+ 
+ / {
+ 	compatible = "brcm,bcm2837";
+diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi
+index 9777644c6c..a024727e4d 100644
+--- a/arch/arm/dts/bcm283x.dtsi
++++ b/arch/arm/dts/bcm283x.dtsi
+@@ -56,17 +56,6 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
+ 
+-		timer@7e003000 {
+-			compatible = "brcm,bcm2835-system-timer";
+-			reg = <0x7e003000 0x1000>;
+-			interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
+-			/* This could be a reference to BCM2835_CLOCK_TIMER,
+-			 * but we don't have the driver using the common clock
+-			 * support yet.
+-			 */
+-			clock-frequency = <1000000>;
+-		};
+-
+ 		txp@7e004000 {
+ 			compatible = "brcm,bcm2835-txp";
+ 			reg = <0x7e004000 0x20>;
+@@ -114,13 +103,6 @@
+ 			brcm,dma-channel-mask = <0x7f35>;
+ 		};
+ 
+-		intc: interrupt-controller@7e00b200 {
+-			compatible = "brcm,bcm2835-armctrl-ic";
+-			reg = <0x7e00b200 0x200>;
+-			interrupt-controller;
+-			#interrupt-cells = <2>;
+-		};
+-
+ 		pm: watchdog@7e100000 {
+ 			compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
+ 			#power-domain-cells = <1>;
+@@ -184,8 +166,7 @@
+ 			interrupt-controller;
+ 			#interrupt-cells = <2>;
+ 
+-			/* Defines pin muxing groups according to
+-			 * BCM2835-ARM-Peripherals.pdf page 102.
++			/* Defines common pin muxing groups
+ 			 *
+ 			 * While each pin can have its mux selected
+ 			 * for various functions individually, some
+@@ -263,15 +244,6 @@
+ 				brcm,pins = <44 45>;
+ 				brcm,function = <BCM2835_FSEL_ALT2>;
+ 			};
+-			i2c_slave_gpio18: i2c_slave_gpio18 {
+-				brcm,pins = <18 19 20 21>;
+-				brcm,function = <BCM2835_FSEL_ALT3>;
+-			};
+-
+-			jtag_gpio4: jtag_gpio4 {
+-				brcm,pins = <4 5 6 12 13>;
+-				brcm,function = <BCM2835_FSEL_ALT5>;
+-			};
+ 			jtag_gpio22: jtag_gpio22 {
+ 				brcm,pins = <22 23 24 25 26 27>;
+ 				brcm,function = <BCM2835_FSEL_ALT4>;
+@@ -488,14 +460,6 @@
+ 
+ 		};
+ 
+-		thermal: thermal@7e212000 {
+-			compatible = "brcm,bcm2835-thermal";
+-			reg = <0x7e212000 0x8>;
+-			clocks = <&clocks BCM2835_CLOCK_TSENS>;
+-			#thermal-sensor-cells = <0>;
+-			status = "disabled";
+-		};
+-
+ 		aux: aux@7e215000 {
+ 			compatible = "brcm,bcm2835-aux";
+ 			#clock-cells = <1>;
+@@ -635,13 +599,6 @@
+ 			phy-names = "usb2-phy";
+ 		};
+ 
+-		v3d: v3d@7ec00000 {
+-			compatible = "brcm,bcm2835-v3d";
+-			reg = <0x7ec00000 0x1000>;
+-			interrupts = <1 10>;
+-			power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
+-		};
+-
+ 		vc4: gpu {
+ 			compatible = "brcm,bcm2835-vc4";
+ 		};
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0003-dts-Add-initial-support-for-bcm2838.patch

@@ -0,0 +1,337 @@
+From d7532dbcde253d824d4fe3d1f1f40e92e62ad291 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sun, 7 Jul 2019 00:12:36 +0100
+Subject: [PATCH 03/17] dts: Add initial support for bcm2838
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ arch/arm/dts/Makefile            |   4 +-
+ arch/arm/dts/bcm2838-rpi-4-b.dts |  56 ++++++++
+ arch/arm/dts/bcm2838.dtsi        | 237 +++++++++++++++++++++++++++++++
+ 3 files changed, 296 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/dts/bcm2838-rpi-4-b.dts
+ create mode 100644 arch/arm/dts/bcm2838.dtsi
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 20dbc2ff84..16790af1e1 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -749,7 +749,9 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
+ 	bcm2837-rpi-3-a-plus.dtb \
+ 	bcm2837-rpi-3-b.dtb \
+ 	bcm2837-rpi-3-b-plus.dtb \
+-	bcm2837-rpi-cm3-io3.dtb
++	bcm2837-rpi-cm3-io3.dtb \
++	bcm2837-rpi-3-b.dtb \
++	bcm2838-rpi-4-b.dtb
+ 
+ dtb-$(CONFIG_ARCH_BCM63158) += \
+ 	bcm963158.dtb
+diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts
+new file mode 100644
+index 0000000000..07e9a78e8d
+--- /dev/null
++++ b/arch/arm/dts/bcm2838-rpi-4-b.dts
+@@ -0,0 +1,56 @@
++/dts-v1/;
++#include "bcm2838.dtsi"
++
++/ {
++	compatible = "raspberrypi,4-model-b","brcm,bcm2838","brcm,bcm2837";
++	model = "Raspberry Pi 4 Model B";
++
++	memory {
++		reg = <0 0 0x40000000>;
++	};
++
++	leds {
++		act {
++			gpios = <&gpio 47 0>;
++		};
++	};
++};
++
++/* uart0 communicates with the BT module */
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
++	status = "okay";
++};
++
++/* uart1 is mapped to the pin header */
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++	status = "okay";
++};
++
++/* SDHCI is used to control the SDIO for wireless */
++&sdhci {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emmc_gpio34>;
++	status = "okay";
++	bus-width = <4>;
++	non-removable;
++};
++
++/* SDHOST is used to drive the SD card */
++&sdhost {
++	pinctrl-names = "default";
++	pinctrl-0 = <&sdhost_gpio48>;
++	status = "okay";
++	bus-width = <4>;
++};
++
++&gpio {
++	uart1_pins: uart1_pins {                                                                                                                                                                                  
++        	brcm,pins;                                                                                                                                                                                        
++		brcm,function;                                                                                                                                                                                    
++		brcm,pull;                                                                                                                                                                                        
++	};
++};
+diff --git a/arch/arm/dts/bcm2838.dtsi b/arch/arm/dts/bcm2838.dtsi
+new file mode 100644
+index 0000000000..19b2d7b905
+--- /dev/null
++++ b/arch/arm/dts/bcm2838.dtsi
+@@ -0,0 +1,237 @@
++#include "bcm283x.dtsi"
++#include <dt-bindings/interrupt-controller/arm-gic.h>
++#include <dt-bindings/power/raspberrypi-power.h>
++
++/ {
++	compatible = "brcm,bcm2838";
++
++	#address-cells = <2>;
++	#size-cells = <1>;
++
++	interrupt-parent = <&gic>;
++
++	soc {
++		ranges = <0x7e000000  0x0 0xfe000000  0x01800000>,
++			 <0x7c000000  0x0 0xfc000000  0x02000000>,
++			 <0x40000000  0x0 0xff800000  0x00800000>;
++		dma-ranges = <0xc0000000  0x0 0x00000000  0x3c000000>;
++
++		gic: gic400@40041000 {
++			interrupt-controller;
++			#interrupt-cells = <3>;
++			compatible = "arm,gic-400";
++			reg = 	<0x40041000 0x1000>,
++				<0x40042000 0x2000>,
++				<0x40044000 0x2000>,
++				<0x40046000 0x2000>;
++		};
++
++		thermal: thermal@7d5d2200 {
++			compatible = "brcm,avs-tmon-bcm2838";
++			reg = <0x7d5d2200 0x2c>;
++			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "tmon";
++			clocks = <&clocks BCM2835_CLOCK_TSENS>;
++			#thermal-sensor-cells = <0>;
++			status = "okay";
++		};
++
++		spi@7e204000 {                               
++                        reg = <0x7e204000 0x0200>;                                      
++                        interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
++                };
++
++                pixelvalve@7e206000 {                          
++                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
++                };                                                 
++                                                                   
++                pixelvalve@7e207000 {                              
++                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
++                };                                                 
++                                                                   
++                hvs@7e400000 {          
++                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
++                };                                                
++		
++		emmc2: emmc2@7e340000 {
++                        compatible = "brcm,bcm2711-emmc2";
++                        status = "okay";
++                        interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
++                        clocks = <&clocks BCM2838_CLOCK_EMMC2>;
++                        reg = <0x7e340000 0x100>;
++                };
++                                                       
++                pixelvalve@7e807000 {                                  
++                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
++                };	
++			
++	};
++
++        arm-pmu {
++                /*
++                 * N.B. the A72 PMU support only exists in arch/arm64, hence
++                 * the fallback to the A53 version.
++                 */
++                compatible = "arm,cortex-a72-pmu", "arm,cortex-a53-pmu";
++                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
++                        <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
++                        <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
++                        <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
++        };
++
++	timer {
++		compatible = "arm,armv7-timer";
++		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) |
++					IRQ_TYPE_LEVEL_LOW)>,
++			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) |
++					IRQ_TYPE_LEVEL_LOW)>,
++			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | 
++					IRQ_TYPE_LEVEL_LOW)>,
++			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | 
++					IRQ_TYPE_LEVEL_LOW)>;
++		arm,cpu-registers-not-fw-configured; 
++		always-on;
++	};
++
++	cpus: cpus {
++		#address-cells = <1>;
++		#size-cells = <0>;
++		enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit
++
++		cpu0: cpu@0 {
++			device_type = "cpu";
++			compatible = "arm,cortex-a72";
++			reg = <0>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000d8>;
++		};
++
++		cpu1: cpu@1 {
++			device_type = "cpu";
++			compatible = "arm,cortex-a72";
++			reg = <1>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000e0>;
++		};
++
++		cpu2: cpu@2 {
++			device_type = "cpu";
++			compatible = "arm,cortex-a72";
++			reg = <2>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000e8>;
++		};
++
++		cpu3: cpu@3 {
++			device_type = "cpu";
++			compatible = "arm,cortex-a72";
++			reg = <3>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000f0>;
++		};
++	};
++};
++
++&clk_osc {
++	clock-frequency = <54000000>;
++};
++
++&clocks {
++	compatible = "brcm,bcm2838-cprman";
++};
++
++&cpu_thermal {
++	coefficients = <(-487)	410040>;
++};
++
++&dsi0 {                                                                     
++        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;                
++};                                                                           
++                                                                        
++&dsi1 {                                                                      
++        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;                   
++};
++
++&gpio {
++	compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio";
++	interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
++		     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
++		     <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
++		     <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&vec {
++        interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&usb {
++        interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&hdmi {
++        interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
++                     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&uart1 {
++	interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&spi1 {
++        interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&spi2 {
++        interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&i2c0 {                                             
++        interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
++}; 
++
++&i2c1 {
++        interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&i2c2 {
++        interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&mailbox {                                                   
++        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&sdhost {
++        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&uart0 {
++        interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&dma {
++        reg = <0x7e007000 0xb00>;
++        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
++                <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, /* dmalite  7 */
++                <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, /* dmalite  8 */
++                <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>, /* dmalite  9 */
++                <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; /* dmalite 10 */
++        interrupt-names = "dma0",
++                          "dma1",
++                          "dma2",
++                          "dma3",
++                          "dma4",
++                          "dma5",
++                          "dma6",
++                          "dma7",
++                          "dma8",
++                          "dma9",
++                          "dma10";
++        brcm,dma-channel-mask = <0x07f5>;
++};
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0004-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch

@@ -0,0 +1,66 @@
+From 865218f2dc973492c872dac51a66cff1833c916a Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sun, 7 Jul 2019 00:21:33 +0100
+Subject: [PATCH 04/17] arm: mach-bcm283x: Define configs for RaspberryPi 4
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ arch/arm/mach-bcm283x/Kconfig | 35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
+index 3eb5a9a897..d5069fe688 100644
+--- a/arch/arm/mach-bcm283x/Kconfig
++++ b/arch/arm/mach-bcm283x/Kconfig
+@@ -26,6 +26,23 @@ config BCM2837_64B
+ 	select BCM2837
+ 	select ARM64
+ 
++config BCM2838
++	bool "Broadcom BCM2838 SoC support"
++	depends on ARCH_BCM283X
++
++config BCM2838_32B
++	bool "Broadcom BCM2838 SoC 32-bit support"
++	depends on ARCH_BCM283X
++	select BCM2838
++	select ARMV7_LPAE
++	select CPU_V7A
++
++config BCM2838_64B
++	bool "Broadcom BCM2838 SoC 64-bit support"
++	depends on ARCH_BCM283X
++	select BCM2838
++	select ARM64
++
+ menu "Broadcom BCM283X family"
+ 	depends on ARCH_BCM283X
+ 
+@@ -127,6 +144,24 @@ config TARGET_RPI_3
+ 	  This option creates a build targeting the ARMv8/AArch64 ISA.
+ 	select BCM2837_64B
+ 
++config TARGET_RPI_4
++	bool "Raspberry Pi 4 64-bit build"
++	help
++	  Support for all BCM2838-based Raspberry Pi variants, such as
++	  the RPi 4 model B, in AArch64 (64-bit) mode.
++
++	  This option creates a build targeting the ARMv8/AArch64 ISA.
++	select BCM2838_64B
++
++config TARGET_RPI_4_32B
++	bool "Raspberry Pi 4 32-bit build"
++	help
++	  Support for all BCM2838-based Raspberry Pi variants, such as
++	  the RPi 4 model B, in AArch32 (32-bit) mode.
++
++	  This option creates a build targeting the ARMv7/AArch32 ISA.
++	select BCM2838_32B
++
+ endchoice
+ 
+ config SYS_BOARD
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0005-arm-mach-bcm283x-Define-mbox-address-for-BCM2838.patch

@@ -0,0 +1,34 @@
+From 98ae56bf35b2102310d2e88f56639e9055aa10be Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sun, 7 Jul 2019 00:23:15 +0100
+Subject: [PATCH 05/17] arm: mach-bcm283x: Define mbox address for BCM2838
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ arch/arm/mach-bcm283x/include/mach/mbox.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
+index e3a893e49c..2d711daaa8 100644
+--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
+@@ -38,11 +38,16 @@
+ /* Raw mailbox HW */
+ 
+ #ifndef CONFIG_BCM2835
++#ifdef CONFIG_BCM2838
++#define BCM2835_MBOX_PHYSADDR	0xfe00b880
++#else
+ #define BCM2835_MBOX_PHYSADDR	0x3f00b880
++#endif
+ #else
+ #define BCM2835_MBOX_PHYSADDR	0x2000b880
+ #endif
+ 
++
+ struct bcm2835_mbox_regs {
+ 	u32 read;
+ 	u32 rsvd0[5];
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0006-rpi-Add-rpi_model-entry-for-RaspberryPi-4.patch

@@ -0,0 +1,29 @@
+From eef9e7760c367dd848ac90780ecce8dcd82d9bb4 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sun, 7 Jul 2019 00:25:58 +0100
+Subject: [PATCH 06/17] rpi: Add rpi_model entry for RaspberryPi 4
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ board/raspberrypi/rpi/rpi.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
+index 617c892dde..6d6f1ef39a 100644
+--- a/board/raspberrypi/rpi/rpi.c
++++ b/board/raspberrypi/rpi/rpi.c
+@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
+ 		DTB_DIR "bcm2837-rpi-cm3.dtb",
+ 		false,
+ 	},
++	[0x11] = {
++		"4 Model B",
++		DTB_DIR "bcm2711-rpi-4-b.dtb",
++		true,
++	},
+ };
+ 
+ static const struct rpi_model rpi_models_old_scheme[] = {
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0007-dt-bindings-Define-BCM2838_CLOCK_EMMC2-needed-for-Ra.patch

@@ -0,0 +1,27 @@
+From fe0cff5d5f6e6fa56d83f04166d402ca13a0f23c Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Sun, 7 Jul 2019 00:31:27 +0100
+Subject: [PATCH 07/17] dt-bindings: Define BCM2838_CLOCK_EMMC2 needed for
+ RaspberryPi 4
+
+On BCM2838 there is an additional clock. This clock was added in the
+same bcm2835-cprman driver and is used by the emmc2 dt node.
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ include/dt-bindings/clock/bcm2835.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h
+index 2cec01f968..457fd4e23c 100644
+--- a/include/dt-bindings/clock/bcm2835.h
++++ b/include/dt-bindings/clock/bcm2835.h
+@@ -58,3 +58,5 @@
+ #define BCM2835_CLOCK_DSI1E		48
+ #define BCM2835_CLOCK_DSI0P		49
+ #define BCM2835_CLOCK_DSI1P		50
++
++#define BCM2838_CLOCK_EMMC2            51
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0008-arm-bcm283x-Include-definition-for-additional-emmc-c.patch

@@ -0,0 +1,31 @@
+From 05c24bc9579b958f637ca1497387a6149581c644 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Fri, 12 Jul 2019 11:26:10 +0100
+Subject: [PATCH 08/17] arm: bcm283x: Include definition for additional emmc
+ clock
+
+This clock has a different mbox ID[1] so have this included in the
+relevant header file.
+
+[1] https://github.com/raspberrypi/firmware/issues/1179
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ arch/arm/mach-bcm283x/include/mach/mbox.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
+index 2d711daaa8..cad035e8cd 100644
+--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
+@@ -239,6 +239,7 @@ struct bcm2835_mbox_tag_set_power_state {
+ #define BCM2835_MBOX_CLOCK_ID_SDRAM	8
+ #define BCM2835_MBOX_CLOCK_ID_PIXEL	9
+ #define BCM2835_MBOX_CLOCK_ID_PWM	10
++#define BCM2835_MBOX_CLOCK_ID_EMMC2	12
+ 
+ struct bcm2835_mbox_tag_get_clock_rate {
+ 	struct bcm2835_mbox_tag_hdr tag_hdr;
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0009-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch

@@ -0,0 +1,51 @@
+From 6e0d51199f2d089c84f45202587a9f17abd1ab0a Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Wed, 10 Jul 2019 13:24:36 +0200
+Subject: [PATCH 09/17] mmc: bcm2835_sdhci: Add support for bcm2711 device
+
+The bcm2711 has two emmc controller. The difference is the clocks
+they use. Add support for the second emmc contoller.
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
+index 08bddd410e..e68dec3be7 100644
+--- a/drivers/mmc/bcm2835_sdhci.c
++++ b/drivers/mmc/bcm2835_sdhci.c
+@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
+ 	fdt_addr_t base;
+ 	int emmc_freq;
+ 	int ret;
++	int clock_id = (int)dev_get_driver_data(dev);
+ 
+ 	base = devfdt_get_addr(dev);
+ 	if (base == FDT_ADDR_T_NONE)
+ 		return -EINVAL;
+ 
+-	ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC);
++	ret = bcm2835_get_mmc_clock(clock_id);
+ 	if (ret < 0) {
+ 		debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret);
+ 		return ret;
+@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
+ }
+ 
+ static const struct udevice_id bcm2835_sdhci_match[] = {
+-	{ .compatible = "brcm,bcm2835-sdhci" },
++	{
++		.compatible = "brcm,bcm2835-sdhci",
++		.data = BCM2835_MBOX_CLOCK_ID_EMMC
++	},
++	{
++		.compatible = "brcm,bcm2711-emmc2",
++		.data = BCM2835_MBOX_CLOCK_ID_EMMC2
++	},
+ 	{ /* sentinel */ }
+ };
+ 
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch

@@ -0,0 +1,63 @@
+From c00c6048006ebe1822355b6ba4f2da8ccebb4786 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Fri, 12 Jul 2019 11:38:11 +0100
+Subject: [PATCH 10/17] arm: bcm283x: Define device base addresses for bcm2835
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ arch/arm/mach-bcm283x/include/mach/sdhci.h | 4 ++++
+ arch/arm/mach-bcm283x/include/mach/timer.h | 4 ++++
+ arch/arm/mach-bcm283x/include/mach/wdog.h  | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h
+index 5cb6ec3340..262b016a1b 100644
+--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
++++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
+@@ -7,7 +7,11 @@
+ #define _BCM2835_SDHCI_H_
+ 
+ #ifndef CONFIG_BCM2835
++#ifdef CONFIG_BCM2838
++#define BCM2835_SDHCI_BASE 0xfe300000
++#else
+ #define BCM2835_SDHCI_BASE 0x3f300000
++#endif
+ #else
+ #define BCM2835_SDHCI_BASE 0x20300000
+ #endif
+diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h
+index 56b0c356bb..dc3ed98879 100644
+--- a/arch/arm/mach-bcm283x/include/mach/timer.h
++++ b/arch/arm/mach-bcm283x/include/mach/timer.h
+@@ -7,7 +7,11 @@
+ #define _BCM2835_TIMER_H
+ 
+ #ifndef CONFIG_BCM2835
++#ifdef CONFIG_BCM2838
++#define BCM2835_TIMER_PHYSADDR	0xfe003000
++#else
+ #define BCM2835_TIMER_PHYSADDR	0x3f003000
++#endif
+ #else
+ #define BCM2835_TIMER_PHYSADDR	0x20003000
+ #endif
+diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h
+index 99c88e5df7..ef040f385d 100644
+--- a/arch/arm/mach-bcm283x/include/mach/wdog.h
++++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
+@@ -7,7 +7,11 @@
+ #define _BCM2835_WDOG_H
+ 
+ #ifndef CONFIG_BCM2835
++#ifdef CONFIG_BCM2838
++#define BCM2835_WDOG_PHYSADDR			0xfe100000
++#else
+ #define BCM2835_WDOG_PHYSADDR			0x3f100000
++#endif
+ #else
+ #define BCM2835_WDOG_PHYSADDR			0x20100000
+ #endif
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0011-bcm2835-video-Bail-out-early-if-querying-video-infor.patch

@@ -0,0 +1,36 @@
+From d0357e50e58894eeb9dcbb1497689b410b667f08 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.com>
+Date: Fri, 28 Jun 2019 14:14:01 +0200
+Subject: [PATCH 11/17] bcm2835 video: Bail out early if querying video
+ information fails
+
+Otherwise there is a crash with newer RPi firmware, see
+https://github.com/raspberrypi/firmware/issues/1157
+---
+ drivers/video/bcm2835.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
+index bc41090aed..4c7962cad8 100644
+--- a/drivers/video/bcm2835.c
++++ b/drivers/video/bcm2835.c
+@@ -19,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev)
+ 
+ 	debug("bcm2835: Query resolution...\n");
+ 	ret = bcm2835_get_video_size(&w, &h);
+-	if (ret)
++	if (ret || w == 0 || h == 0)
+ 		return -EIO;
+ 
+ 	debug("bcm2835: Setting up display for %d x %d\n", w, h);
+ 	ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB,
+ 				       BCM2835_MBOX_ALPHA_MODE_IGNORED,
+ 				       &fb_base, &fb_size, &pitch);
++	if(ret)
++		return -EIO;
+ 
+ 	debug("bcm2835: Final resolution is %d x %d\n", w, h);
+ 
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0012-bcm283x-mbox-Correctly-wait-for-space-to-send.patch

@@ -0,0 +1,65 @@
+From 2cbeae8a88c3f50e322a2434cbbf37bfe0b76d9a Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.com>
+Date: Fri, 28 Jun 2019 14:25:53 +0200
+Subject: [PATCH 12/17] bcm283x mbox: Correctly wait for space to send
+
+For sending, the second mailbox is used, but previously the status register of
+the first one was read.
+---
+ arch/arm/mach-bcm283x/include/mach/mbox.h | 7 +++++--
+ arch/arm/mach-bcm283x/mbox.c              | 6 +++---
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
+index cad035e8cd..cd78966150 100644
+--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
+@@ -51,9 +51,12 @@
+ struct bcm2835_mbox_regs {
+ 	u32 read;
+ 	u32 rsvd0[5];
+-	u32 status;
+-	u32 config;
++	u32 status_r;
++	u32 config_r;
+ 	u32 write;
++	u32 rsvd1[5];
++	u32 status_w;
++	u32 config_w;
+ };
+ 
+ #define BCM2835_MBOX_STATUS_WR_FULL	0x80000000
+diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
+index 1642ebd103..f7483bf423 100644
+--- a/arch/arm/mach-bcm283x/mbox.c
++++ b/arch/arm/mach-bcm283x/mbox.c
+@@ -27,7 +27,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv)
+ 	/* Drain any stale responses */
+ 
+ 	for (;;) {
+-		val = readl(&regs->status);
++		val = readl(&regs->status_r);
+ 		if (val & BCM2835_MBOX_STATUS_RD_EMPTY)
+ 			break;
+ 		if (get_timer(0) >= endtime) {
+@@ -40,7 +40,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv)
+ 	/* Wait for space to send */
+ 
+ 	for (;;) {
+-		val = readl(&regs->status);
++		val = readl(&regs->status_w);
+ 		if (!(val & BCM2835_MBOX_STATUS_WR_FULL))
+ 			break;
+ 		if (get_timer(0) >= endtime) {
+@@ -58,7 +58,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv)
+ 	/* Wait for the response */
+ 
+ 	for (;;) {
+-		val = readl(&regs->status);
++		val = readl(&regs->status_r);
+ 		if (!(val & BCM2835_MBOX_STATUS_RD_EMPTY))
+ 			break;
+ 		if (get_timer(0) >= endtime) {
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0013-config-rpi4-Add-defconfig-for-rpi4-32.patch

@@ -0,0 +1,63 @@
+From 21a3e9ed27f83d83851cbee57ee6d83a58ef2775 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Fri, 12 Jul 2019 11:55:52 +0100
+Subject: [PATCH 13/17] config: rpi4: Add defconfig for rpi4-32
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ configs/rpi_4_32b_defconfig | 43 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+ create mode 100644 configs/rpi_4_32b_defconfig
+
+diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
+new file mode 100644
+index 0000000000..9f2b805d0f
+--- /dev/null
++++ b/configs/rpi_4_32b_defconfig
+@@ -0,0 +1,43 @@
++CONFIG_ARM=y
++CONFIG_ARCH_BCM283X=y
++CONFIG_SYS_TEXT_BASE=0x00008000
++CONFIG_TARGET_RPI_4_32B=y
++CONFIG_SYS_MALLOC_F_LEN=0x2000
++CONFIG_DISTRO_DEFAULTS=y
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_OF_BOARD_SETUP=y
++CONFIG_MISC_INIT_R=y
++# CONFIG_DISPLAY_CPUINFO is not set
++# CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_SYS_PROMPT="U-Boot> "
++# CONFIG_CMD_FLASH is not set
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_MMC=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_FS_UUID=y
++CONFIG_OF_EMBED=y
++CONFIG_DEFAULT_DEVICE_TREE="bcm2838-rpi-4-b"
++CONFIG_ENV_FAT_INTERFACE="mmc"
++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
++CONFIG_DM_KEYBOARD=y
++CONFIG_DM_MMC=y
++CONFIG_MMC_SDHCI=y
++CONFIG_MMC_SDHCI_BCM2835=y
++CONFIG_PHYLIB=y
++CONFIG_DM_ETH=y
++CONFIG_PINCTRL=y
++# CONFIG_PINCTRL_GENERIC is not set
++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
++CONFIG_USB=y
++CONFIG_DM_USB=y
++CONFIG_USB_DWC2=y
++CONFIG_USB_KEYBOARD=y
++CONFIG_USB_HOST_ETHER=y
++CONFIG_USB_ETHER_LAN78XX=y
++CONFIG_USB_ETHER_SMSC95XX=y
++CONFIG_DM_VIDEO=y
++CONFIG_SYS_WHITE_ON_BLACK=y
++CONFIG_CONSOLE_SCROLL_LINES=10
++CONFIG_PHYS_TO_BUS=y
++CONFIG_OF_LIBFDT_OVERLAY=y
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0014-dts-bcm2838-rpi-4-b-Use-the-emmc2-interface-for-sdhc.patch

@@ -0,0 +1,45 @@
+From 07801a834dfe2d53827ad5a61fe3d59776e0c5b1 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Fri, 12 Jul 2019 11:58:42 +0100
+Subject: [PATCH 14/17] dts: bcm2838-rpi-4-b: Use the emmc2 interface for sdhci
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ arch/arm/dts/bcm2838-rpi-4-b.dts | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts
+index 07e9a78e8d..168179c17c 100644
+--- a/arch/arm/dts/bcm2838-rpi-4-b.dts
++++ b/arch/arm/dts/bcm2838-rpi-4-b.dts
+@@ -30,21 +30,17 @@
+ 	status = "okay";
+ };
+ 
+-/* SDHCI is used to control the SDIO for wireless */
+ &sdhci {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&emmc_gpio34>;
+-	status = "okay";
+-	bus-width = <4>;
+-	non-removable;
++	status = "disabled";
+ };
+ 
+-/* SDHOST is used to drive the SD card */
+ &sdhost {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&sdhost_gpio48>;
++	status = "disabled";
++};
++
++&emmc2 {
++	compatible = "brcm,bcm2835-sdhci";
+ 	status = "okay";
+-	bus-width = <4>;
+ };
+ 
+ &gpio {
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0015-rpi-Add-memory-map-for-bcm2838.patch

@@ -0,0 +1,58 @@
+From bfa71106beb565c2f3bc2f5f948477e0d3801285 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Fri, 12 Jul 2019 14:27:31 +0100
+Subject: [PATCH 15/17] rpi: Add memory map for bcm2838
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++---
+ 1 file changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
+index 6d6f1ef39a..4242ef35a4 100644
+--- a/board/raspberrypi/rpi/rpi.c
++++ b/board/raspberrypi/rpi/rpi.c
+@@ -249,7 +249,8 @@ static uint32_t rev_type;
+ static const struct rpi_model *model;
+ 
+ #ifdef CONFIG_ARM64
+-static struct mm_region bcm2837_mem_map[] = {
++#ifndef CONFIG_BCM2838
++static struct mm_region bcm283x_mem_map[] = {
+ 	{
+ 		.virt = 0x00000000UL,
+ 		.phys = 0x00000000UL,
+@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = {
+ 		0,
+ 	}
+ };
+-
+-struct mm_region *mem_map = bcm2837_mem_map;
++#else
++static struct mm_region bcm283x_mem_map[] = {
++	{
++		.virt = 0x00000000UL,
++		.phys = 0x00000000UL,
++		.size = 0xf3000000UL,
++		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
++			 PTE_BLOCK_INNER_SHARE
++	}, {
++		.virt = 0xfe000000UL,
++		.phys = 0xfe000000UL,
++		.size = 0x01800000UL,
++		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
++			 PTE_BLOCK_NON_SHARE |
++			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
++	}, {
++		/* List terminator */
++		0,
++	}
++};
++#endif
++struct mm_region *mem_map = bcm283x_mem_map;
+ #endif
+ 
+ int dram_init(void)
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0016-configs-rpi4-Remove-DWC2-and-USB_ETHER-configs.patch

@@ -0,0 +1,52 @@
+From c73747171c8a91e204405e144d0906c439d3bff3 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Mon, 15 Jul 2019 14:05:25 +0100
+Subject: [PATCH 16/17] configs: rpi4: Remove DWC2 and USB_ETHER configs
+
+dwc2 is only connected to the usb-c port so we don't have any real
+benefit in having it enabled in uboot.
+
+Also, the GENET interface is connected directly to the SoC so we can
+drop the USB_ETHER configs.
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ configs/rpi_4_32b_defconfig | 3 ---
+ configs/rpi_4_defconfig     | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
+index 9f2b805d0f..b71a14735a 100644
+--- a/configs/rpi_4_32b_defconfig
++++ b/configs/rpi_4_32b_defconfig
+@@ -31,11 +31,8 @@ CONFIG_PINCTRL=y
+ # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+ CONFIG_USB=y
+ CONFIG_DM_USB=y
+-CONFIG_USB_DWC2=y
+ CONFIG_USB_KEYBOARD=y
+ CONFIG_USB_HOST_ETHER=y
+-CONFIG_USB_ETHER_LAN78XX=y
+-CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_DM_VIDEO=y
+ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
+index 83d1bd0cdb..b27e3f823b 100644
+--- a/configs/rpi_4_defconfig
++++ b/configs/rpi_4_defconfig
+@@ -31,11 +31,8 @@ CONFIG_PINCTRL=y
+ # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+ CONFIG_USB=y
+ CONFIG_DM_USB=y
+-CONFIG_USB_DWC2=y
+ CONFIG_USB_KEYBOARD=y
+ CONFIG_USB_HOST_ETHER=y
+-CONFIG_USB_ETHER_LAN78XX=y
+-CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_DM_VIDEO=y
+ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/rpi4/patches/uboot/0017-dts-bcm2838-rpi-4-b-Use-the-emmc2-2811-compatible-st.patch

@@ -0,0 +1,27 @@
+From 62b6e39a53c56a9085aeab1b47b5cc6020fcdb6f Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@balena.io>
+Date: Mon, 15 Jul 2019 14:11:10 +0100
+Subject: [PATCH 17/17] dts: bcm2838-rpi-4-b: Use the emmc2/2811 compatible
+ string for SDHCI
+
+Signed-off-by: Andrei Gherzan <andrei@balena.io>
+---
+ arch/arm/dts/bcm2838-rpi-4-b.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts
+index 168179c17c..b7241be3fd 100644
+--- a/arch/arm/dts/bcm2838-rpi-4-b.dts
++++ b/arch/arm/dts/bcm2838-rpi-4-b.dts
+@@ -39,7 +39,7 @@
+ };
+ 
+ &emmc2 {
+-	compatible = "brcm,bcm2835-sdhci";
++	compatible = "brcm,bcm2711-emmc2";
+ 	status = "okay";
+ };
+ 
+-- 
+2.17.1
+

buildroot-external/board/raspberrypi/uboot-boot.ush

@@ -1,16 +1,15 @@
 
-part start ${devtype} ${devnum} 6 dev_env
-${devtype} dev ${devnum}
-
+part start mmc ${devnum} 6 mmc_env
+mmc dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${dev_env} 0x20; \
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \
     env import -c ${ramdisk_addr_r} 0x4000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -38,14 +37,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:2 ${kernel_addr_r} zImage"
+      setenv load_kernel "ext4load mmc 0:2 ${kernel_addr_r} zImage"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_a} rauc.slot=A"
     fi
   elif test "x${BOOT_SLOT}" = "xB"; then
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:4 ${kernel_addr_r} zImage"
+      setenv load_kernel "ext4load mmc 0:4 ${kernel_addr_r} zImage"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_b} rauc.slot=B"
     fi
   fi

buildroot-external/board/raspberrypi/uboot-boot64.ush

@@ -1,16 +1,15 @@
 
-part start ${devtype} ${devnum} 6 dev_env
-${devtype} dev ${devnum}
-
+part start mmc ${devnum} 6 mmc_env
+mmc dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${dev_env} 0x20; \
+    mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \
     env import -c ${ramdisk_addr_r} 0x4000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"
+    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -38,14 +37,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:2 ${kernel_addr_r} Image"
+      setenv load_kernel "ext4load mmc 0:2 ${kernel_addr_r} Image"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_a} rauc.slot=A"
     fi
   elif test "x${BOOT_SLOT}" = "xB"; then
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load ${devtype} ${devnum}:4 ${kernel_addr_r} Image"
+      setenv load_kernel "ext4load mmc 0:4 ${kernel_addr_r} Image"
       setenv bootargs "${bootargs_hassos} ${bootargs_rpi} ${bootargs_b} rauc.slot=B"
     fi
   fi

buildroot-external/board/raspberrypi/uboot.config

@@ -1,8 +1,4 @@
+# CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_CMD_FILEENV=y
 CONFIG_ENV_IS_NOWHERE=Y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_FUNCTION_MASS_STORAGE=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_OHCI_HCD=y

buildroot-external/bootloader/uboot.config

@@ -3,7 +3,7 @@ CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_EXPERT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOOTDELAY=-2
+CONFIG_BOOTDELAY=2
 CONFIG_SYS_PROMPT="HassOS> "
 # CONFIG_ISO_PARTITION is not set
 CONFIG_EFI_PARTITION=y
@@ -11,5 +11,6 @@ CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
 # CONFIG_ENV_IS_IN_FAT is not set
 # CONFIG_ENV_IS_IN_EXT4 is not set
+CONFIG_CONSOLE_SCROLL_LINES=10
 # CONFIG_EFI_LOADER is not set
 CONFIG_CMD_SETEXPR=y

buildroot-external/configs/intel_nuc_defconfig

@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 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
@@ -62,6 +62,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -76,8 +77,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -96,12 +95,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/odroid_c2_defconfig

@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/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"
@@ -56,6 +56,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -69,8 +70,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -90,12 +89,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/odroid_xu4_defconfig

@@ -19,10 +19,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
+#BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git"
+#BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.14.87-153"
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
+#BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/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"
@@ -59,6 +63,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,8 +77,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -95,12 +98,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/opi_prime_defconfig

@@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime/uboot.config"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime"
 BR2_LINUX_KERNEL_LZ4=y
@@ -78,6 +78,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -90,8 +91,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -104,12 +103,12 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_SWIG=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/ova_defconfig

@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 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
@@ -52,11 +52,11 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
 BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_QEMU_GUEST_AGENT=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_NETWORK=y
 BR2_PACKAGE_RNG_TOOLS=y
@@ -67,8 +67,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -87,12 +85,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi0_w_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_EABIHF=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,19 +15,19 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_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="bcm2708-rpi-zero-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,15 +73,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -93,12 +92,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi2_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_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="bcm2709-rpi-2-b"
@@ -58,6 +58,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -71,15 +72,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -92,12 +91,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_64_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,15 +73,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -93,12 +92,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,15 +73,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -93,12 +92,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi4_64_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_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"
@@ -60,6 +60,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -73,15 +74,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01-rc4"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -94,12 +93,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi4_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_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"
@@ -60,6 +60,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -73,15 +74,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01-rc4"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -94,12 +93,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_EABIHF=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/raspberrypi/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -15,16 +15,16 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 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_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="988cc7beacc150756c3fbe40646afcf8438b741b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8222f38b1ceadd0642d49812fd34a3a6cb00e264"
 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_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="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -58,6 +58,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -71,15 +72,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -92,12 +91,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/tinker_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/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="4.19.88"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56"
 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"
@@ -59,6 +59,7 @@ BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@@ -72,8 +73,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -97,12 +96,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="187"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="169"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="14"
+BR2_PACKAGE_HASSOS_CLI_VERSION="11"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/kernel/device-support.config

@@ -1,12 +1,9 @@
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_ACM=m
-CONFIG_USB_USBNET=m
 

buildroot-external/kernel/hassos.config

@@ -4,8 +4,6 @@ CONFIG_CMDLINE=""
 CONFIG_ZRAM=y
 CONFIG_ZSMALLOC=y
 
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_BLOCK=y
 CONFIG_EXT4_FS=y

buildroot-external/meta

@@ -1,7 +1,7 @@
 VERSION_MAJOR=3
-VERSION_BUILD=6
+VERSION_BUILD=3
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="staging"
+DEPLOYMENT="development"

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+HCIATTACH=/usr/bin/hciattach
+SERIAL=`cat /proc/device-tree/serial-number | cut -c9-`
+B1=`echo $SERIAL | cut -c3-4`
+B2=`echo $SERIAL | cut -c5-6`
+B3=`echo $SERIAL | cut -c7-8`
+BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
+
+if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
+    if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
+        $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
+    else
+		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
+    fi
+else
+    $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+fi

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -11,28 +11,21 @@ BLUETOOTH_BCM43XX_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-bcm43xx
 BLUETOOTH_BCM43XX_SITE_METHOD = local
 
 define BLUETOOTH_BCM43XX_BUILD_CMDS
-	curl -L -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/fff76cb15527c435ce99a9787848eacd6288282c/broadcom/BCM43430A1.hcd
-	curl -L -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/fff76cb15527c435ce99a9787848eacd6288282c/broadcom/BCM4345C0.hcd
-	curl -L -o $(@D)/btuart https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/btuart
-	curl -L -o $(@D)/bthelper https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/bthelper
-	curl -L -o $(@D)/90-pi-bluetooth.rules https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/lib/udev/rules.d/90-pi-bluetooth.rules
+	curl -L -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM43430A1.hcd
+	curl -L -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM4345C0.hcd
 endef
 
 define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
+	$(INSTALL) -m 0755 $(@D)/bluetooth-bcm43xx $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
-	$(INSTALL) -m 0644 $(@D)/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/
 	ln -fs /usr/lib/systemd/system/bluetooth-bcm43xx.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/
 
-	$(INSTALL) -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 0755 $(@D)/btuart $(TARGET_DIR)/usr/bin/
-	$(INSTALL) -m 0755 $(@D)/bthelper $(TARGET_DIR)/usr/bin/
-
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
 	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
 
 	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/90-pi-bluetooth.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
 endef
 
 $(eval $(generic-package))

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.rules

@@ -0,0 +1,22 @@
+KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
+                echo 0;\
+        elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi\
+'", SYMLINK+="serial%c"
+
+KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
+                echo 0; \
+        elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi \
+'", SYMLINK+="serial%c"
+

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Bluetooth for BCM43xx
 Before=bluetooth.service
-Requires=dev-serial1.device
-After=dev-serial1.device
+After=dev-ttyAMA0.device
 ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/btuart
+ExecStart=/usr/sbin/bluetooth-bcm43xx
 
 [Install]
 WantedBy=hassos-hardware.target

buildroot-external/package/bluetooth-bcm43xx/bthelper@.service

@@ -1,8 +0,0 @@
-[Unit]
-Description=Raspberry Pi bluetooth helper
-Requires=bluetooth.service
-After=bluetooth.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/bthelper %I

buildroot-external/package/qemu-guest-agent/Config.in

@@ -1,9 +0,0 @@
-config BR2_PACKAGE_QEMU_GUEST_AGENT
-	depends on BR2_USE_MMU # libglib2
-    depends on BR2_USE_WCHAR # libglib2
-    depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_ZLIB
-	bool "QEMU Guest Agent"
-	help
-	  QEMU guest agent for qemu based virtualisations

buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk

@@ -1,110 +0,0 @@
-################################################################################
-#
-# qemu-guest-agent
-#
-################################################################################
-
-QEMU_GUEST_AGENT_VERSION = 3.1.1.1
-QEMU_GUEST_AGENT_SOURCE = qemu-$(QEMU_GUEST_AGENT_VERSION).tar.xz
-QEMU_GUEST_AGENT_SITE = http://download.qemu.org
-QEMU_GUEST_AGENT_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
-QEMU_GUEST_AGENT_LICENSE_FILES = COPYING COPYING.LIB
-# NOTE: there is no top-level license file for non-(L)GPL licenses;
-#       the non-(L)GPL license texts are specified in the affected
-#       individual source files.
-
-QEMU_GUEST_AGENT_DEPENDENCIES = host-pkgconf libglib2 zlib
-
-# Need the LIBS variable because librt and libm are
-# not automatically pulled. :-(
-QEMU_GUEST_AGENT_LIBS = -lrt -lm
-
-QEMU_GUEST_AGENT_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool
-
-QEMU_GUEST_AGENT_OPTS = --enable-guest-agent
-
-# Override CPP, as it expects to be able to call it like it'd
-# call the compiler.
-define QEMU_GUEST_AGENT_CONFIGURE_CMDS
-	( cd $(@D); \
-		LIBS='$(QEMU_GUEST_AGENT_LIBS)' \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CPP="$(TARGET_CC) -E" \
-		$(QEMU_GUEST_AGENT_VARS) \
-		./configure \
-			--prefix=/usr \
-			--localstatedir=/var \
-			--cross-prefix=$(TARGET_CROSS) \
-			--audio-drv-list= \
-			--disable-kvm \
-			--disable-linux-user \
-			--disable-linux-aio \
-			--disable-xen \
-			--disable-docs \
-			--disable-curl \
-			--disable-gnutls \
-			--disable-gtk \
-			--disable-vte \
-			--disable-vnc-jpeg \
-			--disable-opengl \
-			--disable-usb-redir \
-			--disable-sdl \
-			--disable-system \
-			--disable-user \
-			--disable-guest-agent \
-			--disable-nettle \
-			--disable-gcrypt \
-			--disable-curses \
-			--disable-vnc \
-			--disable-virtfs \
-			--disable-brlapi \
-			--disable-fdt \
-			--disable-bluez \
-			--disable-kvm \
-			--disable-rdma \
-			--disable-vde \
-			--disable-netmap \
-			--disable-cap-ng \
-			--disable-attr \
-			--disable-vhost-net \
-			--disable-spice \
-			--disable-rbd \
-			--disable-libiscsi \
-			--disable-libnfs \
-			--disable-smartcard \
-			--disable-libusb \
-			--disable-usb-redir \
-			--disable-lzo \
-			--disable-snappy \
-			--disable-bzip2 \
-			--disable-seccomp \
-			--disable-coroutine-pool \
-			--disable-glusterfs \
-			--disable-tpm \
-			--disable-numa \
-			--disable-blobs \
-			--disable-capstone \
-			--disable-tools \
-			--disable-tcg-interpreter \
-			$(QEMU_GUEST_AGENT_OPTS) \
-	)
-endef
-
-define QEMU_GUEST_AGENT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_GUEST_AGENT_MAKE_ENV) DESTDIR=$(TARGET_DIR) install
-endef
-
-define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 644 $(QEMU_GUEST_AGENT_PKGDIR)/qemu-guest.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/qemu-guest.service
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/qemu-guest.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/qemu-guest.service
-endef
-
-$(eval $(generic-package))

buildroot-external/package/qemu-guest-agent/qemu-guest.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=QEMU Guest Agent
-After=syslog.target network.target
-ConditionVirtualization=kvm
-
-[Service]
-ExecStart=/usr/bin/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

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

@@ -6,20 +6,28 @@ DEVICE_CHILD="$(findfs LABEL="hassos-data")"
 DEVICE_ROOT="/dev/$(lsblk -no pkname "${DEVICE_CHILD}")"
 PART_NUM="${DEVICE_CHILD: -1}"
 
-# Need resize
-UNUSED=$(sfdisk -Fq "${DEVICE_ROOT}" | cut -d " " -f 3 | tail -1)
-if [ -z "${UNUSED}" ] || [ "${UNUSED}" -le "2048" ]; then
-    echo "[INFO] No resize of data partition needed"
-    exit 0
-fi
-
 if sfdisk -dq "${DEVICE_ROOT}" | grep -q 'label: gpt'; then
+
+    # Need resize
+    if [ "$(sgdisk -E "${DEVICE_ROOT}")" -le "2048" ]; then
+        echo "[INFO] No resize of data partition needed"
+        exit 0
+    fi
+
     # Resize & Reload partition
     echo "[INFO] Update hassos-data partition ${PART_NUM}"
     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
+
+     # Need resize
+    UNUSED=$(sfdisk -Fq "${DEVICE_ROOT}" | cut -d " " -f 3 | tail -1)
+    if [ -z "${UNUSED}" ] || [ "${UNUSED}" -le "2048" ]; then
+        echo "[INFO] No resize of data partition needed"
+        exit 0
+    fi
+
     echo ", +" | sfdisk -N "${PART_NUM}" "${DEVICE_ROOT}" --force
     sfdisk -V "${DEVICE_ROOT}"
 fi

buildroot-external/scripts/hdd-image.sh

@@ -91,7 +91,7 @@ function create_kernel_image() {
     # Mount / init file structs
     sudo mkdir -p /mnt/data/
     sudo mount -o loop "${kernel_img}" /mnt/data
-    sudo cp "${kernel}" /mnt/data/
+    sudo cp -f "${kernel}" /mnt/data/
     sudo umount /mnt/data
 }
 

buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch

@@ -38,7 +38,7 @@ index 9988dda717..3eae7e270b 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256	f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74  rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz
-+sha256	484d52caed909fcafbf593cc3e726ea44a9218db7f0aeec843b825797eb9b0fc  rpi-firmware-9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e.tar.gz
++sha256	62a63b4a8be10da779342799148919d1a50c1939bf6cae93d61cb1b5daed810f  rpi-firmware-cba4be275b9943b353ea2e5201ab2badd4c760e9.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 630bc670ca..fd2970333e 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -48,7 +48,7 @@ index 630bc670ca..fd2970333e 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d
-+RPI_FIRMWARE_VERSION = 9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e
++RPI_FIRMWARE_VERSION = cba4be275b9943b353ea2e5201ab2badd4c760e9
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

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

@@ -16,7 +16,7 @@ index c61a47e..84e02f3 100644
 @@ -1,3 +1,3 @@
  # Locally calculated
 -sha256 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2  rpi-wifi-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.tar.gz
-+sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3  rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz
++sha256 95d26fadfa73505b1fdcc0080728655109ceef9b5a0e63f36d9383e9ada57ab2  rpi-wifi-firmware-b518de45ced519e8f7a499f4778100173402ae43.tar.gz
  sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
 diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
 index 2eb8cee..da915bd 100644
@@ -28,7 +28,7 @@ index 2eb8cee..da915bd 100644
  
 -RPI_WIFI_FIRMWARE_VERSION = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee
 -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
-+RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639
++RPI_WIFI_FIRMWARE_VERSION = b518de45ced519e8f7a499f4778100173402ae43
 +RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
  RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
  RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256	484d52caed909fcafbf593cc3e726ea44a9218db7f0aeec843b825797eb9b0fc  rpi-firmware-9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e.tar.gz
+sha256	62a63b4a8be10da779342799148919d1a50c1939bf6cae93d61cb1b5daed810f  rpi-firmware-cba4be275b9943b353ea2e5201ab2badd4c760e9.tar.gz

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e
+RPI_FIRMWARE_VERSION = cba4be275b9943b353ea2e5201ab2badd4c760e9
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3  rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz
+sha256 95d26fadfa73505b1fdcc0080728655109ceef9b5a0e63f36d9383e9ada57ab2  rpi-wifi-firmware-b518de45ced519e8f7a499f4778100173402ae43.tar.gz
 sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639
+RPI_WIFI_FIRMWARE_VERSION = b518de45ced519e8f7a499f4778100173402ae43
 RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
 RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
 RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx

scripts/enter.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 BUILDER_UID="$(id -u)"
 BUILDER_GID="$(id -g)"
-CACHE_DIR="${CACHE_DIR:-$HOME/hassos-cache}"
 
-sudo mkdir -p "${CACHE_DIR}"
 sudo docker build -t hassos:local .
 sudo docker run -it --rm --privileged \
-  -v "$(pwd):/build" -v "${CACHE_DIR}:/cache" \
+  -v "$(pwd):/build" -v "${CACHE_DIR:=$HOME/hassos-cache}:/cache" \
   -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
   hassos:local bash

scripts/entry.sh

@@ -7,7 +7,7 @@ USER="root"
 dockerd -s vfs &> /dev/null &
 
 # Setup local user
-if [ "${BUILDER_UID:-0}" -ne 0 ] && [ "${BUILDER_GID:-0}" -ne 0 ]; then
+if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then
   groupadd -g "${BUILDER_GID}" builder
   useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder
   echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers

scripts/update-cli.sh

@@ -7,4 +7,3 @@ if [ -z "$1" ]; then
 fi
 
 sed -i "s/CLI_VERSION=\".*\"/CLI_VERSION=\"$1\"/g" buildroot-external/configs/*
-git commit -m "OS: Update CLI $1" buildroot-external/configs/*

scripts/update-rpi-kernel.sh

@@ -7,4 +7,3 @@ if [ -z "$1" ]; then
 fi
 
 sed -i "s/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\".*\"/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\"$1\"/g" buildroot-external/configs/rpi*
-git commit -m "RaspberryPi: Update kernel $1" buildroot-external/configs/*

scripts/update-supervisor.sh

@@ -7,5 +7,3 @@ if [ -z "$1" ]; then
 fi
 
 sed -i "s/SUPERVISOR_VERSION=\".*\"/SUPERVISOR_VERSION=\"$1\"/g" buildroot-external/configs/*
-git commit -m "OS: Update supervisor $1" buildroot-external/configs/*
-