CVS commit: pkgsrc/sysutils/u-boot-rockpro64

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Apr  2 09:06:28 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot-rockpro64: Makefile
Removed Files:
        pkgsrc/sysutils/u-boot-rockpro64: distinfo
        pkgsrc/sysutils/u-boot-rockpro64/patches:
            patch-arch_arm_cpu_armv8_Kconfig patch-lib_bch.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/u-boot-rockpro64/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/u-boot-rockpro64/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/u-boot-rockpro64/patches/patch-arch_arm_cpu_armv8_Kconfig \
    pkgsrc/sysutils/u-boot-rockpro64/patches/patch-lib_bch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.8 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.9
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.8       Mon Jan 27 08:02:30 2020
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile   Thu Apr  2 09:06:28 2020
@@ -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"