I've been trying to get the rock64 to work with u-boot 2019.10rc4
with the help of solene@ and a motivated user with this board.
(I don't have one to test with). The Rock64 is close to fully
working with 2019.10rc4 u-boot but is experiencing a similar issue
to what NetBSD has reported on the u-boot list.
https://marc.info/?t=156888926600002&r=1&w=2
When booting miniroot66.fs with the u-boot TPL the install
eventually fails with a kernel panic as seen below on
solene@'s board. Using rkbin TPL the install completes
and the resulting system appears stable in light testing.
I have attached the diffs I'm using to the ports
sysutils/arm-trusted-firmware and sysutils/u-boot.
I modified the u-boot port to build idbloader with both
u-boot TPL and rkbin TPL.
Firmware built using the attached diffs are available
here:
http://www.intricatesoftware.com/distfiles/rock64-rk3328-2019.10rc4.zip
Connected to /dev/cuaU0 (speed 115200)
U-Boot TPL 2019.10-rc4 (Sep 26 2019 - 11:15:39)
LPDDR3
Trying to boot from BOOTROM
Returning to boot ROM...
U-Boot SPL 2019.10-rc4 (Sep 26 2019 - 11:15:39 -0400)
Trying to boot from MMC2
Card did not respond to voltage select!
spl: mmc init failed with error: -95
Trying to boot from MMC1
NOTICE: BL31: v2.1(debug):2.1
NOTICE: BL31: Built : 09:56:58, Sep 26 2019
ERROR: over or zero region, nr=4187432, max=10
NOTICE: BL31:Rockchip release version: v1.2
INFO: ARM GICv2 driver initialized
INFO: plat_rockchip_pmu_init: pd status 0xe
INFO: BL31: Initializing runtime services
WARNING: BL31: cortex_a53: CPU workaround for 819472 was missing!
WARNING: BL31: cortex_a53: CPU workaround for 824069 was missing!
WARNING: BL31: cortex_a53: CPU workaround for 827319 was missing!
WARNING: BL31: cortex_a53: CPU workaround for 855873 was missing!
INFO: BL31: Preparing for EL3 exit to normal world
INFO: Entry point address = 0x200000
INFO: SPSR = 0x3c9
U-Boot 2019.10-rc4 (Sep 26 2019 - 11:16:41 -0400)
Model: Pine64 Rock64
DRAM: 4 GiB
MMC: rksdmmc@ff500000: 1, rksdmmc@ff520000: 0
Loading Environment from MMC... *** Warning - bad CRC, using default environment
In: serial@ff130000
Out: serial@ff130000
Err: serial@ff130000
Model: Pine64 Rock64
Net:
Warning: ethernet@ff540000 (eth0) using random MAC address - 72:65:27:40:fe:aa
eth0: ethernet@ff540000
Hit any key to stop autoboot: 0
Card did not respond to voltage select!
switch to partitions #0, OK
mmc1 is current device
Scanning mmc 1:1...
Found EFI removable media binary efi/boot/bootaa64.efi
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
Scanning disk [email protected]...
Card did not respond to voltage select!
Scanning disk [email protected]...
Disk [email protected] not ready
Found 3 disks
BootOrder not defined
EFI boot manager: Cannot load any image
161090 bytes read in 14 ms (11 MiB/s)
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
disks: sd0*
>> OpenBSD/arm64 BOOTAA64 0.19
boot>
cannot open sd0a:/etc/random.seed: No such file or directory
booting sd0a:/bsd: 2216420+622204+8773032+739536
[221782+109+519144+200723]=0xff8900
type 0x2 pa 0x200000 va 0x200000 pages 0x4000 attr 0x8
type 0x7 pa 0x4200000 va 0x4200000 pages 0x3ef4 attr 0x8
type 0x4 pa 0x80f4000 va 0x80f4000 pages 0x18 attr 0x8
type 0x7 pa 0x810c000 va 0x810c000 pages 0xf30b0 attr 0x8
type 0x2 pa 0xfb1bc000 va 0xfb1bc000 pages 0xc30 attr 0x8
type 0x4 pa 0xfbdec000 va 0xfbdec000 pages 0x1 attr 0x8
type 0x2 pa 0xfbded000 va 0xfbded000 pages 0x3 attr 0x8
type 0x7 pa 0xfbdf0000 va 0xfbdf0000 pages 0x1 attr 0x8
type 0x2 pa 0xfbdf1000 va 0xfbdf1000 pages 0x100 attr 0x8
type 0x1 pa 0xfbef1000 va 0xfbef1000 pages 0x28 attr 0x8
type 0x0 pa 0xfbf19000 va 0xfbf19000 pages 0x7 attr 0x8
type 0x4 pa 0xfbf20000 va 0xfbf20000 pages 0x1 attr 0x8
type 0x6 pa 0xfbf21000 va 0x3e024be000 pages 0x1 attr 0x8000000000000008
type 0x4 pa 0xfbf22000 va 0xfbf22000 pages 0x2 attr 0x8
type 0x0 pa 0xfbf24000 va 0xfbf24000 pages 0x4 attr 0x8
type 0x4 pa 0xfbf28000 va 0xfbf28000 pages 0x2 attr 0x8
type 0x6 pa 0xfbf2a000 va 0x3e024c7000 pages 0x1 attr 0x8000000000000008
type 0x2 pa 0xfbf2b000 va 0xfbf2b000 pages 0x3005 attr 0x8
type 0x5 pa 0xfef30000 va 0x3e054cd000 pages 0x10 attr 0x8000000000000008
type 0x2 pa 0xfef40000 va 0xfef40000 pages 0xc0 attr 0x8
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2019 OpenBSD. All rights reserved. https://www.OpenBSD.org
OpenBSD 6.6-beta (RAMDISK) #227: Wed Sep 25 16:09:45 MDT 2019
[email protected]:/usr/src/sys/arch/arm64/compile/RAMDISK
real mem = 4210704384 (4015MB)
avail mem = 4004077568 (3818MB)
mainbus0 at root: Pine64 Rock64
cpu0 at mainbus0 mpidr 0: ARM Cortex-A53 r0p4
cpu0: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 256KB 64b/line 16-way L2 cache
efi0 at mainbus0: UEFI 2.8
efi0: Das U-Boot rev 0x20191000
psci0 at mainbus0: PSCI 1.1, SMCCC 1.1
syscon0 at mainbus0: "syscon"
"io-domains" at syscon0 not configured
syscon1 at mainbus0: "power-management"
rkclock0 at mainbus0
rkclock_set_parent: 0x000000b4
rkclock_set_frequency: 0x000000c4
rkclock_set_frequency: 0x000000c5
rkclock_set_frequency: 0x000000ca
rkclock_set_frequency: 0x000000c1
rkclock_set_frequency: 0x000000bf
rkclock_set_frequency: 0x000000c6
rkclock_set_frequency: 0x000000c8
rkclock_set_frequency: 0x000000c9
rkclock_set_frequency: 0x000000c4
rkclock_set_frequency: 0x000001ac
rkclock_set_frequency: 0x0000013c
rkclock_set_frequency: 0x000000c5
rkclock_set_frequency: 0x00000198
rkclock_set_frequency: 0x0000014a
rkclock_set_frequency: 0x000000ca
rkclock_set_frequency: 0x000001a9
rkclock_set_frequency: 0x000000c1
rkclock_set_frequency: 0x00000045
rkclock_set_frequency: 0x000000bf
rkclock_set_frequency: 0x000000c6
rkclock_set_frequency: 0x000000c8
rkclock_set_frequency: 0x000000c9
rkclock_set_frequency: 0x0000003e
rkclock_set_frequency: 0x00000149
rkclock_set_frequency: 0x000000ce
rkclock_set_frequency: 0x00000140
rkclock_set_frequency: 0x00000061
ampintc0 at mainbus0 nirq 160, ncpu 4: "interrupt-controller"
rkpinctrl0 at mainbus0: "pinctrl"
rkgpio0 at rkpinctrl0
rkgpio1 at rkpinctrl0
rkgpio2 at rkpinctrl0
rkgpio3 at rkpinctrl0
"fit-images" at mainbus0 not configured
"opp_table0" at mainbus0 not configured
agtimer0 at mainbus0: tick rate 24000 KHz
"xin24m" at mainbus0 not configured
com0 at mainbus0: ns16550, no working fifo
com0: console
rkiic0 at mainbus0
iic0 at rkiic0
rkpmic0 at iic0 addr 0x18: RK805
"spi" at mainbus0 not configured
simplebus0 at mainbus0: "amba"
"dmac" at simplebus0 not configured
dwmmc0 at mainbus0: 50 MHz base clock
sdmmc0 at dwmmc0: 4-bit, sd high-speed, mmc high-speed, dma
dwmmc1 at mainbus0: 50 MHz base clock
sdmmc1 at dwmmc1: 8-bit, mmc high-speed, dma
dwge0 at mainbus0
dwge0: address: 72:65:27:40:fe:aa
rgephy0 at dwge0 phy 0: RTL8169S/8110S/8211 PHY, rev. 6
ehci0 at mainbus0
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00
addr 1
ohci0 at mainbus0: version 1.0
"usb" at mainbus0 not configured
"external-gmac-clock" at mainbus0 not configured
"sdmmc-regulator" at mainbus0 not configured
"vcc-host-5v-regulator" at mainbus0 not configured
"vcc-sys" at mainbus0 not configured
"dmc" at mainbus0 not configured
"usb" at mainbus0 not configured
usb1 at ohci0: USB revision 1.0
uhub1 at usb1 configuration 1 interface 0 "Generic OHCI root hub" rev 1.00/1.00
addr 1
scsibus0 at sdmmc0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <SD/MMC, SC32G, 0080> removable
sd0: 30436MB, 512 bytes/sector, 62333952 sectors
sdmmc1: can't enable card
softraid0 at root
scsibus1 at softraid0: 256 targets
bootfile: sd0a:/bsd
boot device: sd0
root on rd0a swap on rd0b dump on rd0b
WARNING: preposterous clock chip time
WARNING: CHECK AND RESET THE DATE!
cpu0: clock not implemented
erase ^?, werase ^W, kill ^U, intr ^C, status ^T
Welcome to the OpenBSD/arm64 6.6 installation program.
(I)nstall, (U)pgrade, (A)utoinstall or (S)hell? i
At any prompt except password prompts you can escape to a shell by
typing '!'. Default answers are shown in []'s and are selected by
pressing RETURN. You can exit this program at any time by pressing
Control-C, but this can leave your system in an inconsistent state.
Terminal type? [vt220]
System hostname? (short form, e.g. 'foo') test
Available network interfaces are: dwge0 vlan0.
Which network interface do you wish to configure? (or 'done') [dwge0]
IPv4 address for dwge0? (or 'dhcp' or 'none') [dhcp]
dwge0: 192.168.1.92 lease accepted from 192.168.1.254 (b8:d9:4d:c3:50:0c)
IPv6 address for dwge0? (or 'autoconf' or 'none') [none]
Available network interfaces are: dwge0 vlan0.
Which network interface do you wish to configure? (or 'done') [done]
Using DNS domainname lan
Using DNS nameservers at 192.168.1.254
Password for root account? (will not echo)
Password for root account? (again)
The root password must be set.
Password for root account? (will not echo)
Password for root account? (again)
Start sshd(8) by default? [yes]
Setup a user? (enter a lower-case loginname, or 'no') [no]
Since no user was setup, root logins via sshd(8) might be useful.
WARNING: root is targeted by password guessing attacks, pubkeys are safer.
Allow root ssh login? (yes, no, prohibit-password) [no]
What timezone are you in? ('?' for list) [Europe/Paris]
Available disks are: sd0.
Which disk is the root disk? ('?' for details) [sd0]
Disk: sd0 geometry: 3880/255/63 [62333952 Sectors]
Offset: 0 Signature: 0xAA55
Starting Ending LBA Info:
#: id C H S - C H S [ start: size ]
-------------------------------------------------------------------------------
*0: 0C 2 10 9 - 2 140 10 [ 32768: 8192 ] FAT32L
1: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused
2: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused
3: A6 2 140 11 - 4 52 48 [ 40960: 26624 ] OpenBSD
Use (W)hole disk or (E)dit the MBR? [whole]
Creating a msdos partition and an OpenBSD partition for rest of sd0...done.
/dev/rsd0i: 32668 sectors in 8167 FAT16 clusters (2048 bytes/cluster)
bps=512 spc=4 res=1 nft=2 rde=512 mid=0xf8 spf=32 spt=63 hds=255 hid=32768
bsec=32768
The auto-allocated layout for sd0 is:
# size offset fstype [fsize bsize cpg]
a: 1024.0M 65536 4.2BSD 2048 16384 1 # /
b: 2042.2M 2162688 swap
c: 30436.5M 0 unused
d: 1689.8M 6345216 4.2BSD 2048 16384 1 # /tmp
e: 2630.9M 9805888 4.2BSD 2048 16384 1 # /var
f: 2481.1M 15193984 4.2BSD 2048 16384 1 # /usr
g: 972.7M 20275296 4.2BSD 2048 16384 1 # /usr/X11R6
h: 3967.4M 22267328 4.2BSD 2048 16384 1 # /usr/local
i: 16.0M 32768 MSDOS
j: 1692.4M 30392480 4.2BSD 2048 16384 1 # /usr/src
k: 5904.9M 33858592 4.2BSD 2048 16384 1 # /usr/obj
l: 7999.1M 45951808 4.2BSD 2048 16384 1 # /home
Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout? [a]
/dev/rsd0a: 1024.0MB in 2097152 sectors of 512 bytes
6 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0l: 7999.1MB in 16382144 sectors of 512 bytes
40 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0d: 1689.8MB in 3460672 sectors of 512 bytes
9 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0f: 2481.1MB in 5081312 sectors of 512 bytes
13 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0g: 972.7MB in 1992032 sectors of 512 bytes
5 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0h: 3967.4MB in 8125152 sectors of 512 bytes
20 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0k: 5904.9MB in 12093216 sectors of 512 bytes
30 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0j: 1692.4MB in 3466112 sectors of 512 bytes
9 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/rsd0e: 2630.9MB in 5388096 sectors of 512 bytes
13 cylinder groups of 202.47MB, 12958 blocks, 25984 inodes each
/dev/sd0a (f8aaba33196230fb.a) on /mnt type ffs (rw, asynchronous, local)
/dev/sd0l (f8aaba33196230fb.l) on /mnt/home type ffs (rw, asynchronous, local,
nodev, nosuid)
/dev/sd0d (f8aaba33196230fb.d) on /mnt/tmp type ffs (rw, asynchronous, local,
nodev, nosuid)
/dev/sd0f (f8aaba33196230fb.f) on /mnt/usr type ffs (rw, asynchronous, local,
nodev)
/dev/sd0g (f8aaba33196230fb.g) on /mnt/usr/X11R6 type ffs (rw, asynchronous,
local, nodev)
/dev/sd0h (f8aaba33196230fb.h) on /mnt/usr/local type ffs (rw, asynchronous,
local, nodev)
/dev/sd0k (f8aaba33196230fb.k) on /mnt/usr/obj type ffs (rw, asynchronous,
local, nodev, nosuid)
/dev/sd0j (f8aaba33196230fb.j) on /mnt/usr/src type ffs (rw, asynchronous,
local, nodev, nosuid)
/dev/sd0e (f8aaba33196230fb.e) on /mnt/var type ffs (rw, asynchronous, local,
nodev, nosuid)
Let's install the sets!
Location of sets? (disk http nfs or 'done') [http] panic: pool_do_get: anonpl
free list modified: page
0xffffff800ba20000; item addr 0xffffff800ba20240; offset 0x0=0xc789c1ed4ba3ab7b
!= 0xc789c1ed4ba3abfb
syncing disks...4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
Index: sysutils/arm-trusted-firmware/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- sysutils/arm-trusted-firmware/Makefile 12 Jul 2019 20:49:39 -0000 1.11
+++ sysutils/arm-trusted-firmware/Makefile 26 Sep 2019 16:19:54 -0000
@@ -9,6 +9,7 @@ GH_PROJECT= arm-trusted-firmware
GH_TAGNAME= v2.1
EPOCH= 0
+REVISION= 0
CATEGORIES= sysutils
@@ -25,6 +26,7 @@ NO_TEST= Yes
USE_GMAKE= Yes
PLATFORMS=\
+ rk3328 \
rk3399 \
sun50i_a64
@@ -37,6 +39,8 @@ do-build:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/arm-trusted-firmware/
+ ${INSTALL_DATA} ${WRKBUILD}/build/rk3328/debug/bl31/bl31.elf \
+ ${PREFIX}/share/arm-trusted-firmware/rk3328-bl31.elf
${INSTALL_DATA} ${WRKBUILD}/build/rk3399/debug/bl31/bl31.elf \
${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
Index: sysutils/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h
===================================================================
RCS file: sysutils/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h
diff -N sysutils/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h 26 Sep 2019 16:19:54 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: plat/rockchip/rk3328/rk3328_def.h
+--- plat/rockchip/rk3328/rk3328_def.h.orig
++++ plat/rockchip/rk3328/rk3328_def.h
+@@ -98,7 +98,7 @@
+ * UART related constants
+ **************************************************************************/
+ #define RK3328_UART2_BASE UART2_BASE
+-#define RK3328_BAUDRATE 1500000
++#define RK3328_BAUDRATE 115200
+ #define RK3328_UART_CLOCK 24000000
+
+ /******************************************************************************
Index: sysutils/arm-trusted-firmware/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- sysutils/arm-trusted-firmware/pkg/PLIST 7 Feb 2019 20:50:18 -0000 1.3
+++ sysutils/arm-trusted-firmware/pkg/PLIST 26 Sep 2019 16:19:54 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2019/02/07 20:50:18 phessler Exp $
@pkgpath sysutils/atf-allwinner
share/arm-trusted-firmware/
+share/arm-trusted-firmware/rk3328-bl31.elf
share/arm-trusted-firmware/rk3399-bl31.elf
share/arm-trusted-firmware/sun50i_a64-bl31.bin
Index: sysutils/u-boot/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.56
diff -u -p -u -r1.56 Makefile
--- sysutils/u-boot/Makefile 5 Sep 2019 16:23:49 -0000 1.56
+++ sysutils/u-boot/Makefile 26 Sep 2019 16:19:54 -0000
@@ -6,8 +6,7 @@ FLAVORS= aarch64 arm
FLAVOR?= arm
COMMENT= U-Boot firmware
-VERSION= 2019.07
-REVISION= 1
+VERSION= 2019.10-rc4
DISTNAME= u-boot-${VERSION}
PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
FULLPKGNAME= ${PKGNAME}
@@ -19,9 +18,21 @@ MAINTAINER= Jonathan Gray <[email protected]
PERMIT_PACKAGE= Yes
MASTER_SITES= https://ftp.denx.de/pub/u-boot/
+MASTER_SITES1= https://github.com/rockchip-linux/rkbin/raw/016471bcfb1a0b1e1269895cb7b6f534813edfdc/bin/rk33/
+
EXTRACT_SUFX= .tar.bz2
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PKG_ARCH= *
+ROCK64_RKBIN_TPL= rk3328_ddr_333MHz_v1.16.bin
+ROCKPRO64_RKBIN_TPL= rk3399_ddr_800MHz_v1.23.bin
+FIREFLY_RKBIN_TPL= rk3399_ddr_666MHz_v1.23.bin
+
+SUPDISTFILES+= ${ROCK64_RKBIN_TPL}:1 \
+ ${ROCKPRO64_RKBIN_TPL}:1 \
+ ${FIREFLY_RKBIN_TPL}:1
+
BUILD_DEPENDS= devel/bison \
devel/dtc \
devel/swig \
@@ -37,10 +48,14 @@ MAKE_ENV= KBUILD_VERBOSE=1 \
PYTHON="${MODPY_BIN}"
.if "${FLAVOR}" == "aarch64"
+DISTFILES+= ${ROCK64_RKBIN_TPL}:1 \
+ ${ROCKPRO64_RKBIN_TPL}:1 \
+ ${FIREFLY_RKBIN_TPL}:1
BUILD_DEPENDS+= devel/arm-none-eabi/gcc-linaro,aarch64 \
devel/py-elftools \
- sysutils/arm-trusted-firmware
+ sysutils/arm-trusted-firmware>=2.1p0v0
MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
+RK3328_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
RK3399_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
SUNXI_BL31= "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
.elif "${FLAVOR}" == "arm"
@@ -69,6 +84,8 @@ BOARDS=\
mvebu_espressobin-88f3720 \
mvebu_mcbin-88f8040 \
qemu_arm64 \
+ rock64-rk3328 \
+ rockpro64-rk3399 \
rpi_3
.elif "${FLAVOR}" == "arm"
OMAP=\
@@ -142,6 +159,7 @@ FILES=\
u-boot-with-spl.bin \
u-boot.itb \
idbloader.img \
+ idbloader-rkbin-tpl.img \
spl/sunxi-spl.bin \
pre-build:
@@ -165,6 +183,30 @@ do-build:
idbloader.img && \
cat spl/u-boot-spl-dtb.bin >> idbloader.img
.endif
+.if "${BOARD}" == "rock64-rk3328"
+ cd ${WRKSRC}/build/${BOARD} && \
+ ${SETENV} ${MAKE_ENV} BL31=${RK3328_BL31} ${MAKE_PROGRAM} \
+ ${MAKE_FLAGS} O="build/${BOARD}" \
+ -f ${MAKE_FILE} u-boot.itb && \
+ tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin \
+ idbloader.img && \
+ cat spl/u-boot-spl-dtb.bin >> idbloader.img && \
+ tools/mkimage -n rk3328 -T rksd -d ${FULLDISTDIR}/${ROCK64_RKBIN_TPL} \
+ idbloader-rkbin-tpl.img && \
+ cat spl/u-boot-spl-dtb.bin >> idbloader-rkbin-tpl.img
+.endif
+.if "${BOARD}" == "rockpro64-rk3399"
+ cd ${WRKSRC}/build/${BOARD} && \
+ ${SETENV} ${MAKE_ENV} BL31=${RK3399_BL31} ${MAKE_PROGRAM} \
+ ${MAKE_FLAGS} O="build/${BOARD}" \
+ -f ${MAKE_FILE} u-boot.itb && \
+ tools/mkimage -n rk3399 -T rksd -d tpl/u-boot-tpl.bin \
+ idbloader.img && \
+ cat spl/u-boot-spl-dtb.bin >> idbloader.img && \
+ tools/mkimage -n rk3399 -T rksd -d ${FULLDISTDIR}/${ROCKPRO64_RKBIN_TPL} \
+ idbloader-rkbin-tpl.img && \
+ cat spl/u-boot-spl-dtb.bin >> idbloader-rkbin-tpl.img
+.endif
.if "${BOARD}" == "firefly-rk3399"
cd ${WRKSRC}/build/${BOARD} && \
${SETENV} ${MAKE_ENV} BL31=${RK3399_BL31} ${MAKE_PROGRAM} \
@@ -172,7 +214,10 @@ do-build:
-f ${MAKE_FILE} u-boot.itb && \
tools/mkimage -n rk3399 -T rksd -d tpl/u-boot-tpl.bin \
idbloader.img && \
- cat spl/u-boot-spl-dtb.bin >> idbloader.img
+ cat spl/u-boot-spl-dtb.bin >> idbloader.img && \
+ tools/mkimage -n rk3399 -T rksd -d ${FULLDISTDIR}/${FIREFLY_RKBIN_TPL} \
+ idbloader-rkbin-tpl.img && \
+ cat spl/u-boot-spl-dtb.bin >> idbloader-rkbin-tpl.img
.endif
.endfor
.for BOARD in ${SUNXI64}
Index: sysutils/u-boot/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- sysutils/u-boot/distinfo 28 Jul 2019 06:57:19 -0000 1.26
+++ sysutils/u-boot/distinfo 26 Sep 2019 16:19:54 -0000
@@ -1,2 +1,8 @@
-SHA256 (u-boot-2019.07.tar.bz2) = v/T6d+jaF1IcAwykxblHoFbBsb5NPm7oY3AguNUCUdA=
-SIZE (u-boot-2019.07.tar.bz2) = 13939667
+SHA256 (rk3328_ddr_333MHz_v1.16.bin) = mHGeBGzI8zyjHOk6Vp3D1O4WSY33b54fPRjC9NcXrHA=
+SHA256 (rk3399_ddr_666MHz_v1.23.bin) = cNb8+lhNyTFTI+WXfs6isrb61u611VbrDHU/MHhBJqY=
+SHA256 (rk3399_ddr_800MHz_v1.23.bin) = eeufH1rAOUxkjQ321Ta+G+PKb+Le3zOr6INDzjnZHyE=
+SHA256 (u-boot-2019.10-rc4.tar.bz2) = UodcaScUACoHBKIMMKno/wMuPP3hoI887kbPPXgMUIE=
+SIZE (rk3328_ddr_333MHz_v1.16.bin) = 28532
+SIZE (rk3399_ddr_666MHz_v1.23.bin) = 77924
+SIZE (rk3399_ddr_800MHz_v1.23.bin) = 77908
+SIZE (u-boot-2019.10-rc4.tar.bz2) = 14213595
Index: sysutils/u-boot/patches/patch-arch_arm_dts_rk3328-rock64_dts
===================================================================
RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_rk3328-rock64_dts
diff -N sysutils/u-boot/patches/patch-arch_arm_dts_rk3328-rock64_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot/patches/patch-arch_arm_dts_rk3328-rock64_dts 26 Sep 2019 16:19:54 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: arch/arm/dts/rk3328-rock64.dts
+--- arch/arm/dts/rk3328-rock64.dts.orig
++++ arch/arm/dts/rk3328-rock64.dts
+@@ -11,7 +11,7 @@
+ compatible = "pine64,rock64", "rockchip,rk3328";
+
+ chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ gmac_clkin: external-gmac-clock {
Index: sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts
===================================================================
RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts
diff -N sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts 26 Sep 2019 16:19:54 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: arch/arm/dts/rk3399-rockpro64.dts
+--- arch/arm/dts/rk3399-rockpro64.dts.orig
++++ arch/arm/dts/rk3399-rockpro64.dts
+@@ -15,7 +15,7 @@
+ compatible = "pine64,rockpro64", "rockchip,rk3399";
+
+ chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ clkin_gmac: external-gmac-clock {
Index: sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configs_firefly-rk3399_defconfig
--- sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig 28 Jul 2019 06:57:20 -0000 1.2
+++ sysutils/u-boot/patches/patch-configs_firefly-rk3399_defconfig 26 Sep 2019 16:19:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_firefly-rk3399_d
Index: configs/firefly-rk3399_defconfig
--- configs/firefly-rk3399_defconfig.orig
+++ configs/firefly-rk3399_defconfig
-@@ -42,7 +42,7 @@ CONFIG_PMIC_RK8XX=y
+@@ -40,7 +40,7 @@ CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
Index: sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
===================================================================
RCS file: sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
diff -N sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig 26 Sep 2019 16:19:54 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configs/rock64-rk3328_defconfig
+--- configs/rock64-rk3328_defconfig.orig
++++ configs/rock64-rk3328_defconfig
+@@ -76,7 +76,7 @@ CONFIG_RAM=y
+ CONFIG_SPL_RAM=y
+ CONFIG_TPL_RAM=y
+ CONFIG_DM_RESET=y
+-CONFIG_BAUDRATE=1500000
++CONFIG_BAUDRATE=115200
+ CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYSRESET=y
+ CONFIG_USB=y
Index: sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configs_rockpro64-rk3399_defconfig
--- sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig 28 Jul 2019 06:57:20 -0000 1.1
+++ sysutils/u-boot/patches/patch-configs_rockpro64-rk3399_defconfig 26 Sep 2019 16:19:54 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_rockpro64-rk3399
Index: configs/rockpro64-rk3399_defconfig
--- configs/rockpro64-rk3399_defconfig.orig
+++ configs/rockpro64-rk3399_defconfig
-@@ -41,7 +41,7 @@ CONFIG_PMIC_RK8XX=y
- CONFIG_REGULATOR_PWM=y
+@@ -43,7 +43,7 @@ CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
+ CONFIG_RAM_RK3399_LPDDR4=y
-CONFIG_BAUDRATE=1500000
+CONFIG_BAUDRATE=115200
CONFIG_DEBUG_UART_SHIFT=2
Index: sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-configs_rpi_2_defconfig
--- sysutils/u-boot/patches/patch-configs_rpi_2_defconfig 15 Jan 2019 05:44:18 -0000 1.6
+++ sysutils/u-boot/patches/patch-configs_rpi_2_defconfig 26 Sep 2019 16:19:54 -0000
@@ -19,7 +19,7 @@ to variants of RPi hardware.
Index: configs/rpi_2_defconfig
--- configs/rpi_2_defconfig.orig
+++ configs/rpi_2_defconfig
-@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
+@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y
Index: sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-configs_rpi_3_32b_defconfig
--- sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig 15 Jan 2019 05:44:18 -0000 1.6
+++ sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig 26 Sep 2019 16:19:54 -0000
@@ -19,7 +19,7 @@ to variants of RPi hardware.
Index: configs/rpi_3_32b_defconfig
--- configs/rpi_3_32b_defconfig.orig
+++ configs/rpi_3_32b_defconfig
-@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y
Index: sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-configs_rpi_3_defconfig
--- sysutils/u-boot/patches/patch-configs_rpi_3_defconfig 15 Jan 2019 05:44:18 -0000 1.6
+++ sysutils/u-boot/patches/patch-configs_rpi_3_defconfig 26 Sep 2019 16:19:54 -0000
@@ -19,7 +19,7 @@ to variants of RPi hardware.
Index: configs/rpi_3_defconfig
--- configs/rpi_3_defconfig.orig
+++ configs/rpi_3_defconfig
-@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y
Index: sysutils/u-boot/patches/patch-lib_efi_loader_efi_boottime_c
===================================================================
RCS file: sysutils/u-boot/patches/patch-lib_efi_loader_efi_boottime_c
diff -N sysutils/u-boot/patches/patch-lib_efi_loader_efi_boottime_c
--- sysutils/u-boot/patches/patch-lib_efi_loader_efi_boottime_c 28 Jul 2019 06:57:20 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-lib_efi_loader_efi_boottime_c,v 1.5 2019/07/28 06:57:20 jsg Exp $
-
-f69d63fae281ba98c3d063097cf4e95d17f3754d in 2019.04 and later stopped
-flushing/disabling caches on armv7 which is required to load
-OpenBSD/armv7 kernels on at least i.MX 6.
-
-Index: lib/efi_loader/efi_boottime.c
---- lib/efi_loader/efi_boottime.c.orig
-+++ lib/efi_loader/efi_boottime.c
-@@ -2875,8 +2875,6 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image
- if (ret != EFI_SUCCESS)
- return EFI_EXIT(EFI_INVALID_PARAMETER);
-
-- efi_is_direct_boot = false;
--
- image_obj->exit_data_size = exit_data_size;
- image_obj->exit_data = exit_data;
-
Index: sysutils/u-boot/pkg/PFRAG.aarch64
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
retrieving revision 1.12
diff -u -p -u -r1.12 PFRAG.aarch64
--- sysutils/u-boot/pkg/PFRAG.aarch64 30 Jul 2019 17:55:47 -0000 1.12
+++ sysutils/u-boot/pkg/PFRAG.aarch64 26 Sep 2019 16:19:54 -0000
@@ -16,6 +16,7 @@ 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-rkbin-tpl.img
share/u-boot/firefly-rk3399/idbloader.img
share/u-boot/firefly-rk3399/u-boot
share/u-boot/firefly-rk3399/u-boot.bin
@@ -86,6 +87,20 @@ 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
+share/u-boot/rock64-rk3328/
+share/u-boot/rock64-rk3328/idbloader-rkbin-tpl.img
+share/u-boot/rock64-rk3328/idbloader.img
+share/u-boot/rock64-rk3328/u-boot
+share/u-boot/rock64-rk3328/u-boot.bin
+share/u-boot/rock64-rk3328/u-boot.img
+share/u-boot/rock64-rk3328/u-boot.itb
+share/u-boot/rockpro64-rk3399/
+share/u-boot/rockpro64-rk3399/idbloader-rkbin-tpl.img
+share/u-boot/rockpro64-rk3399/idbloader.img
+share/u-boot/rockpro64-rk3399/u-boot
+share/u-boot/rockpro64-rk3399/u-boot.bin
+share/u-boot/rockpro64-rk3399/u-boot.img
+share/u-boot/rockpro64-rk3399/u-boot.itb
share/u-boot/rpi_3/
share/u-boot/rpi_3/u-boot
share/u-boot/rpi_3/u-boot.bin
