svn commit: r554415 - in head/sysutils: u-boot-master u-boot-master/files u-boot-rockpro64 u-boot-rockpro64/files
Emmanuel Vadot
manu at FreeBSD.org
Sat Nov 7 18:59:38 UTC 2020
Author: manu
Date: Sat Nov 7 18:59:37 2020
New Revision: 554415
URL: https://svnweb.freebsd.org/changeset/ports/554415
Log:
sysutils/u-boot-*: Update to 2020.10
This also add two patches :
- The first one is for rockpro64, a commit upstream made the spi flash
not detected anymore. The issue is still discussed with upstream so for
now add a local patch.
- The second disabled shutting down usb controllers when
calling efi_exit_boot_service.
It somehow make u-boot hang but only when doing netboot and of course
only on some boards so it's a weird issue.
This is also a local patch for now as I still need to look deeper.
Added:
head/sysutils/u-boot-master/files/patch-common__bootm.c (contents, props changed)
head/sysutils/u-boot-rockpro64/files/
head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi (contents, props changed)
Modified:
head/sysutils/u-boot-master/Makefile
head/sysutils/u-boot-master/distinfo
head/sysutils/u-boot-rockpro64/Makefile
Modified: head/sysutils/u-boot-master/Makefile
==============================================================================
--- head/sysutils/u-boot-master/Makefile Sat Nov 7 18:50:05 2020 (r554414)
+++ head/sysutils/u-boot-master/Makefile Sat Nov 7 18:59:37 2020 (r554415)
@@ -111,7 +111,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?= 2020.07
+UBOOT_VERSION?= 2020.10
# If a slave port defines a PORTREVISION use it
.if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION})
Modified: head/sysutils/u-boot-master/distinfo
==============================================================================
--- head/sysutils/u-boot-master/distinfo Sat Nov 7 18:50:05 2020 (r554414)
+++ head/sysutils/u-boot-master/distinfo Sat Nov 7 18:59:37 2020 (r554415)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1594110266
-SHA256 (u-boot/u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
-SIZE (u-boot/u-boot-2020.07.tar.bz2) = 15338841
+TIMESTAMP = 1602419610
+SHA256 (u-boot/u-boot-2020.10.tar.bz2) = 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
+SIZE (u-boot/u-boot-2020.10.tar.bz2) = 15784894
SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
SIZE (u-boot/939129/raw) = 310
SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
Added: head/sysutils/u-boot-master/files/patch-common__bootm.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/u-boot-master/files/patch-common__bootm.c Sat Nov 7 18:59:37 2020 (r554415)
@@ -0,0 +1,31 @@
+From 7d25c0b01248fbfbbcdf668cc1c080fe0b54978f Mon Sep 17 00:00:00 2001
+From: Emmanuel Vadot <manu at 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
+
Modified: head/sysutils/u-boot-rockpro64/Makefile
==============================================================================
--- head/sysutils/u-boot-rockpro64/Makefile Sat Nov 7 18:50:05 2020 (r554414)
+++ head/sysutils/u-boot-rockpro64/Makefile Sat Nov 7 18:59:37 2020 (r554415)
@@ -2,6 +2,8 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
+EXTRA_PATCHES= ${.CURDIR}/files
+
MODEL= rockpro64
BOARD_CONFIG= rockpro64-rk3399_defconfig
FAMILY= rk3399
Added: head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/u-boot-rockpro64/files/patch-arch_arm_dts_rk3399-u-boot.dtsi Sat Nov 7 18:59:37 2020 (r554415)
@@ -0,0 +1,25 @@
+From 84090d14ac93f67f2c11716912d3e352e3d9856d Mon Sep 17 00:00:00 2001
+From: Emmanuel Vadot <manu at FreeBSD.org>
+Date: Sun, 11 Oct 2020 17:22:45 +0200
+Subject: [PATCH 1/2] Remove spi1 alias, it breaks detecting flash on rockpro64
+Content-Type: text/plain; charset=UTF-8
+
+---
+ arch/arm/dts/rk3399-u-boot.dtsi | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
+index ecd230c720..2d5e5d9900 100644
+--- arch/arm/dts/rk3399-u-boot.dtsi
++++ arch/arm/dts/rk3399-u-boot.dtsi
+@@ -11,7 +11,6 @@
+ mmc0 = &sdhci;
+ mmc1 = &sdmmc;
+ pci0 = &pcie0;
+- spi1 = &spi1;
+ };
+
+ cic: syscon at ff620000 {
+--
+2.28.0
+
More information about the svn-ports-all
mailing list