git: ecad553edaec - main - sysutils/u-boot: Update to 2022.04
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 May 2022 08:10:56 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ecad553edaec865109f79d42e711e1c93b44e3a1
commit ecad553edaec865109f79d42e711e1c93b44e3a1
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-05-02 15:15:40 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-05-03 08:10:43 +0000
sysutils/u-boot: Update to 2022.04
---
sysutils/u-boot-master/Makefile | 9 ++++---
sysutils/u-boot-master/distinfo | 8 +++---
sysutils/u-boot-master/files/patch-common__bootm.c | 31 ----------------------
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 +---
sysutils/u-boot-sifive-fu540/Makefile | 2 --
sysutils/u-boot-sopine-spi/Makefile | 2 ++
.../files/patch-board_sunxi_board.c | 11 ++++++++
sysutils/u-boot-sopine-spi/files/spi_fragment | 1 +
13 files changed, 28 insertions(+), 66 deletions(-)
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 48442f118c54..88464f01295c 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -31,7 +31,8 @@ UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
INST= ${PREFIX}/${UBOOT_DIR}
DESCR?= ${.CURDIR}/pkg-descr
-MAKE_ARGS+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
+MAKE_ENV+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} CC=clang
+MAKE_ARGS+= ${ARCHFLAGS}
NO_ARCH= yes
@@ -112,7 +113,7 @@ UBOOT_PLIST_QEMU= u-boot.bin
.if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
.endif
-UBOOT_VERSION?= 2021.07
+UBOOT_VERSION?= 2022.04
# If a slave port defines a PORTREVISION use it
.if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION})
@@ -222,10 +223,10 @@ CONFIG_FRAGMENT= ${FILESDIR}/${FRAGMENT_NAME}
.if defined(CONFIG_FRAGMENT)
do-configure:
${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/
- (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
+ (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
.else
do-configure:
- (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
+ (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${BOARD_CONFIG})
.endif
post-build:
diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index 77609bffddd3..89c967a085a6 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1636485856
-SHA256 (u-boot/u-boot-2021.07.tar.bz2) = 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
-SIZE (u-boot/u-boot-2021.07.tar.bz2) = 17275746
+TIMESTAMP = 1651502800
+SHA256 (u-boot/u-boot-2022.04.tar.bz2) = 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
+SIZE (u-boot/u-boot-2022.04.tar.bz2) = 17772787
SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
SIZE (u-boot/939129/raw) = 310
SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
@@ -11,5 +11,3 @@ 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-master/files/patch-common__bootm.c b/sysutils/u-boot-master/files/patch-common__bootm.c
deleted file mode 100644
index 78c13d80fc70..000000000000
--- a/sysutils/u-boot-master/files/patch-common__bootm.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d25c0b01248fbfbbcdf668cc1c080fe0b54978f Mon Sep 17 00:00:00 2001
-From: Emmanuel Vadot <manu@FreeBSD.org>
-Date: Sat, 7 Nov 2020 19:42:31 +0100
-Subject: [PATCH 2/2] Add FreeBSD hack that does not disable usb when
- efi_exit_boot_service is called
-Content-Type: text/plain; charset=UTF-8
-
----
- common/bootm.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/bootm.c b/common/bootm.c
-index b3377490b3..22476fc7c9 100644
---- common/bootm.c
-+++ common/bootm.c
-@@ -458,7 +458,12 @@ ulong bootm_disable_interrupts(void)
- * updated every 1 ms within the HCCA structure in SDRAM! For more
- * details see the OpenHCI specification.
- */
-+ /*
-+ * FreeBSD Hack, on some board this cause efi_exit_bootservice to hang
-+ * for some yet unknown reason.
-+ * This only does this when doing netboot ???
- usb_stop();
-+ */
- #endif
- return iflag;
- }
---
-2.28.0
-
diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile
index 267647371cd5..37cd2a34ad81 100644
--- a/sysutils/u-boot-rpi-0-w/Makefile
+++ b/sysutils/u-boot-rpi-0-w/Makefile
@@ -1,9 +1,6 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/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 a314b98bc4f0..9e25dd915601 100644
--- a/sysutils/u-boot-rpi-arm64/Makefile
+++ b/sysutils/u-boot-rpi-arm64/Makefile
@@ -1,10 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
EXTRA_PATCHES= ${.CURDIR}/files/
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/raw
MODEL= rpi-arm64
BOARD_CONFIG= rpi_arm64_defconfig
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index da431f73c537..52de21af33e1 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -1,9 +1,6 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/raw
MODEL= rpi
BOARD_CONFIG= rpi_defconfig
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index f89bfe0dd914..f875b8840cab 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -1,9 +1,6 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/raw
MODEL= rpi2
BOARD_CONFIG= rpi_2_defconfig
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index 80839124f365..b708f98830b3 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -1,10 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
EXTRA_PATCHES?= ${.CURDIR}/files/
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/raw
MODEL?= rpi3
BOARD_CONFIG?= rpi_3_defconfig
diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile
index 11b2636a6cdf..676ca4a77ffd 100644
--- a/sysutils/u-boot-rpi4/Makefile
+++ b/sysutils/u-boot-rpi4/Makefile
@@ -1,10 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07= 1
-
EXTRA_PATCHES= ${.CURDIR}/files/
-PATCHFILES+= 939129/raw \
- 1547145/raw
+PATCHFILES+= 939129/raw
MODEL= rpi4
BOARD_CONFIG= rpi_4_defconfig
diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
index 3fba52d998dc..5f79e53b93d8 100644
--- a/sysutils/u-boot-sifive-fu540/Makefile
+++ b/sysutils/u-boot-sifive-fu540/Makefile
@@ -1,7 +1,5 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
-U_BOOT_SLAVE_PORTREVISION_2021.07=1
-
MODEL= sifive-fu540
BOARD_CONFIG= sifive_unleashed_defconfig
FAMILY= sifive
diff --git a/sysutils/u-boot-sopine-spi/Makefile b/sysutils/u-boot-sopine-spi/Makefile
index be0ea6e4436d..16a7105b54c6 100644
--- a/sysutils/u-boot-sopine-spi/Makefile
+++ b/sysutils/u-boot-sopine-spi/Makefile
@@ -4,6 +4,8 @@ MODEL= sopine-spi
BOARD_CONFIG= sopine_baseboard_defconfig
FAMILY= allwinner64
+EXTRA_PATCHES?= ${.CURDIR}/files/
+
CONFIG_FRAGMENT= ${.CURDIR}/../u-boot-sopine-spi/files/spi_fragment
FRAGMENT_NAME= spi_fragment
NO_METADATA= yes
diff --git a/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c b/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c
new file mode 100644
index 000000000000..e8bde74a0597
--- /dev/null
+++ b/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c
@@ -0,0 +1,11 @@
+--- board/sunxi/board.c.orig 2022-05-03 09:13:36.019124000 +0200
++++ board/sunxi/board.c 2022-05-03 09:13:47.210925000 +0200
+@@ -601,7 +601,7 @@
+ case BOOT_DEVICE_MMC2:
+ return 1;
+ default:
+- return CONFIG_SYS_MMC_ENV_DEV;
++ return 0;
+ }
+ }
+ #endif
diff --git a/sysutils/u-boot-sopine-spi/files/spi_fragment b/sysutils/u-boot-sopine-spi/files/spi_fragment
index ac8e94c95b69..eb5121d4341e 100644
--- a/sysutils/u-boot-sopine-spi/files/spi_fragment
+++ b/sysutils/u-boot-sopine-spi/files/spi_fragment
@@ -3,3 +3,4 @@ CONFIG_ENV_OFFSET=0x100000
CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_ENV_IS_IN_FAT=n
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_MMC_ENV_DEV=0