Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-20 Thread Artturi Alm
On Mon, Aug 21, 2017 at 11:14:48AM +1000, Jonathan Gray wrote:
> On Mon, Aug 21, 2017 at 12:53:15AM +0300, Artturi Alm wrote:
> > Hi,
> > 
> > this + sysutils/atf-allwinner produced binaries i successfully used to
> > install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :)
> > the .dtb i used in miniroot was from current dtb-4.12 pkg.
> > 
> > -Artturi
> 
> u-boot.itb/u-boot-sunxi-with-spl.bin includes dtbs.
> 
> /dts-v1/;
> 
> / {
>   description = "Configuration to load ATF before U-Boot";
>   #address-cells = <1>;
> 
>   images {
>   uboot@1 {
>   description = "U-Boot (64-bit)";
>   data = /incbin/("u-boot-nodtb.bin");
>   type = "standalone";
>   arch = "arm64";
>   compression = "none";
>   load = <0x4a00>;
>   };
>   atf@1 {
>   description = "ARM Trusted Firmware";
>   data = 
> /incbin/("/usr/local/share/atf-allwinner/bl31.bin");
>   type = "firmware";
>   arch = "arm64";
>   compression = "none";
>   load = <0x44000>;
>   entry = <0x44000>;
>   };
>   fdt@1 {
>   description = "sun50i-a64-pine64";
>   data = /incbin/("arch/arm/dts/sun50i-a64-pine64.dtb");
>   type = "flat_dt";
>   compression = "none";
>   };
>   fdt@2 {
>   description = "sun50i-a64-pine64-plus";
>   data = 
> /incbin/("arch/arm/dts/sun50i-a64-pine64-plus.dtb");
>   type = "flat_dt";
>   compression = "none";
>   };
>   };
>   configurations {
>   default = "config@1";
> 
>   config@1 {
>   description = "sun50i-a64-pine64";
>   firmware = "uboot@1";
>   loadables = "atf@1";
>   fdt = "fdt@1";
>   };
>   config@2 {
>   description = "sun50i-a64-pine64-plus";
>   firmware = "uboot@1";
>   loadables = "atf@1";
>   fdt = "fdt@2";
>   };
>   };
> };

oh, cool, i didn't know u-boot passes it like that, i only did "fdt header"
and downloaded .dtb to memory and wrote it to sd w/fatwrite from u-boot,
but looking at "env print" now i can see it was obviously useless indeed,
and the dtb had correctly vanished after install:)

-Artturi


INFO:PSCI Affinity Map:
INFO:  AffInst: Level 0, MPID 0x0, State ON
INFO:  AffInst: Level 0, MPID 0x1, State OFF
INFO:  AffInst: Level 0, MPID 0x2, State OFF
INFO:  AffInst: Level 0, MPID 0x3, State OFF

U-Boot SPL 2017.09-rc2 (Aug 19 2017 - 15:25:54)
DRAM: 1024 MiB
Trying to boot from MMC1
NOTICE:  BL3-1: Running on A64/H64 (1689) in SRAM A2 (@0x44000)
NOTICE:  Configuring SPC Controller
NOTICE:  BL3-1: v1.0(debug):20170702
NOTICE:  BL3-1: Built : 13:28:54, Aug 19 2017
NOTICE:  Configuring AXP PMIC
NOTICE:  PMIC: setup successful
NOTICE:  SCPI: dummy stub handler, implementation level: 00
INFO:BL3-1: Initializing runtime services
INFO:BL3-1: Preparing for EL3 exit to normal world
INFO:BL3-1: Next image address: 0x4a00, SPSR: 0x3c9


U-Boot 2017.09-rc2 (Aug 19 2017 - 15:25:54 +1000) Allwinner Technology

CPU:   Allwinner A64 (SUN50I)
Model: Pine64+
DRAM:  1 GiB
MMC:   SUNXI SD/MMC: 0
*** Warning - bad CRC, using default environment

In:serial
Out:   serial
Err:   serial
Net:   phy interface7
eth0: ethernet@01c3
starting USB...
USB0:   USB EHCI 1.00
USB1:   USB OHCI 1.0
scanning bus 0 for devices... 2 USB Device(s) found
   scanning usb for storage devices... 0 Storage Device(s) found
Hit any key to stop autoboot:  0
=>  fdt header
No FDT memory address configured. Please configure
the FDT address via "fdt addr " command.
Aborting!
=> bdinfo
arch_number = 0x
boot_params = 0x4100
DRAM bank   = 0x
-> start= 0x4000
-> size = 0x4000
baudrate= 115200 bps
TLB addr= 0x7FFF
relocaddr   = 0x7DF59000
reloc off   = 0x33F59000
irq_sp  = 0x79F35CC0
sp start= 0x79F35CC0
Early malloc usage: 2e0 / 400
fdt_blob = 79f35cd8
=> fdt addr 79f35cd8
=> fdt header
magic:  0xd00dfeed
totalsize:  0x2119 (8473)
off_dt_struct:  0x38
off_dt_strings: 0x1e58
off_mem_rsvmap: 0x28
version:17
last_comp_version:  16
boot_cpuid_phys:0x0
size_dt_strings:0x2c1
size_dt_struct: 0x1e20
number mem_rsv: 0x0

=>



Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-20 Thread Jonathan Gray
On Mon, Aug 21, 2017 at 12:53:15AM +0300, Artturi Alm wrote:
> Hi,
> 
> this + sysutils/atf-allwinner produced binaries i successfully used to
> install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :)
> the .dtb i used in miniroot was from current dtb-4.12 pkg.
> 
> -Artturi

u-boot.itb/u-boot-sunxi-with-spl.bin includes dtbs.

/dts-v1/;

/ {
description = "Configuration to load ATF before U-Boot";
#address-cells = <1>;

images {
uboot@1 {
description = "U-Boot (64-bit)";
data = /incbin/("u-boot-nodtb.bin");
type = "standalone";
arch = "arm64";
compression = "none";
load = <0x4a00>;
};
atf@1 {
description = "ARM Trusted Firmware";
data = 
/incbin/("/usr/local/share/atf-allwinner/bl31.bin");
type = "firmware";
arch = "arm64";
compression = "none";
load = <0x44000>;
entry = <0x44000>;
};
fdt@1 {
description = "sun50i-a64-pine64";
data = /incbin/("arch/arm/dts/sun50i-a64-pine64.dtb");
type = "flat_dt";
compression = "none";
};
fdt@2 {
description = "sun50i-a64-pine64-plus";
data = 
/incbin/("arch/arm/dts/sun50i-a64-pine64-plus.dtb");
type = "flat_dt";
compression = "none";
};
};
configurations {
default = "config@1";

config@1 {
description = "sun50i-a64-pine64";
firmware = "uboot@1";
loadables = "atf@1";
fdt = "fdt@1";
};
config@2 {
description = "sun50i-a64-pine64-plus";
firmware = "uboot@1";
loadables = "atf@1";
fdt = "fdt@2";
};
};
};



Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-20 Thread Artturi Alm
Hi,

this + sysutils/atf-allwinner produced binaries i successfully used to
install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :)
the .dtb i used in miniroot was from current dtb-4.12 pkg.

-Artturi



Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-20 Thread Jonathan Gray
On Sat, Aug 19, 2017 at 11:22:09PM -0400, Patrick Wildt wrote:
> On Sat, Aug 19, 2017 at 08:23:40PM +1000, Jonathan Gray wrote:
> > With the not yet committed atf-allwinner port this builds complete
> > images for Allwinner aarch64 targets.
> > 
> > Compile tested only, I have no Allwinner hardware.
> > 
> > Details are described in
> > http://git.denx.de/?p=u-boot.git;a=blob_plain;f=board/sunxi/README.sunxi64;hb=HEAD
> > 
> > sunxi-spl.bin/u-boot.itb made available for boards with spi flash.
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> > retrieving revision 1.23
> > diff -u -p -r1.23 Makefile
> > --- Makefile19 Aug 2017 04:40:40 -  1.23
> > +++ Makefile19 Aug 2017 10:13:06 -
> > @@ -7,6 +7,7 @@ FLAVOR?=arm
> >  
> >  COMMENT=   U-Boot firmware
> >  VERSION=   2017.09-rc2
> > +REVISION=  0
> >  DISTNAME=  u-boot-${VERSION}
> >  PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
> >  FULLPKGNAME=   ${PKGNAME}
> > @@ -35,8 +36,10 @@ MAKE_ENV=KBUILD_VERBOSE=1 \
> > PYTHON="${MODPY_BIN}"
> >  
> >  .if "${FLAVOR}" == "aarch64"
> > -BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
> > -MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
> > +BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64 \
> > +   sysutils/atf-allwinner
> > +MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" \
> > +   BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"
> 
> Cool stuff!  But I think this BL31 MAKE_ENV addition needs to be applied
> only for the allwinner boards, because the rockchip will definitely need
> a different ATF binary.

Well, we don't build any aarch64 rockchip targets yet and
it seems the relevant U-Boot bits are still landing upstream.

Here is a diff to only set the environment variable for aarch64
Allwinner targets to be ready for when U-Boot is ready.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile19 Aug 2017 04:40:40 -  1.23
+++ Makefile20 Aug 2017 08:33:20 -
@@ -7,6 +7,7 @@ FLAVOR?=arm
 
 COMMENT=   U-Boot firmware
 VERSION=   2017.09-rc2
+REVISION=  0
 DISTNAME=  u-boot-${VERSION}
 PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=   ${PKGNAME}
@@ -35,8 +36,10 @@ MAKE_ENV=KBUILD_VERBOSE=1 \
PYTHON="${MODPY_BIN}"
 
 .if "${FLAVOR}" == "aarch64"
-BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
+BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64 \
+   sysutils/atf-allwinner
 MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
+SUNXI_BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"
 .elif "${FLAVOR}" == "arm"
 BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro
 MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
@@ -46,13 +49,15 @@ USE_GMAKE=  Yes
 NO_TEST=   Yes
 
 .if "${FLAVOR}" == "aarch64"
-BOARDS=\
+SUNXI64=\
bananapi_m64 \
nanopi_neo2 \
orangepi_pc2 \
orangepi_prime \
orangepi_win \
pine64_plus \
+   sopine_baseboard
+BOARDS=\
rpi_3
 .elif "${FLAVOR}" == "arm"
 OMAP=\
@@ -60,6 +65,7 @@ OMAP=\
omap4_panda \
am335x_boneblack \
am57xx_evm
+SUNXI64=
 SUNXI=\
A10-OLinuXino-Lime \
A10s-OLinuXino-M \
@@ -120,7 +126,9 @@ FILES=\
u-boot-sunxi-with-spl.bin \
u-boot.imx \
u-boot-spl.kwb \
-   u-boot-with-spl.bin
+   u-boot-with-spl.bin \
+   u-boot.itb \
+   spl/sunxi-spl.bin
 
 pre-build:
${SUBST_CMD} ${WRKBUILD}/tools/Makefile
@@ -145,10 +153,25 @@ do-build:
cat u-boot-dtb.bin >> u-boot-with-spl.bin
 .endif
 .endfor
+.for BOARD in ${SUNXI64}
+   cd ${WRKSRC} && \
+   mkdir -p build/${BOARD} && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} ${ALL_TARGET}
+   if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
+ -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
+   cd ${WRKSRC}/build/${BOARD} && \
+   cat spl/sunxi-spl.bin u-boot.itb > 
u-boot-sunxi-with-spl.bin ; \
+   fi
+.endfor
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
-.for BOARD in ${BOARDS}
+.for BOARD in ${BOARDS} ${SUNXI64}
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot/${BOARD}
-cd ${WRKSRC}/build/${BOARD} && \
cp ${FILES} ${PREFIX}/share/u-boot/${BOARD}/
Index: pkg/PFRAG.aarch64
===
RCS file: /cvs/ports/sysutils

Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-19 Thread Patrick Wildt
On Sat, Aug 19, 2017 at 08:23:40PM +1000, Jonathan Gray wrote:
> With the not yet committed atf-allwinner port this builds complete
> images for Allwinner aarch64 targets.
> 
> Compile tested only, I have no Allwinner hardware.
> 
> Details are described in
> http://git.denx.de/?p=u-boot.git;a=blob_plain;f=board/sunxi/README.sunxi64;hb=HEAD
> 
> sunxi-spl.bin/u-boot.itb made available for boards with spi flash.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile  19 Aug 2017 04:40:40 -  1.23
> +++ Makefile  19 Aug 2017 10:13:06 -
> @@ -7,6 +7,7 @@ FLAVOR?=  arm
>  
>  COMMENT= U-Boot firmware
>  VERSION= 2017.09-rc2
> +REVISION=0
>  DISTNAME=u-boot-${VERSION}
>  PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
>  FULLPKGNAME= ${PKGNAME}
> @@ -35,8 +36,10 @@ MAKE_ENV=  KBUILD_VERBOSE=1 \
>   PYTHON="${MODPY_BIN}"
>  
>  .if "${FLAVOR}" == "aarch64"
> -BUILD_DEPENDS+=  devel/arm-none-eabi/gcc-linaro,aarch64
> -MAKE_ENV+=   CROSS_COMPILE="aarch64-none-elf-"
> +BUILD_DEPENDS+=  devel/arm-none-eabi/gcc-linaro,aarch64 \
> + sysutils/atf-allwinner
> +MAKE_ENV+=   CROSS_COMPILE="aarch64-none-elf-" \
> + BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"

Cool stuff!  But I think this BL31 MAKE_ENV addition needs to be applied
only for the allwinner boards, because the rockchip will definitely need
a different ATF binary.

>  .elif "${FLAVOR}" == "arm"
>  BUILD_DEPENDS+=  devel/arm-none-eabi/gcc-linaro
>  MAKE_ENV+=   CROSS_COMPILE="arm-none-eabi-"
> @@ -120,7 +123,9 @@ FILES=\
>   u-boot-sunxi-with-spl.bin \
>   u-boot.imx \
>   u-boot-spl.kwb \
> - u-boot-with-spl.bin
> + u-boot-with-spl.bin \
> + u-boot.itb \
> + spl/sunxi-spl.bin
>  
>  pre-build:
>   ${SUBST_CMD} ${WRKBUILD}/tools/Makefile
> @@ -144,6 +149,11 @@ do-build:
>   u-boot-with-spl.bin && \
>   cat u-boot-dtb.bin >> u-boot-with-spl.bin
>  .endif
> + if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> +   -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
> + cd ${WRKSRC}/build/${BOARD} && \
> + cat spl/sunxi-spl.bin u-boot.itb > 
> u-boot-sunxi-with-spl.bin ; \
> + fi
>  .endfor
>  
>  do-install:
> Index: pkg/PFRAG.aarch64
> ===
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
> retrieving revision 1.3
> diff -u -p -r1.3 PFRAG.aarch64
> --- pkg/PFRAG.aarch64 30 Jul 2017 05:53:03 -  1.3
> +++ pkg/PFRAG.aarch64 19 Aug 2017 10:13:06 -
> @@ -1,29 +1,47 @@
>  @comment $OpenBSD: PFRAG.aarch64,v 1.3 2017/07/30 05:53:03 jsg Exp $
>  share/u-boot/
>  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/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/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/rpi_3/
>  share/u-boot/rpi_3/u-boot
>  share/u-boot/rpi_3/u-boot.bin
> Index: pkg/PFRAG.arm
> ===
> RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.arm,v
> retrieving revision 1.7
> diff -u -p -r1.7 PFRAG.arm
> --- pkg/PFRAG.arm 1 Aug 2017 23:25:44 -   1.7
> +++ pkg/PFRAG.arm 19 Aug 2017 10:13:06 -
> @@ -2,101 +2,121 @@
>  @pkgpath sys

build combined spl/uboot/dtb/atf images for Allwinner A64/H5

2017-08-19 Thread Jonathan Gray
With the not yet committed atf-allwinner port this builds complete
images for Allwinner aarch64 targets.

Compile tested only, I have no Allwinner hardware.

Details are described in
http://git.denx.de/?p=u-boot.git;a=blob_plain;f=board/sunxi/README.sunxi64;hb=HEAD

sunxi-spl.bin/u-boot.itb made available for boards with spi flash.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile19 Aug 2017 04:40:40 -  1.23
+++ Makefile19 Aug 2017 10:13:06 -
@@ -7,6 +7,7 @@ FLAVOR?=arm
 
 COMMENT=   U-Boot firmware
 VERSION=   2017.09-rc2
+REVISION=  0
 DISTNAME=  u-boot-${VERSION}
 PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=   ${PKGNAME}
@@ -35,8 +36,10 @@ MAKE_ENV=KBUILD_VERBOSE=1 \
PYTHON="${MODPY_BIN}"
 
 .if "${FLAVOR}" == "aarch64"
-BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
-MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
+BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64 \
+   sysutils/atf-allwinner
+MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" \
+   BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"
 .elif "${FLAVOR}" == "arm"
 BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro
 MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
@@ -120,7 +123,9 @@ FILES=\
u-boot-sunxi-with-spl.bin \
u-boot.imx \
u-boot-spl.kwb \
-   u-boot-with-spl.bin
+   u-boot-with-spl.bin \
+   u-boot.itb \
+   spl/sunxi-spl.bin
 
 pre-build:
${SUBST_CMD} ${WRKBUILD}/tools/Makefile
@@ -144,6 +149,11 @@ do-build:
u-boot-with-spl.bin && \
cat u-boot-dtb.bin >> u-boot-with-spl.bin
 .endif
+   if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
+ -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
+   cd ${WRKSRC}/build/${BOARD} && \
+   cat spl/sunxi-spl.bin u-boot.itb > 
u-boot-sunxi-with-spl.bin ; \
+   fi
 .endfor
 
 do-install:
Index: pkg/PFRAG.aarch64
===
RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.aarch64
--- pkg/PFRAG.aarch64   30 Jul 2017 05:53:03 -  1.3
+++ pkg/PFRAG.aarch64   19 Aug 2017 10:13:06 -
@@ -1,29 +1,47 @@
 @comment $OpenBSD: PFRAG.aarch64,v 1.3 2017/07/30 05:53:03 jsg Exp $
 share/u-boot/
 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/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/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/rpi_3/
 share/u-boot/rpi_3/u-boot
 share/u-boot/rpi_3/u-boot.bin
Index: pkg/PFRAG.arm
===
RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.arm,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.arm
--- pkg/PFRAG.arm   1 Aug 2017 23:25:44 -   1.7
+++ pkg/PFRAG.arm   19 Aug 2017 10:13:06 -
@@ -2,101 +2,121 @@
 @pkgpath sysutils/u-boot,
 share/u-boot/
 share/u-boot/A10-OLinuXino-Lime/
+share/u-boot/A10-OLinuXino-Lime/sunxi-spl.bin
 share/u-boot/A10-OLinuXino-Lime/u-boot
 share/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
 share/u-boot/A10-OLinuXino-Lime/u-boot.bin
 share/u-boot/A10-OLinuXino-Lime/u-boot.img
 share/u-boot/A10s-OLinuXino-M/
+share/u-boot/A10s-OLinuXino-M/sunxi-spl.bin
 share/u-boot/A10s-OLinuXino-M/u-boot