Index: branches/2020Q1/sysutils/u-boot-master/distinfo
===================================================================
--- branches/2020Q1/sysutils/u-boot-master/distinfo	(revision 528621)
+++ branches/2020Q1/sysutils/u-boot-master/distinfo	(revision 528622)
@@ -1,25 +1,29 @@
-TIMESTAMP = 1573202420
+TIMESTAMP = 1584323217
 SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014
 SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608
 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
 SIZE (u-boot/939129/raw) = 310
 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
 SIZE (u-boot/1036621/raw) = 480
 SHA256 (u-boot/1173473/raw) = 4f182d6f99b1d868237607200d64a1d8a2d57ea44fc25ca49bce929ad6457228
 SIZE (u-boot/1173473/raw) = 433
 SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7eeaeb9b806cf42
 SIZE (u-boot/1172554/raw) = 640
 SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751
 SIZE (u-boot/1172555/raw) = 568
 SHA256 (u-boot/1137331/raw) = b6dec0334194ec87528aa01219dc5ecd60a3945c126704274933aab9ef112d38
 SIZE (u-boot/1137331/raw) = 2250
 SHA256 (u-boot/1137330/raw) = 6e111ee87ee2082a43b4cd929b74279e8cb63525a89ccab00255200a9cd03e2b
 SIZE (u-boot/1137330/raw) = 1548
 SHA256 (u-boot/1189494/raw) = 2f237d1e80c216fc3898381469b2af9d5639b60cb3128a11c8a23a0a12e4b80c
 SIZE (u-boot/1189494/raw) = 965
 SHA256 (u-boot/1189493/raw) = 4dba3366147813150e68a0aa9fa1738977cba45f9a55faf0fd0cdb3478142683
 SIZE (u-boot/1189493/raw) = 5959
 SHA256 (u-boot/1189497/raw) = 3c433ddf46b8c64f56a9699aeead85954d922e5fcfad52a7bfddf57e6cbdccb6
 SIZE (u-boot/1189497/raw) = 2241
 SHA256 (u-boot/1189495/raw) = ad1233a1da6171b83936e422c67467a54559364cc426d6804d20d425949a933d
 SIZE (u-boot/1189495/raw) = 3918
+SHA256 (u-boot/1245351/raw) = 02cec0ca1934ba64d010ec7f0453faa127b19aaae679d6bd9b946a3653837434
+SIZE (u-boot/1245351/raw) = 707
+SHA256 (u-boot/1245352/raw) = a4f48937cd9403b7f7708ba1fc5b9405da97bdedff25fdeb198ab613294e7d45
+SIZE (u-boot/1245352/raw) = 465
Index: branches/2020Q1/sysutils/u-boot-rpi3/Makefile
===================================================================
--- branches/2020Q1/sysutils/u-boot-rpi3/Makefile	(revision 528621)
+++ branches/2020Q1/sysutils/u-boot-rpi3/Makefile	(revision 528622)
@@ -1,18 +1,22 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2019.10=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
 PATCHFILES+=	939129/raw
+# Allow variable reservation of lowest pages for increased PSCI stub size.
+PATCHFILES+=	1245351/raw 1245352/raw
 
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi3_fragment
 FRAGMENT_NAME=	rpi3_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment
===================================================================
--- branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment	(revision 528621)
+++ branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment	(revision 528622)
@@ -1,3 +1,4 @@
 CONFIG_OF_EMBED=n
 CONFIG_OF_BOARD=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
+CONFIG_RPI_EFI_NR_SPIN_PAGES=2
Index: branches/2020Q1/sysutils/u-boot-rpi4/Makefile
===================================================================
--- branches/2020Q1/sysutils/u-boot-rpi4/Makefile	(revision 528621)
+++ branches/2020Q1/sysutils/u-boot-rpi4/Makefile	(revision 528622)
@@ -1,22 +1,26 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2019.10=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
 PATCHFILES+=	939129/raw
 # Updated libfdt, pre-req to the next set
 PATCHFILES+=	1137331/raw 1137330/raw
 # Fix memory bank issues
 PATCHFILES+=	1189494/raw 1189493/raw 1189497/raw 1189495/raw
+# Allow variable reservation of lowest pages for increased PSCI stub size.
+PATCHFILES+=	1245351/raw 1245352/raw
 
 MODEL=		rpi4
 BOARD_CONFIG=	rpi_4_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi4_fragment
 FRAGMENT_NAME=	rpi4_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment
===================================================================
--- branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment	(revision 528621)
+++ branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment	(revision 528622)
@@ -1 +1,2 @@
 CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
+CONFIG_RPI_EFI_NR_SPIN_PAGES=2
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 528621)
+++ branches/2020Q1	(revision 528622)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r528547