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

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Sep 15 20:13:31 UTC 2019

Modified Files:
        pkgsrc/sysutils/u-boot-rockpro64: Makefile

Log Message:
u-boot-rockpro64: implement workaround for A72 errata #859971

This disables i-cache prefetch, which can otherwise cause deadlocks on the
processor revision that ROCKPro64 uses.
Done via binary patch of the Rockchip TF-A EL3 firmware.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/u-boot-rockpro64/Makefile

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.6 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.7
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.6       Sun Sep 15 15:50:22 2019
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile   Sun Sep 15 20:13:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/09/15 15:50:22 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/15 20:13:31 tnn Exp $
 
-PKGREVISION=           5
+PKGREVISION=           6
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
 UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
@@ -12,7 +12,7 @@ U_BOOT_IMAGE_TYPE=    rk3399
 
 # Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
 # XXX LICENSE?
-BL31=          rk3399_bl31_v1.29.elf
+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/}
 
@@ -21,4 +21,12 @@ 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:
+# 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}
+
 .include "../../sysutils/u-boot/u-boot-arm64.mk"