On Tue, Jan 12, 2021 at 10:12:06AM -0500, Kurt Miller wrote: > On Tue, 2021-01-12 at 15:09 +1100, Jonathan Gray wrote: > > On Tue, Jan 12, 2021 at 07:58:36AM +1100, Jonathan Gray wrote: > > > > > > On Mon, Jan 11, 2021 at 08:41:02PM +0100, Patrick Wildt wrote: > > > > > > > > Am Sun, Jan 10, 2021 at 09:56:02PM +1100 schrieb Jonathan Gray: > > > > > > > > > > On Fri, Jan 08, 2021 at 03:42:31PM -0500, Kurt Miller wrote: > > > > > > > > > > > > On Fri, 2021-01-08 at 11:48 -0500, Kurt Miller wrote: > > > > > > > > > > > > > > On Fri, 2021-01-08 at 10:27 +1100, Jonathan Gray wrote: > > > > > > > > > > > > > > > > > > > > > > > > On Thu, Jan 07, 2021 at 04:29:35PM -0500, Kurt Miller wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Thu, 2020-12-31 at 19:24 +1100, Jonathan Gray wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4 > > > > > > > > > > > > > > > > > > > > Tests welcome as I don't have rk3328/rk3399/sun50i_a64 > > > > > > > > > > hardware. > > > > > > > > > This update appears ok on rk3328 and rk3399, however my > > > > > > > > > rockpro64 > > > > > > > > > will not boot with u-boot 2020.10: > > > > > > > > > > > > > > > > > > Rock64 Gen3 w/ v2020.10 u-boot and atf 2.4 works > > > > > > > > > Rockpro64 w/2020.10 u-boot and atf 2.4 and 2.3 fails > > > > > > > > > Rockpro64 w/2020.07 u-boot and atf 2.4 and 2.3 works > > > > > > > > > > > > > > > > > > With 2020.10 u-boot the rockpro64 freezes just after > > > > > > > > > attempting to > > > > > > > > > boot the kernel. Here's a diff of v2020.07 with atf 2.3 that > > > > > > > > > works > > > > > > > > > against v2020.10 with atf 2.3 that freezes: > > > > > > > > > > > > > > > > > > rocky$ diff -u v2020.07.boot v2020-10.boot??????? > > > > > > > > > --- v2020.07.boot Thu Jan??7 16:20:58 2021 > > > > > > > > > +++ v2020-10.boot Thu Jan??7 16:10:27 2021 > > > > > > > > > @@ -1,19 +1,18 @@ > > > > > > > > > -U-Boot TPL 2020.07 (Jul 07 2020 - 19:02:53) > > > > > > > > > +U-Boot TPL 2020.10 (Jan 02 2021 - 11:16:03) > > > > > > > > > ?Channel 0: LPDDR4, 50MHz > > > > > > > > > ?BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB > > > > > > > > > ?Channel 1: LPDDR4, 50MHz > > > > > > > > > ?BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB > > > > > > > > > ?256B stride > > > > > > > > > -256B stride > > > > > > > > > ?lpddr4_set_rate: change freq to 400000000 mhz 0, 1 > > > > > > > > > ?lpddr4_set_rate: change freq to 800000000 mhz 1, 0 > > > > > > > > > ?Trying to boot from BOOTROM > > > > > > > > > ?Returning to boot ROM... > > > > > > > > > ? > > > > > > > > > -U-Boot SPL 2020.07 (Jul 07 2020 - 19:02:53 -0600) > > > > > > > > > +U-Boot SPL 2020.10 (Jan 02 2021 - 11:16:03 -0700) > > > > > > > > > ?Trying to boot from MMC1 > > > > > > > > > ?NOTICE:??BL31: v2.3():2.3 > > > > > > > > > -NOTICE:??BL31: Built : 18:41:43, Jul??7 2020 > > > > > > > > > +NOTICE:??BL31: Built : 10:45:12, Jan??2 2021 > > > > > > > > > ?INFO:????GICv3 with legacy support detected. > > > > > > > > > ?INFO:????ARM GICv3 driver initialized in EL3 > > > > > > > > > ?INFO:????plat_rockchip_pmu_init(1624): pd status 3e > > > > > > > > > @@ -24,7 +23,7 @@ > > > > > > > > > ?INFO:????SPSR = 0x3c9 > > > > > > > > > ? > > > > > > > > > ? > > > > > > > > > -U-Boot 2020.07 (Jul 07 2020 - 19:02:53 -0600) > > > > > > > > > +U-Boot 2020.10 (Jan 02 2021 - 11:16:03 -0700) > > > > > > > > > ? > > > > > > > > > ?SoC: Rockchip rk3399 > > > > > > > > > ?Reset cause: RST > > > > > > > > > @@ -32,14 +31,29 @@ > > > > > > > > > ?DRAM:??3.9 GiB > > > > > > > > > ?PMIC:??RK808? > > > > > > > > > ?MMC:???mmc@fe310000: 2, mmc@fe320000: 1, sdhci@fe330000: 0 > > > > > > > > > -Loading Environment from SPI Flash... SF: Detected gd25q128 > > > > > > > > > with page size 256 Bytes, erase size 4 KiB, > > > > > > > > > total 16 > > > > > > > > > MiB > > > > > > > > > -*** Warning - bad CRC, using default environment > > > > > > > > > +Loading Environment from SPIFlash... Invalid bus 0 (err=-19) > > > > > > > > > +*** Warning - spi_flash_probe_bus_cs() failed, using default > > > > > > > > > environment > > > > > > > > > ? > > > > > > > > > ?In:????serial > > > > > > > > > ?Out:???serial > > > > > > > > > ?Err:???serial > > > > > > > > > ?Model: Pine64 RockPro64 v2.1 > > > > > > > > > ?Net:???eth0: ethernet@fe300000 > > > > > > > > > +starting USB... > > > > > > > > > +Bus usb@fe380000: USB EHCI 1.00 > > > > > > > > > +Bus usb@fe3a0000: USB OHCI 1.0 > > > > > > > > > +Bus usb@fe3c0000: USB EHCI 1.00 > > > > > > > > > +Bus usb@fe3e0000: USB OHCI 1.0 > > > > > > > > > +Bus dwc3: usb maximum-speed not found > > > > > > > > > +Register 2000140 NbrPorts 2 > > > > > > > > > +Starting the controller > > > > > > > > > +USB XHCI 1.10 > > > > > > > > > +scanning bus usb@fe380000 for devices... 1 USB Device(s) > > > > > > > > > found > > > > > > > > > +scanning bus usb@fe3a0000 for devices... 1 USB Device(s) > > > > > > > > > found > > > > > > > > > +scanning bus usb@fe3c0000 for devices... 1 USB Device(s) > > > > > > > > > found > > > > > > > > > +scanning bus usb@fe3e0000 for devices... 1 USB Device(s) > > > > > > > > > found > > > > > > > > > +scanning bus dwc3 for devices... 1 USB Device(s) found > > > > > > > > > +???????scanning usb for storage devices... 0 Storage > > > > > > > > > Device(s) found > > > > > > > > > ?Hit any key to stop autoboot:??0? > > > > > > > > > ?Card did not respond to voltage select! > > > > > > > > > ?switch to partitions #0, OK > > > > > > > > > @@ -56,11 +70,14 @@ > > > > > > > > > ?Scanning disk sd...@fe330000.blk... > > > > > > > > > ?Disk sd...@fe330000.blk not ready > > > > > > > > > ?Found 3 disks > > > > > > > > > +No EFI system partition > > > > > > > > > ?BootOrder not defined > > > > > > > > > ?EFI boot manager: Cannot load any image > > > > > > > > > -168728 bytes read in 14 ms (11.5 MiB/s) > > > > > > > > > +168728 bytes read in 13 ms (12.4 MiB/s) > > > > > > > > > ?libfdt fdt_check_header(): FDT_ERR_BADMAGIC > > > > > > > > > +Booting /efi\boot\bootaa64.efi > > > > > > > > > ?disks: sd0* > > > > > > > > > ?>> OpenBSD/arm64 BOOTAA64 1.3 > > > > > > > > > ?boot>? > > > > > > > > > -booting sd0a:/bsd: 8657572+1775464+561576+826224 > > > > > > > > > [629354+109+1059720+622048]=0xf87520 > > > > > > > > > +booting sd0a:/bsd: 8663848+1773392+563520+828336 > > > > > > > > > [629656+109+1059720+621958]=0xf885c8 > > > > > > > > > > > > > > > > > > v2020.07 u-boot continues from here, v2020.10 u-boot freezes. > > > > > > > > > > > > > > > > > > Ideas? > > > > > > > > Can you try build the latest U-Boot git???I think you'll have > > > > > > > > to bisect. > > > > > > > Bisecting shows this commit is the culprit: > > > > > > > > > > > > > > commit 3ae64582fb8ceead4fc464cd2055eb3eaef78ccc (refs/bisect/bad) > > > > > > > Author: Jagan Teki <ja...@amarulasolutions.com> > > > > > > > Date:???Mon Jul 20 14:53:09 2020 +0530 > > > > > > > > > > > > > > ????rockchip: rockpro64: Enable USB3.0 Host > > > > > > > ???? > > > > > > > ????Enable USB3.0 Host support for RockPro64 boards. > > > > > > > ???? > > > > > > > ????Signed-off-by: Jagan Teki <ja...@amarulasolutions.com> > > > > > > > ????Reviewed-by: Kever Yang <kever.y...@rock-chips.com> > > > > > > > > > > > > > > diff --git a/configs/rockpro64-rk3399_defconfig > > > > > > > b/configs/rockpro64-rk3399_defconfig > > > > > > > index 31b3ee2aa4..25cf5c781c 100644 > > > > > > > --- a/configs/rockpro64-rk3399_defconfig > > > > > > > +++ b/configs/rockpro64-rk3399_defconfig > > > > > > > @@ -49,6 +49,8 @@ CONFIG_ETH_DESIGNWARE=y > > > > > > > ?CONFIG_GMAC_ROCKCHIP=y > > > > > > > ?CONFIG_NVME=y > > > > > > > ?CONFIG_PCI=y > > > > > > > +CONFIG_PHY_ROCKCHIP_INNO_USB2=y > > > > > > > +CONFIG_PHY_ROCKCHIP_TYPEC=y > > > > > > > ?CONFIG_PMIC_RK8XX=y > > > > > > > ?CONFIG_REGULATOR_PWM=y > > > > > > > ?CONFIG_REGULATOR_RK8XX=y > > > > > > > @@ -66,6 +68,8 @@ CONFIG_USB_EHCI_HCD=y > > > > > > > ?CONFIG_USB_EHCI_GENERIC=y > > > > > > > ?CONFIG_USB_OHCI_HCD=y > > > > > > > ?CONFIG_USB_OHCI_GENERIC=y > > > > > > > +CONFIG_USB_DWC3=y > > > > > > > +CONFIG_USB_DWC3_GENERIC=y > > > > > > > ?CONFIG_USB_KEYBOARD=y > > > > > > > ?CONFIG_USB_HOST_ETHER=y > > > > > > > ?CONFIG_USB_ETHER_ASIX=y > > > > > > > > > > > > > > > > > > > > > However, a strait revert of this using v2020.10 tag results in > > > > > > > undefined refs: > > > > > > > drivers/usb/host/built-in.o: In function `xhci_dwc3_remove': > > > > > > > /home/truk/rockpro64/u-boot/drivers/usb/host/xhci-dwc3.c:172: > > > > > > > undefined reference to `dwc3_shutdown_phy' > > > > > > > drivers/usb/host/built-in.o: In function `xhci_dwc3_probe': > > > > > > > /home/truk/rockpro64/u-boot/drivers/usb/host/xhci-dwc3.c:129: > > > > > > > undefined reference to `dwc3_setup_phy' > > > > > > > > > > > > > > I haven't been able to figure out how to resolve this. > > > > > > > > > > > > > > -Kurt > > > > > > > > > > > > > Here's a u-boot work-around that allows the kernel to boot by > > > > > > disabling the "usb start" preboot command in u-boot. I've tested > > > > > > this with atf 2.4. This should get things working again until > > > > > > someone can dive into why the kernel freezes when "usb start" > > > > > > is issued in u-boot. > > > > > > > > > > > > okay? > > > > > Removing CONFIG_USE_PREBOOT should also work. > > > > > > > > > > I wonder what happens on pinebook pro which may also have the same > > > > > problem? > > > > I updated my Pinebook Pro to the current package.??The only issue I > > > > see is that it doesn't recognize the SPI flash anymore and that's why > > > > it boots to Linux (on the eMMC) instead of OpenBSD (on the NVMe). > > > > But both Linux and OpenBSD boot up just fine. > > > Thanks, in that case I think we want to backport: > > > > > > commit 92cb207af110855ee9ae132c638b3d289a53d930 > > > Author: Hugh Cole-Baker <sigma...@gmail.com> > > > Date:???Sun Nov 22 13:03:44 2020 +0000 > > > > > > ????rockchip: pinebook-pro: default to SPI bus 1 for SPI-flash > > > ???? > > > ????SPI flash on this machine is located on bus 1, default to using bus 1 > > > ????for SPI flash and stop aliasing it to bus 0. > > > ???? > > > ????Signed-off-by: Hugh Cole-Baker <sigma...@gmail.com> > > > ????Suggested-by: Simon Glass <s...@chromium.org> > > > ????Fixes: c4cea2bb ("rockchip: Enable building a SPI ROM image on bob") > > > > > > ?arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- > > > ?configs/pinebook-pro-rk3399_defconfig????????| 2 ++ > > > ?2 files changed, 2 insertions(+), 4 deletions(-) > > > > > > And perhaps also > > > > > > commit b197c934b11f611dcc1a083d90e68019d1e010cf > > > Author: Peter Robinson <pbrobin...@gmail.com> > > > Date:???Tue Nov 10 10:09:06 2020 +0000 > > > > > > ????rockchip: Pinebook Pro: Fix USB > > > ???? > > > ????Improve USB config so keyboard and USB-A ports work. > > > ???? > > > ????Signed-off-by: Peter Robinson <pbrobin...@gmail.com> > > > > > > ?configs/pinebook-pro-rk3399_defconfig | 5 ++++- > > > ?1 file changed, 4 insertions(+), 1 deletion(-) > > U-Boot 2021.01 recently released and includes these. > > > > I tested this with rock64-rk3328 rev c and rockpro64-rk3399 with > atf 2.4. rock64 is good, but the rockpro64 still needs the patch > to disable the preboot command.? > > When 'usb start' is issued on the rockpro64 the kernel freezes > after this: > > >> OpenBSD/arm64 BOOTAA64 1.3 > boot>? > booting sd0a:/bsd: 8668864+1773128+563536+825552 > [628911+109+1060224+622418]=0xf87bd8 > > Setting?CONFIG_USE_PREBOOT=n works to disable the 'usb start' preboot > command like you suggested and allows the board to > boot. > > With the new USB corrections on the pinebook pro, I'd suspect that > it will also freeze now.
I can confirm that the SPI flash now works, but boot fails: boot> booting sd0a:/bsd: 8673628+1776200+565792+828896 [627949+109+1060296+622381]=0xf88e18 [... hangs here! ...] > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v > > retrieving revision 1.75 > > diff -u -p -r1.75 Makefile > > --- Makefile 25 Dec 2020 12:18:05 -0000 1.75 > > +++ Makefile 11 Jan 2021 23:54:58 -0000 > > @@ -7,8 +7,7 @@ FLAVORS= aarch64 arm > > ?FLAVOR?= arm > > ? > > ?COMMENT= U-Boot firmware > > -VERSION= 2020.10 > > -REVISION= 0 > > +VERSION= 2021.01 > > ?DISTNAME= u-boot-${VERSION} > > ?PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//} > > ?FULLPKGNAME= ${PKGNAME} > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/sysutils/u-boot/distinfo,v > > retrieving revision 1.32 > > diff -u -p -r1.32 distinfo > > --- distinfo 6 Oct 2020 05:59:08 -0000 1.32 > > +++ distinfo 11 Jan 2021 23:55:33 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (u-boot-2020.10.tar.bz2) = > > DUgbvcBcDudJCOwvVqbapTFmzGp4oOT6wqxdAldwpiI= > > -SIZE (u-boot-2020.10.tar.bz2) = 15784894 > > +SHA256 (u-boot-2021.01.tar.bz2) = > > tAfhUQp06GO4tctCokYlNE8ODC/HWC2MhmvYmTZ9BFQ= > > +SIZE (u-boot-2021.01.tar.bz2) = 16375990 > > Index: patches/patch-configs_pinebook-pro-rk3399_defconfig > > =================================================================== > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-configs_pinebook-pro-rk3399_defconfig,v > > retrieving revision 1.2 > > diff -u -p -r1.2 patch-configs_pinebook-pro-rk3399_defconfig > > --- patches/patch-configs_pinebook-pro-rk3399_defconfig 6 Oct 2020 > > 05:59:08 -0000 1.2 > > +++ patches/patch-configs_pinebook-pro-rk3399_defconfig 11 Jan 2021 > > 23:56:50 -0000 > > @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_pinebook-pro-rk3 > > ?Index: configs/pinebook-pro-rk3399_defconfig > > ?--- configs/pinebook-pro-rk3399_defconfig.orig > > ?+++ configs/pinebook-pro-rk3399_defconfig > > -@@ -64,7 +64,7 @@ CONFIG_RAM_RK3399_LPDDR4=y > > +@@ -68,7 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y > > ? CONFIG_DM_RESET=y > > ? CONFIG_DM_RNG=y > > ? CONFIG_RNG_ROCKCHIP=y > > Index: patches/patch-configs_rock64-rk3328_defconfig > > =================================================================== > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v > > retrieving revision 1.5 > > diff -u -p -r1.5 patch-configs_rock64-rk3328_defconfig > > --- patches/patch-configs_rock64-rk3328_defconfig 6 Oct 2020 05:59:08 > > -0000 1.5 > > +++ patches/patch-configs_rock64-rk3328_defconfig 11 Jan 2021 23:56:50 > > -0000 > > @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rock64-rk3328_de > > ?Index: configs/rock64-rk3328_defconfig > > ?--- configs/rock64-rk3328_defconfig.orig > > ?+++ configs/rock64-rk3328_defconfig > > -@@ -79,7 +79,7 @@ CONFIG_RAM=y > > +@@ -78,7 +78,7 @@ CONFIG_RAM=y > > ? CONFIG_SPL_RAM=y > > ? CONFIG_TPL_RAM=y > > ? CONFIG_DM_RESET=y > > @@ -11,4 +11,4 @@ Index: configs/rock64-rk3328_defconfig > > ?+CONFIG_BAUDRATE=115200 > > ? CONFIG_DEBUG_UART_SHIFT=2 > > ? CONFIG_ROCKCHIP_SPI=y > > - CONFIG_SYSRESET=y > > + CONFIG_SYSINFO=y > > Index: patches/patch-configs_rock960-rk3399_defconfig > > =================================================================== > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-configs_rock960-rk3399_defconfig,v > > retrieving revision 1.4 > > diff -u -p -r1.4 patch-configs_rock960-rk3399_defconfig > > --- patches/patch-configs_rock960-rk3399_defconfig 6 Oct 2020 05:59:08 > > -0000 1.4 > > +++ patches/patch-configs_rock960-rk3399_defconfig 11 Jan 2021 23:56:50 > > -0000 > > @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rock960-rk3399_d > > ?Index: configs/rock960-rk3399_defconfig > > ?--- configs/rock960-rk3399_defconfig.orig > > ?+++ configs/rock960-rk3399_defconfig > > -@@ -46,7 +46,7 @@ CONFIG_REGULATOR_PWM=y > > +@@ -49,7 +49,7 @@ CONFIG_REGULATOR_PWM=y > > ? CONFIG_REGULATOR_RK8XX=y > > ? CONFIG_PWM_ROCKCHIP=y > > ? CONFIG_DM_RESET=y > > Index: patches/patch-configs_rockpro64-rk3399_defconfig > > =================================================================== > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig,v > > retrieving revision 1.5 > > diff -u -p -r1.5 patch-configs_rockpro64-rk3399_defconfig > > --- patches/patch-configs_rockpro64-rk3399_defconfig 6 Oct 2020 > > 05:59:08 -0000 1.5 > > +++ patches/patch-configs_rockpro64-rk3399_defconfig 11 Jan 2021 > > 23:56:59 -0000 > > @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_rockpro64-rk3399 > > ?Index: configs/rockpro64-rk3399_defconfig > > ?--- configs/rockpro64-rk3399_defconfig.orig > > ?+++ configs/rockpro64-rk3399_defconfig > > -@@ -55,7 +55,7 @@ CONFIG_REGULATOR_RK8XX=y > > +@@ -57,7 +57,7 @@ CONFIG_REGULATOR_RK8XX=y > > ? CONFIG_PWM_ROCKCHIP=y > > ? CONFIG_RAM_RK3399_LPDDR4=y > > ? CONFIG_DM_RESET=y > > Index: pkg/PFRAG.aarch64 > > =================================================================== > > RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v > > retrieving revision 1.20 > > diff -u -p -r1.20 PFRAG.aarch64 > > --- pkg/PFRAG.aarch64 25 Dec 2020 12:18:05 -0000 1.20 > > +++ pkg/PFRAG.aarch64 12 Jan 2021 00:50:27 -0000 > > @@ -7,14 +7,12 @@ share/u-boot/a64-olinuxino/u-boot > > ?share/u-boot/a64-olinuxino/u-boot-sunxi-with-spl.bin > > ?share/u-boot/a64-olinuxino/u-boot.bin > > ?share/u-boot/a64-olinuxino/u-boot.img > > -share/u-boot/a64-olinuxino/u-boot.itb > > ?share/u-boot/bananapi_m64/ > > ?share/u-boot/bananapi_m64/sunxi-spl.bin > > ?share/u-boot/bananapi_m64/u-boot > > ?share/u-boot/bananapi_m64/u-boot-sunxi-with-spl.bin > > ?share/u-boot/bananapi_m64/u-boot.bin > > ?share/u-boot/bananapi_m64/u-boot.img > > -share/u-boot/bananapi_m64/u-boot.itb > > ?share/u-boot/firefly-rk3399/ > > ?share/u-boot/firefly-rk3399/idbloader.img > > ?share/u-boot/firefly-rk3399/u-boot > > @@ -41,56 +39,49 @@ share/u-boot/nanopi_a64/u-boot > > ?share/u-boot/nanopi_a64/u-boot-sunxi-with-spl.bin > > ?share/u-boot/nanopi_a64/u-boot.bin > > ?share/u-boot/nanopi_a64/u-boot.img > > -share/u-boot/nanopi_a64/u-boot.itb > > ?share/u-boot/nanopi_neo2/ > > ?share/u-boot/nanopi_neo2/sunxi-spl.bin > > ?share/u-boot/nanopi_neo2/u-boot > > ?share/u-boot/nanopi_neo2/u-boot-sunxi-with-spl.bin > > ?share/u-boot/nanopi_neo2/u-boot.bin > > ?share/u-boot/nanopi_neo2/u-boot.img > > -share/u-boot/nanopi_neo2/u-boot.itb > > ?share/u-boot/orangepi_pc2/ > > ?share/u-boot/orangepi_pc2/sunxi-spl.bin > > ?share/u-boot/orangepi_pc2/u-boot > > ?share/u-boot/orangepi_pc2/u-boot-sunxi-with-spl.bin > > ?share/u-boot/orangepi_pc2/u-boot.bin > > ?share/u-boot/orangepi_pc2/u-boot.img > > -share/u-boot/orangepi_pc2/u-boot.itb > > ?share/u-boot/orangepi_prime/ > > ?share/u-boot/orangepi_prime/sunxi-spl.bin > > ?share/u-boot/orangepi_prime/u-boot > > ?share/u-boot/orangepi_prime/u-boot-sunxi-with-spl.bin > > ?share/u-boot/orangepi_prime/u-boot.bin > > ?share/u-boot/orangepi_prime/u-boot.img > > -share/u-boot/orangepi_prime/u-boot.itb > > ?share/u-boot/orangepi_win/ > > ?share/u-boot/orangepi_win/sunxi-spl.bin > > ?share/u-boot/orangepi_win/u-boot > > ?share/u-boot/orangepi_win/u-boot-sunxi-with-spl.bin > > ?share/u-boot/orangepi_win/u-boot.bin > > ?share/u-boot/orangepi_win/u-boot.img > > -share/u-boot/orangepi_win/u-boot.itb > > ?share/u-boot/orangepi_zero_plus/ > > ?share/u-boot/orangepi_zero_plus/sunxi-spl.bin > > ?share/u-boot/orangepi_zero_plus/u-boot > > ?share/u-boot/orangepi_zero_plus/u-boot-sunxi-with-spl.bin > > ?share/u-boot/orangepi_zero_plus/u-boot.bin > > ?share/u-boot/orangepi_zero_plus/u-boot.img > > -share/u-boot/orangepi_zero_plus/u-boot.itb > > ?share/u-boot/pine64-lts/ > > ?share/u-boot/pine64-lts/sunxi-spl.bin > > ?share/u-boot/pine64-lts/u-boot > > ?share/u-boot/pine64-lts/u-boot-sunxi-with-spl.bin > > ?share/u-boot/pine64-lts/u-boot.bin > > ?share/u-boot/pine64-lts/u-boot.img > > -share/u-boot/pine64-lts/u-boot.itb > > ?share/u-boot/pine64_plus/ > > ?share/u-boot/pine64_plus/sunxi-spl.bin > > ?share/u-boot/pine64_plus/u-boot > > ?share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin > > ?share/u-boot/pine64_plus/u-boot.bin > > ?share/u-boot/pine64_plus/u-boot.img > > -share/u-boot/pine64_plus/u-boot.itb > > +share/u-boot/pinebook/ > > ?share/u-boot/pinebook-pro-rk3399/ > > ?share/u-boot/pinebook-pro-rk3399/idbloader.img > > ?share/u-boot/pinebook-pro-rk3399/u-boot > > @@ -98,13 +89,11 @@ share/u-boot/pinebook-pro-rk3399/u-boot- > > ?share/u-boot/pinebook-pro-rk3399/u-boot.bin > > ?share/u-boot/pinebook-pro-rk3399/u-boot.img > > ?share/u-boot/pinebook-pro-rk3399/u-boot.itb > > -share/u-boot/pinebook/ > > ?share/u-boot/pinebook/sunxi-spl.bin > > ?share/u-boot/pinebook/u-boot > > ?share/u-boot/pinebook/u-boot-sunxi-with-spl.bin > > ?share/u-boot/pinebook/u-boot.bin > > ?share/u-boot/pinebook/u-boot.img > > -share/u-boot/pinebook/u-boot.itb > > ?share/u-boot/qemu_arm64/ > > ?share/u-boot/qemu_arm64/u-boot > > ?share/u-boot/qemu_arm64/u-boot.bin > > @@ -148,4 +137,3 @@ share/u-boot/sopine_baseboard/u-boot > > ?share/u-boot/sopine_baseboard/u-boot-sunxi-with-spl.bin > > ?share/u-boot/sopine_baseboard/u-boot.bin > > ?share/u-boot/sopine_baseboard/u-boot.img > > -share/u-boot/sopine_baseboard/u-boot.itb > > Index: pkg/PFRAG.arm > > =================================================================== > > RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.arm,v > > retrieving revision 1.23 > > diff -u -p -r1.23 PFRAG.arm > > --- pkg/PFRAG.arm 22 May 2020 13:51:09 -0000 1.23 > > +++ pkg/PFRAG.arm 12 Jan 2021 02:56:17 -0000 > > @@ -243,7 +243,6 @@ share/u-boot/rpi_3_32b/u-boot.bin > > ?share/u-boot/tinker-rk3288/ > > ?share/u-boot/tinker-rk3288/idbloader.img > > ?share/u-boot/tinker-rk3288/u-boot > > -share/u-boot/tinker-rk3288/u-boot-rockchip.bin > > ?share/u-boot/tinker-rk3288/u-boot.bin > > ?share/u-boot/tinker-rk3288/u-boot.img > > ?share/u-boot/turris_omnia/ >