u-boot: Backport patch to fix u-boot compilation without USB config

Raspberry Pi 4 doesn't have a working USB driver in u-boot. This makes
the defconfig not to enable the relevant config case which breaks the
build with:

error: expected '}' before
'BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB'

This was fixed in upstream and we backport the relevant commit.

Signed-off-by: Andrei Gherzan <andrei@balena.io>

2 files changed, 74 insertions, 0 deletions

diff --git a/recipes-bsp/u-boot/u-boot-2019.01/0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch b/recipes-bsp/u-boot/u-boot-2019.01/0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch
new file mode 100644
index 0000000..c402e04
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-2019.01/0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch
@@ -0,0 +1,73 @@
+From e4617bdb29e9c88e85f056f3aea46a2c8a5312e2 Mon Sep 17 00:00:00 2001
+From: akaher <akaher@vmware.com>
+Date: Thu, 11 Apr 2019 05:23:50 +0000
+Subject: [PATCH] Fix compilation error if CONFIG_USB is disabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch is to fix the following compilation error when
+disabling CONFIG_USB for Rpi3:
+
+include/config_distro_bootcmd.h:242:2: error: expected ‘}’
+before ‘BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB’
+     BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB
+
+Signed-off-by: Ajay Kaher <akaher@vmware.com>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+Upstream-status: Backport
+---
+ include/configs/rpi.h | 36 +++++++++++++++++++++++++++++++-----
+ 1 file changed, 31 insertions(+), 5 deletions(-)
+
+diff --git a/include/configs/rpi.h b/include/configs/rpi.h
+index 9ce41767a9..f76c7d18ef 100644
+--- a/include/configs/rpi.h
++++ b/include/configs/rpi.h
+@@ -146,12 +146,38 @@
+        "fdt_addr_r=0x02600000\0" \
+        "ramdisk_addr_r=0x02700000\0"
+ 
++#if CONFIG_IS_ENABLED(CMD_MMC)
++       #define BOOT_TARGET_MMC(func) \
++               func(MMC, mmc, 0) \
++               func(MMC, mmc, 1)
++#else
++       #define BOOT_TARGET_MMC(func)
++#endif
++
++#if CONFIG_IS_ENABLED(CMD_USB)
++       #define BOOT_TARGET_USB(func) func(USB, usb, 0)
++#else
++       #define BOOT_TARGET_USB(func)
++#endif
++
++#if CONFIG_IS_ENABLED(CMD_PXE)
++       #define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
++#else
++       #define BOOT_TARGET_PXE(func)
++#endif
++
++#if CONFIG_IS_ENABLED(CMD_DHCP)
++       #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
++#else
++       #define BOOT_TARGET_DHCP(func)
++#endif
++
+ #define BOOT_TARGET_DEVICES(func) \
+-       func(MMC, mmc, 0) \
+-       func(MMC, mmc, 1) \
+-       func(USB, usb, 0) \
+-       func(PXE, pxe, na) \
+-       func(DHCP, dhcp, na)
++       BOOT_TARGET_MMC(func) \
++       BOOT_TARGET_USB(func) \
++       BOOT_TARGET_PXE(func) \
++       BOOT_TARGET_DHCP(func)
++
+ #include <config_distro_bootcmd.h>
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-- 
+2.22.0
+
diff --git a/recipes-bsp/u-boot/u-boot_2019.01.bbappend b/recipes-bsp/u-boot/u-boot_2019.01.bbappend
index 7cd8d66..b11dfc2 100644
--- a/recipes-bsp/u-boot/u-boot_2019.01.bbappend
+++ b/recipes-bsp/u-boot/u-boot_2019.01.bbappend
@@ -1,5 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 UBOOT_RPI4_SUPPORT_PATCHES = " \
+    file://0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch \
     file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \
     file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \
     file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \