svn commit: r556066 - in head/sysutils: atf-master u-boot-a64-olinuxino u-boot-firefly-rk3399 u-boot-master u-boot-nanopi-a64 u-boot-nanopi-neo2 u-boot-orangepi-pc2 u-boot-pine64 u-boot-pine64-lts ...

Sun Nov 22 17:37:46 UTC 2020

Author: manu
Date: Sun Nov 22 17:37:40 2020
New Revision: 556066
URL: https://svnweb.freebsd.org/changeset/ports/556066

Log:
  sysutils/atf: Update to v2.4
  
  Bump u-boot ports that depends on it.
  While here update the metadata and pkg-descr for the allwinner64 family so
  u-boot is put in an alternate location that doesn't conflict with GPT
  partitions.

Modified:
  head/sysutils/atf-master/Makefile
  head/sysutils/atf-master/distinfo
  head/sysutils/u-boot-a64-olinuxino/Makefile
  head/sysutils/u-boot-a64-olinuxino/pkg-descr
  head/sysutils/u-boot-firefly-rk3399/Makefile
  head/sysutils/u-boot-firefly-rk3399/pkg-descr
  head/sysutils/u-boot-master/Makefile
  head/sysutils/u-boot-nanopi-a64/Makefile
  head/sysutils/u-boot-nanopi-a64/pkg-descr
  head/sysutils/u-boot-nanopi-neo2/Makefile
  head/sysutils/u-boot-nanopi-neo2/pkg-descr
  head/sysutils/u-boot-orangepi-pc2/Makefile
  head/sysutils/u-boot-orangepi-pc2/pkg-descr
  head/sysutils/u-boot-pine64-lts/Makefile
  head/sysutils/u-boot-pine64-lts/pkg-descr
  head/sysutils/u-boot-pine64/Makefile
  head/sysutils/u-boot-pine64/pkg-descr
  head/sysutils/u-boot-pinebook/Makefile
  head/sysutils/u-boot-pinebook/pkg-descr
  head/sysutils/u-boot-pinebookpro/Makefile
  head/sysutils/u-boot-rock64/Makefile
  head/sysutils/u-boot-rockpro64/Makefile
  head/sysutils/u-boot-sopine-spi/Makefile
  head/sysutils/u-boot-sopine/Makefile
  head/sysutils/u-boot-sopine/pkg-descr

Modified: head/sysutils/atf-master/Makefile
==============================================================================

--- head/sysutils/atf-master/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/atf-master/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -24,7 +24,7 @@ MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
 ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= bl31
 
 # Default to the latest release
-ATF_VERSION?=	v2.3
+ATF_VERSION?=	v2.4
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 

Modified: head/sysutils/atf-master/distinfo
==============================================================================
--- head/sysutils/atf-master/distinfo	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/atf-master/distinfo	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587662546
-SHA256 (ARM-software-arm-trusted-firmware-v2.3_GH0.tar.gz) = 304d372327d6ecabf89da67e2e1a7b2660f13b5851886fef1b58ae5a6d74e606
-SIZE (ARM-software-arm-trusted-firmware-v2.3_GH0.tar.gz) = 4321775
+TIMESTAMP = 1606065143
+SHA256 (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d
+SIZE (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4593582

Modified: head/sysutils/u-boot-a64-olinuxino/Makefile
==============================================================================
--- head/sysutils/u-boot-a64-olinuxino/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-a64-olinuxino/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		a64-olinuxino
 BOARD_CONFIG=	a64-olinuxino_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-a64-olinuxino/pkg-descr
==============================================================================
--- head/sysutils/u-boot-a64-olinuxino/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-a64-olinuxino/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the A64-Olinuxino.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-a64-olinuxino/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-a64-olinuxino/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-firefly-rk3399/Makefile
==============================================================================
--- head/sysutils/u-boot-firefly-rk3399/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-firefly-rk3399/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		firefly-rk3399
 BOARD_CONFIG=	firefly-rk3399_defconfig
 FAMILY=		rk3399

Modified: head/sysutils/u-boot-firefly-rk3399/pkg-descr
==============================================================================
--- head/sysutils/u-boot-firefly-rk3399/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-firefly-rk3399/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Firefly RK3399.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbloader.img of=/path/to/sdcarddevice seek=64
-dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/u-boot.itb of=/path/to/sdcarddevice seek=16384 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/idbloader.img of=/path/to/sdcarddevice seek=64 bs=512 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-firefly-rk3399/u-boot.itb of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync
 
 WWW: https://www.denx.de/wiki/U-Boot

Modified: head/sysutils/u-boot-master/Makefile
==============================================================================
--- head/sysutils/u-boot-master/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-master/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -71,8 +71,8 @@ UBOOT_PLIST_ALLWINNER64=${UBOOT_PLIST_ALLWINNER}
 UBOOT_ARCH_ALLWINNER64=aarch64
 UBOOT_METADATA_ALLWINNER64_FILES=	${UBOOT_PLIST_ALLWINNER64}
 UBOOT_METADATA_ALLWINNER64_METHOD=	raw
-UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	8
-UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
+UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	1
+UBOOT_METADATA_ALLWINNER64_RAW_BS=	128k
 
 # Overrides for Zynq 7000 family
 UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt

Modified: head/sysutils/u-boot-nanopi-a64/Makefile
==============================================================================
--- head/sysutils/u-boot-nanopi-a64/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-nanopi-a64/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=         nanopi_a64
 BOARD_CONFIG=  nanopi_a64_defconfig
 FAMILY=                allwinner64

Modified: head/sysutils/u-boot-nanopi-a64/pkg-descr
==============================================================================
--- head/sysutils/u-boot-nanopi-a64/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-nanopi-a64/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the NanoPI A64.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-nanopi-a64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-nanopi-a64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-nanopi-neo2/Makefile
==============================================================================
--- head/sysutils/u-boot-nanopi-neo2/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-nanopi-neo2/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=     ${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=         nanopi-neo2
 BOARD_CONFIG=  nanopi_neo2_defconfig
 FAMILY=                allwinner64

Modified: head/sysutils/u-boot-nanopi-neo2/pkg-descr
==============================================================================
--- head/sysutils/u-boot-nanopi-neo2/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-nanopi-neo2/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the NanoPi NEO2
 
 To install this bootloader on an sdcard just do:
-dd if=$LOCALBASE/share/u-boot/u-boot-nanopi-neo2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=$LOCALBASE/share/u-boot/u-boot-nanopi-neo2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-orangepi-pc2/Makefile
==============================================================================
--- head/sysutils/u-boot-orangepi-pc2/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-orangepi-pc2/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		orangepi-pc2
 BOARD_CONFIG=	orangepi_pc2_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-orangepi-pc2/pkg-descr
==============================================================================
--- head/sysutils/u-boot-orangepi-pc2/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-orangepi-pc2/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the OrangePi PC2
 
 To install this bootloader on an sdcard just do:
-dd if=$LOCALBASE/share/u-boot/u-boot-orangepi-pc2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=$LOCALBASE/share/u-boot/u-boot-orangepi-pc2/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
 https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-pine64-lts/Makefile
==============================================================================
--- head/sysutils/u-boot-pine64-lts/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pine64-lts/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pine64-lts
 BOARD_CONFIG=	pine64-lts_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-pine64-lts/pkg-descr
==============================================================================
--- head/sysutils/u-boot-pine64-lts/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pine64-lts/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Pine64-LTS.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pine64-lts/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pine64-lts/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-pine64/Makefile
==============================================================================
--- head/sysutils/u-boot-pine64/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pine64/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pine64
 BOARD_CONFIG=	pine64_plus_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-pine64/pkg-descr
==============================================================================
--- head/sysutils/u-boot-pine64/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pine64/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Pine64.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pine64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pine64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-pinebook/Makefile
==============================================================================
--- head/sysutils/u-boot-pinebook/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pinebook/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pinebook
 BOARD_CONFIG=	pinebook_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-pinebook/pkg-descr
==============================================================================
--- head/sysutils/u-boot-pinebook/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pinebook/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Pinebook
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-pinebook/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-pinebook/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner

Modified: head/sysutils/u-boot-pinebookpro/Makefile
==============================================================================
--- head/sysutils/u-boot-pinebookpro/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-pinebookpro/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		pinebookpro
 BOARD_CONFIG=	pinebook-pro-rk3399_defconfig
 FAMILY=		rk3399

Modified: head/sysutils/u-boot-rock64/Makefile
==============================================================================
--- head/sysutils/u-boot-rock64/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-rock64/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		rock64
 BOARD_CONFIG=	rock64-rk3328_defconfig
 FAMILY=		rk3328

Modified: head/sysutils/u-boot-rockpro64/Makefile
==============================================================================
--- head/sysutils/u-boot-rockpro64/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-rockpro64/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 EXTRA_PATCHES=	${.CURDIR}/files
 
 MODEL=		rockpro64

Modified: head/sysutils/u-boot-sopine-spi/Makefile
==============================================================================
--- head/sysutils/u-boot-sopine-spi/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-sopine-spi/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		sopine-spi
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-sopine/Makefile
==============================================================================
--- head/sysutils/u-boot-sopine/Makefile	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-sopine/Makefile	Sun Nov 22 17:37:40 2020	(r556066)
@@ -2,6 +2,8 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2020.10=	1
+
 MODEL=		sopine
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64

Modified: head/sysutils/u-boot-sopine/pkg-descr
==============================================================================
--- head/sysutils/u-boot-sopine/pkg-descr	Sun Nov 22 17:20:33 2020	(r556065)
+++ head/sysutils/u-boot-sopine/pkg-descr	Sun Nov 22 17:37:40 2020	(r556066)
@@ -1,7 +1,7 @@
 U-Boot loader and related files for the Sopine.
 
 To install this bootloader on an sdcard just do:
-dd if=/usr/local/share/u-boot/u-boot-sopine/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync
+dd if=/usr/local/share/u-boot/u-boot-sopine/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
