[pkgsrc/trunk]: pkgsrc/sysutils/u-boot-rockpro64 u-boot-rockpro64: switch to ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1b2baee093a
branches:  trunk
changeset: 426524:f1b2baee093a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Apr 02 09:06:28 2020 +0000

description:
u-boot-rockpro64: switch to mainline U-Boot

Reach over to the pinebook pro package for patches and build glue.
XXX boot from SPI is currently broken, but SD-card works.

diffstat:

 sysutils/u-boot-rockpro64/Makefile                                 |  24 ++---
 sysutils/u-boot-rockpro64/distinfo                                 |  16 ----
 sysutils/u-boot-rockpro64/patches/patch-arch_arm_cpu_armv8_Kconfig |  15 ---
 sysutils/u-boot-rockpro64/patches/patch-lib_bch.c                  |  39 ----------
 4 files changed, 10 insertions(+), 84 deletions(-)

diffs (130 lines):

diff -r 774a84a93774 -r f1b2baee093a sysutils/u-boot-rockpro64/Makefile
--- a/sysutils/u-boot-rockpro64/Makefile        Thu Apr 02 08:11:23 2020 +0000
+++ b/sysutils/u-boot-rockpro64/Makefile        Thu Apr 02 09:06:28 2020 +0000
@@ -1,34 +1,30 @@
-# $NetBSD: Makefile,v 1.8 2020/01/27 08:02:30 thorpej Exp $
+# $NetBSD: Makefile,v 1.9 2020/04/02 09:06:28 tnn Exp $
 
-PKGREVISION=           7
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
 UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo
-
 U_BOOT_IMAGE_TYPE=     rk3399
-.include "../../sysutils/u-boot/u-boot-rockchip.mk"
 
 # Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
 # XXX LICENSE?
-BL31=          rk3399_bl31_v1.29.elf   # if you bump this, adjust pre-build target!
-DISTFILES+=    ${BL31}
-SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/0b8a4e66958b5d3d87fc61fc4bd8e069c79e931a/bin/rk33/}
+#BL31=         rk3399_bl31_v1.29.elf   # if you bump this, adjust pre-build target!
+#DISTFILES+=   ${BL31}
+#SITES.${BL31}=        ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/0b8a4e66958b5d3d87fc61fc4bd8e069c79e931a/bin/rk33/}
 
 # DDR init binary
-DDR_BIN=               rk3399_ddr_800MHz_v1.23.bin
-SITES.${DDR_BIN}=      ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/016471bcfb1a0b1e1269895cb7b6f534813edfdc/bin/rk33/}
-DISTFILES+=            ${DDR_BIN}
+#DDR_BIN=              rk3399_ddr_800MHz_v1.23.bin
+#SITES.${DDR_BIN}=     ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/016471bcfb1a0b1e1269895cb7b6f534813edfdc/bin/rk33/}
+#DISTFILES+=           ${DDR_BIN}
 
-pre-build:
+#pre-build:
 # patch the first instruction of cortex_a72_reset_func, replacing:
 # mrs     x0, s3_1_c15_c2_0
 # with:
 # orr     x0, xzr, #0x100000000
 # This enables workaround for A72 errata #859971.
-       ${AWK} 'BEGIN {printf("%c%c%c%c",224,3,96,178);exit;}' | dd conv=notrunc bs=1 seek=145568 of=${WRKDIR}/${BL31}
+#      ${AWK} 'BEGIN {printf("%c%c%c%c",224,3,96,178);exit;}' | dd conv=notrunc bs=1 seek=145568 of=${WRKDIR}/${BL31}
 
-.include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk"
diff -r 774a84a93774 -r f1b2baee093a sysutils/u-boot-rockpro64/distinfo
--- a/sysutils/u-boot-rockpro64/distinfo        Thu Apr 02 08:11:23 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.4 2019/07/21 15:17:13 tnn Exp $
-
-SHA1 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 139aa96fa9359840677eb25d5e137829138434e5
-RMD160 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 252993f382144312cfa1d5803167d967a1e5f4c3
-SHA512 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 8fe62ade5bb4a5de71282e7d65c22349d38c2f4f3f08482e9b132de139dc4f6e8361059ad2c09cffaf4e96fbcf00665b5490bfbaa2d5f8e705c92fa963d8320f
-Size (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 15126203 bytes
-SHA1 (rk3399_bl31_v1.29.elf) = da32bb5c143d50c9680977dce4e1717da247cba0
-RMD160 (rk3399_bl31_v1.29.elf) = 193284a2f6b35846c77ff090219c96f82867340c
-SHA512 (rk3399_bl31_v1.29.elf) = 3a72af26cbecfa188a20eace824d1d8855618ff94f69d2b74f95ab787aa8e4af50e900481d7abaec1a7ef64b44908bd59395824463d7c747df82780a66852a92
-Size (rk3399_bl31_v1.29.elf) = 1319847 bytes
-SHA1 (rk3399_ddr_800MHz_v1.23.bin) = dee89fdc70f8b5f00ec86da7a512ab23537d873f
-RMD160 (rk3399_ddr_800MHz_v1.23.bin) = f2fb1f24dfb28094bb58bfdf0c4186dc936b4e22
-SHA512 (rk3399_ddr_800MHz_v1.23.bin) = 0d70650d4158ecbce9bd6f805f8d0c2fc79546bfb46b25ba7ef64dbe5e7e7d7c3139ce4d6442aa11ff5d016ad74fd0aa56da0b83a3e2832dd1281a7e034229c5
-Size (rk3399_ddr_800MHz_v1.23.bin) = 77908 bytes
-SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 375c79ebe0d593865fbaa7924c8446ea6712fca4
-SHA1 (patch-lib_bch.c) = 151e5f311742a7da919359950ccac2521bcfaaff
diff -r 774a84a93774 -r f1b2baee093a sysutils/u-boot-rockpro64/patches/patch-arch_arm_cpu_armv8_Kconfig
--- a/sysutils/u-boot-rockpro64/patches/patch-arch_arm_cpu_armv8_Kconfig        Thu Apr 02 08:11:23 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.1 2018/09/01 10:38:19 tnn Exp $
-
---- arch/arm/cpu/armv8/Kconfig.orig    2018-08-06 22:28:00.000000000 +0000
-+++ arch/arm/cpu/armv8/Kconfig
-@@ -130,6 +130,10 @@ config ARMV8_PSCI_CPUS_PER_CLUSTER
-         A value 0 or no definition of it works for single cluster system.
-         System with multi-cluster should difine their own exact value.
- 
-+config ARMV8_SWITCH_TO_EL1
-+      bool "Switch to EL1 before booting kernel"
-+      default n
-+
- if SYS_HAS_ARMV8_SECURE_BASE
- 
- config ARMV8_SECURE_BASE
diff -r 774a84a93774 -r f1b2baee093a sysutils/u-boot-rockpro64/patches/patch-lib_bch.c
--- a/sysutils/u-boot-rockpro64/patches/patch-lib_bch.c Thu Apr 02 08:11:23 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-lib_bch.c,v 1.1 2018/09/01 10:38:19 tnn Exp $
-
-u-boot: fix build on macos
-
---- lib/bch.c.orig     2018-08-06 22:28:00.000000000 +0000
-+++ lib/bch.c
-@@ -61,8 +61,10 @@
- #include <linux/bitops.h>
- #else
- #include <errno.h>
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/endian.h>
-+#elif defined(__APPLE__)
-+#include <machine/endian.h>
- #else
- #include <endian.h>
- #endif
-@@ -71,7 +73,11 @@
- #include <string.h>
- 
- #undef cpu_to_be32
-+#if defined(__APPLE__)
-+#define cpu_to_be32 htonl
-+#else
- #define cpu_to_be32 htobe32
-+#endif
- #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
- #define kmalloc(size, flags)  malloc(size)
- #define kzalloc(size, flags)  calloc(1, size)
-@@ -117,7 +123,7 @@ struct gf_poly_deg1 {
- };
- 
- #ifdef USE_HOSTCC
--#if !defined(__DragonFly__) && !defined(__FreeBSD__)
-+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
- static int fls(int x)
- {
-       int r = 32;