- due to a miscommunication the patch files were not added

7 files changed, 73 insertions, 0 deletions

diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index 28e9eeda20ee..8500c0258378 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -2,6 +2,7 @@
 
 MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
+PORTREVISION=	1
 
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
@@ -10,4 +11,6 @@ UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
+EXTRA_PATCHES=	${.CURDIR}/files/
+
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c b/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c
new file mode 100644
index 000000000000..18891f4e6b64
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c
@@ -0,0 +1,13 @@
+--- board/raspberrypi/rpi/rpi.c.orig	2018-03-13 12:02:19 UTC
++++ board/raspberrypi/rpi/rpi.c
+@@ -273,6 +273,10 @@ static void set_fdt_addr(void)
+ 		return;
+ 
+ 	env_set_hex("fdt_addr", fw_dtb_pointer);
++	/*
++	 * Set fdtcontroladdr too so it can be picked up by boot script
++	 */
++	env_set_hex("fdtcontroladdr", fw_dtb_pointer);
+ }
+ 
+ /*
diff --git a/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig b/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig
new file mode 100644
index 000000000000..23982f82ab5f
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig
@@ -0,0 +1,14 @@
+--- configs/rpi_3_defconfig.orig	2018-03-13 12:02:19 UTC
++++ configs/rpi_3_defconfig
+@@ -13,9 +13,9 @@ CONFIG_SYS_PROMPT="U-Boot> "
+ CONFIG_CMD_GPIO=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_USB=y
+-CONFIG_OF_EMBED=y
++CONFIG_OF_BOARD=y
+ CONFIG_ENV_FAT_INTERFACE="mmc"
+-CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
++CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
+ CONFIG_DM_KEYBOARD=y
+ CONFIG_DM_MMC=y
+ CONFIG_MMC_SDHCI=y
diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c b/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c
new file mode 100644
index 000000000000..59467ccd954e
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c
@@ -0,0 +1,10 @@
+--- drivers/usb/host/dwc2.c.orig	2018-03-13 12:02:19 UTC
++++ drivers/usb/host/dwc2.c
+@@ -1283,6 +1283,7 @@ struct dm_usb_ops dwc2_usb_ops = {
+ 
+ static const struct udevice_id dwc2_usb_ids[] = {
+ 	{ .compatible = "brcm,bcm2835-usb" },
++	{ .compatible = "brcm,bcm2708-usb" },
+ 	{ .compatible = "snps,dwc2" },
+ 	{ }
+ };
diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c b/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c
new file mode 100644
index 000000000000..9dd065272956
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c
@@ -0,0 +1,10 @@
+--- drivers/video/bcm2835.c.orig	2018-03-13 12:02:19 UTC
++++ drivers/video/bcm2835.c
+@@ -49,6 +49,7 @@ static int bcm2835_video_probe(struct udevice *dev)
+ 
+ static const struct udevice_id bcm2835_video_ids[] = {
+ 	{ .compatible = "brcm,bcm2835-hdmi" },
++	{ .compatible = "brcm,bcm2708-fb" },
+ 	{ }
+ };
+ 
diff --git a/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h b/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h
new file mode 100644
index 000000000000..97c875ebef0b
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h
@@ -0,0 +1,10 @@
+--- include/configs/rpi.h.orig	2018-03-13 12:02:19 UTC
++++ include/configs/rpi.h
+@@ -133,6 +133,7 @@
+ 
+ #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)
diff --git a/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c b/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c
new file mode 100644
index 000000000000..4065ae9ccb48
--- /dev/null
+++ b/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c
@@ -0,0 +1,13 @@
+--- lib/efi_loader/efi_console.c.orig	2018-03-13 12:02:19 UTC
++++ lib/efi_loader/efi_console.c
+@@ -547,8 +547,8 @@ int efi_console_register(void)
+ 		printf("ERROR: Failed to register console event\n");
+ 		return r;
+ 	}
+-	/* 5000 ns cycle is sufficient for 2 MBaud */
+-	r = efi_set_timer(console_timer_event, EFI_TIMER_PERIODIC, 50);
++	/* 100 ms */
++	r = efi_set_timer(console_timer_event, EFI_TIMER_PERIODIC, 100*1000*10);
+ 	if (r != EFI_SUCCESS)
+ 		printf("ERROR: Failed to set console timer\n");
+ 	return r;