u-boot: Update patches for RPi4ag/rpi4-uboot-update

After a review in upstream, some of the patches were modified. Most
notable changes:
1. use directly the dtb passed by the firmware and make sure uboot
doesn't tweak memory/reg
2. remove known unimplemented support (usb, eth etc.)
3. drop patches that are not needed anymore with the new firmware update
(for example 0012-bcm283x-mbox-Correctly-wait-for-space-to-send.patch)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>

1 files changed, 20 insertions, 27 deletions

diff --git a/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch b/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch
index 2fe7b9e..788b877 100644
--- a/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch
@@ -1,23 +1,32 @@
-From 2a59e8a0d574c5f878e7cf640dd2337ac5721372 Mon Sep 17 00:00:00 2001
+From e8be20ccd21df9f042e58114b3f5ae7f412a71a8 Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Wed, 17 Jul 2019 15:32:11 +0100
-Subject: [PATCH 01/12] configs: rpi4: Add defconfigs for rpi4 (32/64)
+Subject: [PATCH 1/7] configs: rpi4: Add defconfigs for rpi4 (32/64)
+
+This defines a minimum defconfig for each of the two Raspberry Pi 4
+variants. One notable difference is that we don't have a embedded dt for
+this board given that the fw supplies us with one which we can reuse.
+Furthermore, the ram size is not queryable through mbox interface as the
+maximum reported size is 1G. The fw patches the dt with the right
+memory configuration and uboot uses it as it is. We avoid u-boot
+touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY
+is deactivated.
 
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
- configs/rpi_4_32b_defconfig | 41 +++++++++++++++++++++++++++++++++++++
- configs/rpi_4_defconfig     | 41 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 82 insertions(+)
+ configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++
+ configs/rpi_4_defconfig     | 33 +++++++++++++++++++++++++++++++++
+ 2 files changed, 66 insertions(+)
  create mode 100644 configs/rpi_4_32b_defconfig
  create mode 100644 configs/rpi_4_defconfig
 
 diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
 new file mode 100644
-index 0000000000..3ee33174bc
+index 0000000000..a31a617a5f
 --- /dev/null
 +++ b/configs/rpi_4_32b_defconfig
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,33 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_BCM283X=y
 +CONFIG_SYS_TEXT_BASE=0x00008000
@@ -26,6 +35,7 @@ index 0000000000..3ee33174bc
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_NR_DRAM_BANKS=1
 +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
++CONFIG_OF_BOARD=y
 +CONFIG_OF_BOARD_SETUP=y
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
@@ -34,10 +44,7 @@ index 0000000000..3ee33174bc
 +# 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
@@ -45,15 +52,9 @@ index 0000000000..3ee33174bc
 +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_KEYBOARD=y
-+CONFIG_USB_HOST_ETHER=y
 +CONFIG_DM_VIDEO=y
 +CONFIG_SYS_WHITE_ON_BLACK=y
 +CONFIG_CONSOLE_SCROLL_LINES=10
@@ -61,10 +62,10 @@ index 0000000000..3ee33174bc
 +CONFIG_OF_LIBFDT_OVERLAY=y
 diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
 new file mode 100644
-index 0000000000..b91b0869e5
+index 0000000000..da8c960a2a
 --- /dev/null
 +++ b/configs/rpi_4_defconfig
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,33 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_BCM283X=y
 +CONFIG_SYS_TEXT_BASE=0x00080000
@@ -73,6 +74,7 @@ index 0000000000..b91b0869e5
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_NR_DRAM_BANKS=1
 +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
++CONFIG_OF_BOARD=y
 +CONFIG_OF_BOARD_SETUP=y
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
@@ -81,10 +83,7 @@ index 0000000000..b91b0869e5
 +# 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
@@ -92,15 +91,9 @@ index 0000000000..b91b0869e5
 +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_KEYBOARD=y
-+CONFIG_USB_HOST_ETHER=y
 +CONFIG_DM_VIDEO=y
 +CONFIG_SYS_WHITE_ON_BLACK=y
 +CONFIG_CONSOLE_SCROLL_LINES=10