aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2021-05-11 18:27:14 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2021-05-11 20:22:54 +0000
commit0d6e5081eb0080c4703f1c5cc69c34f38d9149b7 (patch)
treea22f954f3003c1361f4ea5a411e92759a80c9089
parentc5fd1c2e186abb2e3209fa48d75d8dcdcda63f06 (diff)
downloadports-0d6e5081eb0080c4703f1c5cc69c34f38d9149b7.tar.gz
ports-0d6e5081eb0080c4703f1c5cc69c34f38d9149b7.zip
sysutils/u-boot-*: Remove ubldr support
We have been using loader.efi on armv7 for a long time now. Remove support for booting with ubldr and the needed patches that were never upstreamed. While here add CONFIG_EFI_GRUB_ARM32_WORKAROUND=y in the Fragment as it's needed to have the cache flushed for us when loader.efi is started.
-rw-r--r--sysutils/u-boot-a13-olinuxino/Makefile2
-rw-r--r--sysutils/u-boot-bananapi/Makefile2
-rw-r--r--sysutils/u-boot-bananapim2/Makefile2
-rw-r--r--sysutils/u-boot-beaglebone/Makefile2
-rw-r--r--sysutils/u-boot-chip/Makefile2
-rw-r--r--sysutils/u-boot-clearfog/Makefile2
-rw-r--r--sysutils/u-boot-cubieboard/Makefile2
-rw-r--r--sysutils/u-boot-cubieboard2/Makefile2
-rw-r--r--sysutils/u-boot-cubox-hummingboard/Makefile2
-rw-r--r--sysutils/u-boot-duovero/Makefile2
-rw-r--r--sysutils/u-boot-master/Makefile7
-rw-r--r--sysutils/u-boot-master/files/FreeBSD_Fragment3
-rw-r--r--sysutils/u-boot-master/files/boot.cmd2
-rw-r--r--sysutils/u-boot-master/files/patch-api_api.c14
-rw-r--r--sysutils/u-boot-master/files/patch-api_api__storage.c25
-rw-r--r--sysutils/u-boot-master/files/patch-cmd_boot.c13
-rw-r--r--sysutils/u-boot-master/files/patch-cmd_elf.c14
-rw-r--r--sysutils/u-boot-nanopi-m1plus/Makefile2
-rw-r--r--sysutils/u-boot-nanopi-neo-air/Makefile2
-rw-r--r--sysutils/u-boot-nanopi-neo/Makefile2
-rw-r--r--sysutils/u-boot-olimex-a20-som-evb/Makefile2
-rw-r--r--sysutils/u-boot-olinuxino-lime/Makefile2
-rw-r--r--sysutils/u-boot-olinuxino-lime2-emmc/Makefile2
-rw-r--r--sysutils/u-boot-olinuxino-lime2/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-one/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-pc-plus/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-pc/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-plus-2e/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-r1/Makefile2
-rw-r--r--sysutils/u-boot-orangepi-zero/Makefile2
-rw-r--r--sysutils/u-boot-pandaboard/Makefile2
-rw-r--r--sysutils/u-boot-pcduino3/Makefile2
-rw-r--r--sysutils/u-boot-qemu-arm/Makefile2
-rw-r--r--sysutils/u-boot-riotboard/Makefile2
-rw-r--r--sysutils/u-boot-rpi-0-w/Makefile2
-rw-r--r--sysutils/u-boot-rpi/Makefile2
-rw-r--r--sysutils/u-boot-rpi2/Makefile2
-rw-r--r--sysutils/u-boot-rpi3-32/Makefile2
-rw-r--r--sysutils/u-boot-sinovoip-bpi-m3/Makefile2
-rw-r--r--sysutils/u-boot-wandboard/Makefile2
40 files changed, 68 insertions, 76 deletions
diff --git a/sysutils/u-boot-a13-olinuxino/Makefile b/sysutils/u-boot-a13-olinuxino/Makefile
index 407d6922f606..347d9973e6ac 100644
--- a/sysutils/u-boot-a13-olinuxino/Makefile
+++ b/sysutils/u-boot-a13-olinuxino/Makefile
@@ -4,4 +4,6 @@ MODEL= a13-olinuxino
BOARD_CONFIG= A13-OLinuXino_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 9ee34393b078..2da2a6222521 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -4,4 +4,6 @@ MODEL= bananapi
BOARD_CONFIG= Bananapi_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bananapim2/Makefile b/sysutils/u-boot-bananapim2/Makefile
index 5baa88ee439e..a8c40f5f0aa1 100644
--- a/sysutils/u-boot-bananapim2/Makefile
+++ b/sysutils/u-boot-bananapim2/Makefile
@@ -4,4 +4,6 @@ MODEL= bananapim2
BOARD_CONFIG= Sinovoip_BPI_M2_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index b111e31c032f..961ebd05d74e 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -4,6 +4,8 @@ MODEL= beaglebone
BOARD_CONFIG= am335x_evm_defconfig
FAMILY= omap
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
CONFIG_FRAGMENT= ${.CURDIR}/files/bbb_fragment
FRAGMENT_NAME= bbb_fragment
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index fce52137940c..13264127a450 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -4,4 +4,6 @@ MODEL= chip
BOARD_CONFIG= CHIP_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-clearfog/Makefile b/sysutils/u-boot-clearfog/Makefile
index c7fa674db0a1..def7fdb1ea23 100644
--- a/sysutils/u-boot-clearfog/Makefile
+++ b/sysutils/u-boot-clearfog/Makefile
@@ -4,4 +4,6 @@ MODEL= clearfog
BOARD_CONFIG= clearfog_defconfig
FAMILY= armada38x
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubieboard/Makefile b/sysutils/u-boot-cubieboard/Makefile
index 2cd8f57252da..198f0b12cb35 100644
--- a/sysutils/u-boot-cubieboard/Makefile
+++ b/sysutils/u-boot-cubieboard/Makefile
@@ -4,4 +4,6 @@ MODEL= cubieboard
BOARD_CONFIG= Cubieboard_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 99a4e7aee710..7e28f5ef6402 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -4,4 +4,6 @@ MODEL= cubieboard2
BOARD_CONFIG= Cubieboard2_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-cubox-hummingboard/Makefile b/sysutils/u-boot-cubox-hummingboard/Makefile
index 45c14eb898fe..f455968f7660 100644
--- a/sysutils/u-boot-cubox-hummingboard/Makefile
+++ b/sysutils/u-boot-cubox-hummingboard/Makefile
@@ -4,6 +4,8 @@ MODEL= cubox-hummingboard
BOARD_CONFIG= mx6cuboxi_defconfig
FAMILY= imx6
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
IMXFILE= u-boot.imx
UBOOT_PLIST= ${IMXFILE}
diff --git a/sysutils/u-boot-duovero/Makefile b/sysutils/u-boot-duovero/Makefile
index 13cca8bd532e..c4f5a26bf5ec 100644
--- a/sysutils/u-boot-duovero/Makefile
+++ b/sysutils/u-boot-duovero/Makefile
@@ -4,6 +4,8 @@ MODEL= duovero
BOARD_CONFIG= duovero_defconfig
FAMILY= omap
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
BROKEN= Does not build anymore
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index a0dce966861b..38fd6f081fbd 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -131,7 +131,6 @@ UBOOT_ARCH?= arm
.if ${UBOOT_ARCH} == arm
CROSS_COMPILE=arm-none-eabi-
ARCHFLAGS=ARCH=${UBOOT_ARCH}
-UBOOT_PLIST+= boot.scr
.elif ${UBOOT_ARCH} == aarch64
CROSS_COMPILE=aarch64-none-elf-
ARCHFLAGS=ARCH=arm
@@ -202,7 +201,6 @@ METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS}
post-patch:
@${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh
- ${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/
.if defined(METADATA_METHOD)
@echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata
@echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata
@@ -214,7 +212,7 @@ post-patch:
.endif
.if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT)
-# For armv6/v7 we want CONFIG_API
+# For armv6/v7 we want do disable secure mode and cache cleaning
# Use a KConfig fragment for that
FRAGMENT_NAME= FreeBSD_Fragment
CONFIG_FRAGMENT= ${FILESDIR}/${FRAGMENT_NAME}
@@ -230,9 +228,6 @@ do-configure:
.endif
post-build:
-.if ${UBOOT_ARCH} == arm
- mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr
-.endif
.if defined(UBOOT_EXTRA_TARGETS)
.for i in ${UBOOT_EXTRA_TARGETS}
(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${i})
diff --git a/sysutils/u-boot-master/files/FreeBSD_Fragment b/sysutils/u-boot-master/files/FreeBSD_Fragment
index 630d295cc8f1..f3837a932e98 100644
--- a/sysutils/u-boot-master/files/FreeBSD_Fragment
+++ b/sysutils/u-boot-master/files/FreeBSD_Fragment
@@ -1,3 +1,2 @@
-CONFIG_API=y
CONFIG_ARMV7_NONSEC=n
-CONFIG_CMD_CACHE=y
+CONFIG_EFI_GRUB_ARM32_WORKAROUND=y
diff --git a/sysutils/u-boot-master/files/boot.cmd b/sysutils/u-boot-master/files/boot.cmd
deleted file mode 100644
index b3ce82975eb3..000000000000
--- a/sysutils/u-boot-master/files/boot.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-fatload ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ubldr.bin && go ${kernel_addr_r}
-echo "Cannot load ubldr.bin"
diff --git a/sysutils/u-boot-master/files/patch-api_api.c b/sysutils/u-boot-master/files/patch-api_api.c
deleted file mode 100644
index 5de1e5e653d9..000000000000
--- a/sysutils/u-boot-master/files/patch-api_api.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- api/api.c.orig 2018-07-09 14:24:14 UTC
-+++ api/api.c
-@@ -289,6 +289,11 @@ static int API_dev_close(va_list ap)
- if (!err)
- di->state = DEV_STA_CLOSED;
-
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
-+
- return err;
- }
-
diff --git a/sysutils/u-boot-master/files/patch-api_api__storage.c b/sysutils/u-boot-master/files/patch-api_api__storage.c
deleted file mode 100644
index 2e5846fb9a5c..000000000000
--- a/sysutils/u-boot-master/files/patch-api_api__storage.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- api/api_storage.c.orig 2019-07-08 19:23:28 UTC
-+++ api/api_storage.c
-@@ -69,13 +69,6 @@ void dev_stor_init(void)
- specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
- specs[ENUM_SATA].name = "sata";
- #endif
--#if defined(CONFIG_SCSI)
-- specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
-- specs[ENUM_SCSI].enum_started = 0;
-- specs[ENUM_SCSI].enum_ended = 0;
-- specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
-- specs[ENUM_SCSI].name = "scsi";
--#endif
- #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
- specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
- specs[ENUM_USB].enum_started = 0;
-@@ -281,7 +274,7 @@ int dev_enum_storage(struct device_info *di)
- {
- int i;
-
-- /* check: ide, usb, scsi, mmc */
-+ /* check: ide, usb, mmc */
- for (i = ENUM_IDE; i < ENUM_MAX; i ++) {
- if (dev_enum_stor(i, di))
- return 1;
diff --git a/sysutils/u-boot-master/files/patch-cmd_boot.c b/sysutils/u-boot-master/files/patch-cmd_boot.c
deleted file mode 100644
index b0c520aeb2ed..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_boot.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/boot.c.orig 2018-07-09 14:24:14 UTC
-+++ cmd/boot.c
-@@ -18,6 +18,10 @@ __attribute__((weak))
- unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
- char * const argv[])
- {
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
- return entry (argc, argv);
- }
-
diff --git a/sysutils/u-boot-master/files/patch-cmd_elf.c b/sysutils/u-boot-master/files/patch-cmd_elf.c
deleted file mode 100644
index a6cac78a0989..000000000000
--- a/sysutils/u-boot-master/files/patch-cmd_elf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd/elf.c.orig 2018-07-09 14:24:14 UTC
-+++ cmd/elf.c
-@@ -153,6 +153,11 @@ static unsigned long do_bootelf_exec(ulong (*entry)(in
- {
- unsigned long ret;
-
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
-+
- /*
- * pass address parameter as argv[0] (aka command name),
- * and all remaining args
diff --git a/sysutils/u-boot-nanopi-m1plus/Makefile b/sysutils/u-boot-nanopi-m1plus/Makefile
index 12ce943fab6f..6ecb5458972e 100644
--- a/sysutils/u-boot-nanopi-m1plus/Makefile
+++ b/sysutils/u-boot-nanopi-m1plus/Makefile
@@ -4,4 +4,6 @@ MODEL= nanopi_m1plus
BOARD_CONFIG= nanopi_m1_plus_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo-air/Makefile b/sysutils/u-boot-nanopi-neo-air/Makefile
index b3d99c0565ba..fe25f5ed224f 100644
--- a/sysutils/u-boot-nanopi-neo-air/Makefile
+++ b/sysutils/u-boot-nanopi-neo-air/Makefile
@@ -4,4 +4,6 @@ MODEL= nanopi_neo_air
BOARD_CONFIG= nanopi_neo_air_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index a9439ce1df49..2be631dac48c 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -4,4 +4,6 @@ MODEL= nanopi_neo
BOARD_CONFIG= nanopi_neo_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olimex-a20-som-evb/Makefile b/sysutils/u-boot-olimex-a20-som-evb/Makefile
index b18d1681e6ce..5f1c7a96bddd 100644
--- a/sysutils/u-boot-olimex-a20-som-evb/Makefile
+++ b/sysutils/u-boot-olimex-a20-som-evb/Makefile
@@ -4,4 +4,6 @@ MODEL= olimex-a20-som-evb
BOARD_CONFIG= A20-Olimex-SOM-EVB_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime/Makefile b/sysutils/u-boot-olinuxino-lime/Makefile
index d547189f2e7f..a411daa30779 100644
--- a/sysutils/u-boot-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-olinuxino-lime/Makefile
@@ -4,4 +4,6 @@ MODEL= olinuxino-lime
BOARD_CONFIG= A10-OLinuXino-Lime_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
index 9a8690cf7cf1..cded1087a2ae 100644
--- a/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
+++ b/sysutils/u-boot-olinuxino-lime2-emmc/Makefile
@@ -4,4 +4,6 @@ MODEL= olinuxino-lime2-emmc
BOARD_CONFIG= A20-OLinuXino-Lime2-eMMC_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-olinuxino-lime2/Makefile b/sysutils/u-boot-olinuxino-lime2/Makefile
index 01f63220757b..5445b5d7286c 100644
--- a/sysutils/u-boot-olinuxino-lime2/Makefile
+++ b/sysutils/u-boot-olinuxino-lime2/Makefile
@@ -4,4 +4,6 @@ MODEL= olinuxino-lime2
BOARD_CONFIG= A20-OLinuXino-Lime2_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile
index a2f9701b2df4..bc7d91ed122f 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -4,4 +4,6 @@ MODEL= orangepi-one
BOARD_CONFIG= orangepi_one_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-pc-plus/Makefile b/sysutils/u-boot-orangepi-pc-plus/Makefile
index bf950cb76382..e35b61d7bb1b 100644
--- a/sysutils/u-boot-orangepi-pc-plus/Makefile
+++ b/sysutils/u-boot-orangepi-pc-plus/Makefile
@@ -4,4 +4,6 @@ MODEL= orangepi-pc-plus
BOARD_CONFIG= orangepi_pc_plus_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-pc/Makefile b/sysutils/u-boot-orangepi-pc/Makefile
index 08affd797db7..a8d03f452999 100644
--- a/sysutils/u-boot-orangepi-pc/Makefile
+++ b/sysutils/u-boot-orangepi-pc/Makefile
@@ -4,4 +4,6 @@ MODEL= orangepi-pc
BOARD_CONFIG= orangepi_pc_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-plus-2e/Makefile b/sysutils/u-boot-orangepi-plus-2e/Makefile
index c5dc081f8d8f..6b0d00d5f3ab 100644
--- a/sysutils/u-boot-orangepi-plus-2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus-2e/Makefile
@@ -6,4 +6,6 @@ MODEL= orangepi-plus-2e
BOARD_CONFIG= orangepi_plus2e_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-r1/Makefile b/sysutils/u-boot-orangepi-r1/Makefile
index ae7eef62684d..060751d7153a 100644
--- a/sysutils/u-boot-orangepi-r1/Makefile
+++ b/sysutils/u-boot-orangepi-r1/Makefile
@@ -4,4 +4,6 @@ MODEL= orangepi_r1
BOARD_CONFIG= orangepi_r1_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile
index 505d6ac83724..a88846c7676e 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -4,4 +4,6 @@ MODEL= orangepi-zero
BOARD_CONFIG= orangepi_zero_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index abb4a8a6b999..7396e16fd817 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -4,4 +4,6 @@ MODEL= pandaboard
BOARD_CONFIG= omap4_panda_defconfig
FAMILY= omap
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pcduino3/Makefile b/sysutils/u-boot-pcduino3/Makefile
index 2b6d57ffb75b..51ae832dec4b 100644
--- a/sysutils/u-boot-pcduino3/Makefile
+++ b/sysutils/u-boot-pcduino3/Makefile
@@ -4,4 +4,6 @@ MODEL= pcduino3
BOARD_CONFIG= Linksprite_pcDuino3_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-qemu-arm/Makefile b/sysutils/u-boot-qemu-arm/Makefile
index ac8bbfa94374..6a2c20a1cd68 100644
--- a/sysutils/u-boot-qemu-arm/Makefile
+++ b/sysutils/u-boot-qemu-arm/Makefile
@@ -4,6 +4,8 @@ MODEL= qemu-arm
BOARD_CONFIG= qemu_arm_defconfig
FAMILY= qemu
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
UBOOT_PLIST= u-boot.bin
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-riotboard/Makefile b/sysutils/u-boot-riotboard/Makefile
index 711a16232b7d..39193c5e6c30 100644
--- a/sysutils/u-boot-riotboard/Makefile
+++ b/sysutils/u-boot-riotboard/Makefile
@@ -4,6 +4,8 @@ MODEL= riotboard
BOARD_CONFIG= riotboard_defconfig
FAMILY= imx6
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
UBOOT_PLIST= u-boot.imx
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index 37cd2a34ad81..991bf5c58059 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -6,6 +6,8 @@ MODEL= rpi-0-w
BOARD_CONFIG= rpi_0_w_defconfig
FAMILY= rpi
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
CONFIG_FRAGMENT= ${.CURDIR}/files/rpi_0_w_fragment
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 52de21af33e1..de1a2be000f5 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -6,6 +6,8 @@ MODEL= rpi
BOARD_CONFIG= rpi_defconfig
FAMILY= rpi
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
CONFIG_FRAGMENT= ${.CURDIR}/files/rpi_fragment
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index f875b8840cab..d11d15970b04 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -6,6 +6,8 @@ MODEL= rpi2
BOARD_CONFIG= rpi_2_defconfig
FAMILY= rpi
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
CONFIG_FRAGMENT= ${.CURDIR}/files/rpi2_fragment
diff --git a/sysutils/u-boot-rpi3-32/Makefile b/sysutils/u-boot-rpi3-32/Makefile
index 777cd58d3c55..68e4ed003145 100644
--- a/sysutils/u-boot-rpi3-32/Makefile
+++ b/sysutils/u-boot-rpi3-32/Makefile
@@ -3,4 +3,6 @@ BOARD_CONFIG= rpi_3_32b_defconfig
UBOOT_ARCH= arm
EXTRA_PATCHES=
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${.CURDIR}/../u-boot-rpi3/Makefile"
diff --git a/sysutils/u-boot-sinovoip-bpi-m3/Makefile b/sysutils/u-boot-sinovoip-bpi-m3/Makefile
index 73004eea1b93..865c63ddd889 100644
--- a/sysutils/u-boot-sinovoip-bpi-m3/Makefile
+++ b/sysutils/u-boot-sinovoip-bpi-m3/Makefile
@@ -4,4 +4,6 @@ MODEL= sinovoip-bpi-m3
BOARD_CONFIG= Sinovoip_BPI_M3_defconfig
FAMILY= allwinner
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-wandboard/Makefile b/sysutils/u-boot-wandboard/Makefile
index f4844c0a9f9d..2d21614591a0 100644
--- a/sysutils/u-boot-wandboard/Makefile
+++ b/sysutils/u-boot-wandboard/Makefile
@@ -4,6 +4,8 @@ MODEL= wandboard
BOARD_CONFIG= wandboard_defconfig
FAMILY= imx6
+U_BOOT_SLAVE_PORTREVISION_2021.04= 1
+
IMXFILE= u-boot.imx
UBOOT_PLIST= ${IMXFILE}