git: 0de03bbf192d - main - sysutils/u-boot-*: Add patch to fix MMC ordering

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0de03bbf192d56b2cd125c6048dbd058bac49be6

commit 0de03bbf192d56b2cd125c6048dbd058bac49be6
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-11-09 19:53:07 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-11-09 19:56:54 +0000

    sysutils/u-boot-*: Add patch to fix MMC ordering
    
    For FreeBSD we use a dtb overlay that switches between the sdhost and
    the sdhci controller for sd card.
    Recent changes in u-boot device model changed device numbering and the
    sd card controller became "mmc2" for our setup which isn't accounted for
    in the possible boot devices.
    Patch isn't accepted yet upstream but bring this patch in for our ports anyway.
---
 sysutils/u-boot-master/distinfo    | 4 +++-
 sysutils/u-boot-rpi-0-w/Makefile   | 5 ++++-
 sysutils/u-boot-rpi-arm64/Makefile | 5 ++++-
 sysutils/u-boot-rpi/Makefile       | 5 ++++-
 sysutils/u-boot-rpi2/Makefile      | 5 ++++-
 sysutils/u-boot-rpi3/Makefile      | 5 ++++-
 sysutils/u-boot-rpi4/Makefile      | 5 ++++-
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index 0b57d0434eff..77609bffddd3 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1625655964
+TIMESTAMP = 1636485856
 SHA256 (u-boot/u-boot-2021.07.tar.bz2) = 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
 SIZE (u-boot/u-boot-2021.07.tar.bz2) = 17275746
 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
@@ -11,3 +11,5 @@ SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7
 SIZE (u-boot/1172554/raw) = 640
 SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751
 SIZE (u-boot/1172555/raw) = 568
+SHA256 (u-boot/1547145/raw) = 50c6280a5db419597de451be3e89a8660c9f913767af205a4add79a8db6b89ce
+SIZE (u-boot/1547145/raw) = 372
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index 37cd2a34ad81..267647371cd5 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -1,6 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi-0-w
 BOARD_CONFIG=	rpi_0_w_defconfig
diff --git a/sysutils/u-boot-rpi-arm64/Makefile b/sysutils/u-boot-rpi-arm64/Makefile
index 9e25dd915601..a314b98bc4f0 100644
--- a/sysutils/u-boot-rpi-arm64/Makefile
+++ b/sysutils/u-boot-rpi-arm64/Makefile
@@ -1,7 +1,10 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi-arm64
 BOARD_CONFIG=	rpi_arm64_defconfig
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 52de21af33e1..da431f73c537 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -1,6 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index f875b8840cab..f89bfe0dd914 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,6 +1,9 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-PATCHFILES+=	939129/raw
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index b708f98830b3..80839124f365 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -1,7 +1,10 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES?=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL?=		rpi3
 BOARD_CONFIG?=	rpi_3_defconfig
diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile
index 676ca4a77ffd..11b2636a6cdf 100644
--- a/sysutils/u-boot-rpi4/Makefile
+++ b/sysutils/u-boot-rpi4/Makefile
@@ -1,7 +1,10 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	939129/raw
+PATCHFILES+=	939129/raw \
+		1547145/raw
 
 MODEL=		rpi4
 BOARD_CONFIG=	rpi_4_defconfig