Received: by mail.netbsd.org (Postfix, from userid 605) id 8A37184D9E; Sun, 15 Sep 2019 20:13:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1222984D95 for ; Sun, 15 Sep 2019 20:13:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id OLAGNheMSolL for ; Sun, 15 Sep 2019 20:13:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9061584D21 for ; Sun, 15 Sep 2019 20:13:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89C6FFBF4; Sun, 15 Sep 2019 20:13:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156857841115090" MIME-Version: 1.0 Date: Sun, 15 Sep 2019 20:13:31 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/sysutils/u-boot-rockpro64 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20190915201331.89C6FFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156857841115090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_156857841115090 Content-Disposition: inline Content-Length: 1546 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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" --_----------=_156857841115090--