CVS commit: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sat Apr  4 15:12:17 UTC 2020

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6: Makefile buildlink3.mk
            distinfo
Added Files:
        pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches:
            patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h

Log Message:
Use R_WDOG to reset H6 SoCs; some of them have non-working WDOG blocks.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h

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

Modified files:

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.2 pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.2 Sat Sep 29 16:26:53 2018
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile     Sat Apr  4 15:12:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/09/29 16:26:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2020/04/04 15:12:17 thorpej Exp $
 
 VERSION=       20180207
 GITHUB_PROJECT=        arm-trusted-firmware
@@ -6,6 +6,7 @@ GITHUB_TAG=     406a637162bee1f1b0c26525c3aa
 
 PKGNAME=       ${GITHUB_PROJECT}-sun50i-h6-${VERSION}
 DISTNAME=      ${PKGNAME}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Icenowy/}
 EXTRACT_SUFX=  .zip

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.1 pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.1    Sat May 26 17:51:33 2018
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk        Sat Apr  4 15:12:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/26 17:51:33 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/04/04 15:12:17 thorpej Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50i-h6?=   build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-su
 .if !defined(ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i-h6+= arm-trusted-firmware-sun50i-h6>=20180207
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i-h6+= arm-trusted-firmware-sun50i-h6>=20180207nb1
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50i-h6?=   ../../sysutils/arm-trusted-firmware-sun50i-h6
 .endif # ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK
 
Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo:1.1 pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo:1.1 Sat May 26 17:51:33 2018
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo     Sat Apr  4 15:12:17 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/05/26 17:51:33 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2020/04/04 15:12:17 thorpej Exp $
 
-SHA1 (arm-trusted-firmware-sun50i-h6-20180207-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 57cb3ee8bbcd225e3b643bc57676a85fd413e77a
-RMD160 (arm-trusted-firmware-sun50i-h6-20180207-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 60a903dfbb523ef09c9c052cbc77bcf21efe7a67
-SHA512 (arm-trusted-firmware-sun50i-h6-20180207-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 
6f9b7b27b1d449a313b7b04b400f463356018b446e6e7c3cf20f6ee9625231d39d2e1bbe35049eb2c992a7b9c1e902e69e2ffb8b207a8c7bec577eae2fe1e472
-Size (arm-trusted-firmware-sun50i-h6-20180207-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 3330975 bytes
+SHA1 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 57cb3ee8bbcd225e3b643bc57676a85fd413e77a
+RMD160 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 60a903dfbb523ef09c9c052cbc77bcf21efe7a67
+SHA512 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 
6f9b7b27b1d449a313b7b04b400f463356018b446e6e7c3cf20f6ee9625231d39d2e1bbe35049eb2c992a7b9c1e902e69e2ffb8b207a8c7bec577eae2fe1e472
+Size (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 3330975 bytes
+SHA1 (patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h) = 08a603aa0fdb2c352ce50ee5644d24af71040062

Added files:

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h:1.1
--- /dev/null   Sat Apr  4 15:12:17 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h  Sat Apr  4 15:12:17 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h,v 1.1 2020/04/04 15:12:17 thorpej Exp $
+
+Work around broken H6 WDOG reset.
+
+--- plat/allwinner/sun50i_h6/include/sunxi_mmap.h.orig 2020-03-26 22:13:21.000000000 +0000
++++ plat/allwinner/sun50i_h6/include/sunxi_mmap.h
+@@ -65,4 +65,8 @@
+ #define SUNXI_R_UART_BASE             0x07080000
+ #define SUNXI_R_PIO_BASE              0x07022000
+ 
++/* Work around broken H6 WDOG reset. */
++#undef SUNXI_WDOG_BASE
++#define SUNXI_WDOG_BASE                       SUNXI_R_WDOG_BASE
++
+ #endif /* __SUNXI_MMAP_H__ */