Module Name: src
Committed By: jmcneill
Date: Tue May 1 20:06:13 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: GENERIC64 SUNXI
Log Message:
Enable Allwinner H6 support
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/SUNXI
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.4 src/sys/arch/evbarm/conf/GENERIC64:1.5
--- src/sys/arch/evbarm/conf/GENERIC64:1.4 Sat Apr 28 20:35:05 2018
+++ src/sys/arch/evbarm/conf/GENERIC64 Tue May 1 20:06:13 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.4 2018/04/28 20:35:05 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.5 2018/05/01 20:06:13 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -35,6 +35,8 @@ makeoptions DTS="
sun50i-h5-orangepi-zero-plus.dts
sun50i-h5-orangepi-zero-plus2.dts
+ sun50i-h6-pine-h64.dts
+
tegra210-p2371-0000.dts
tegra210-p2371-2180.dts
tegra210-p2571.dts
@@ -46,6 +48,7 @@ options SOC_BCM2837
options SOC_TEGRA210
options SOC_SUN50I_A64
options SOC_SUN50I_H5
+options SOC_SUN50I_H6
#options MULTIPROCESSOR
pseudo-device openfirm # /dev/openfirm
@@ -128,6 +131,7 @@ bcmaux* at fdt? pass 1 # Broadcom BCM2
sun8ih3ccu* at fdt? pass 2 # Allwinner H3/H5 CCU
sun8ih3rccu* at fdt? pass 2 # Allwinner H3/H5 CCU (PRCM)
sun50ia64ccu* at fdt? pass 2 # Allwinner A64 CCU
+sun50ih6ccu* at fdt? pass 2 # Allwinner H6 CCU
sunxiresets* at fdt? pass 1 # Allwinner misc. resets
sunxigates* at fdt? pass 1 # Allwinner misc. gates
sunxigmacclk* at fdt? pass 2 # Allwinner GMAC MII/RGMII clock mux
Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.64 src/sys/arch/evbarm/conf/SUNXI:1.65
--- src/sys/arch/evbarm/conf/SUNXI:1.64 Sat Apr 28 18:47:53 2018
+++ src/sys/arch/evbarm/conf/SUNXI Tue May 1 20:06:13 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: SUNXI,v 1.64 2018/04/28 18:47:53 jmcneill Exp $
+# $NetBSD: SUNXI,v 1.65 2018/05/01 20:06:13 jmcneill Exp $
#
# Allwinner sunxi family
#
@@ -126,6 +126,8 @@ makeoptions DTS="
sun50i-h5-orangepi-prime.dts
sun50i-h5-orangepi-zero-plus.dts
sun50i-h5-orangepi-zero-plus2.dts
+
+ sun50i-h6-pine-h64.dts
"
options MULTIPROCESSOR
@@ -143,6 +145,7 @@ options SOC_SUN8I_H3
options SOC_SUN9I_A80
options SOC_SUN50I_A64
options SOC_SUN50I_H5
+options SOC_SUN50I_H6
pseudo-device openfirm # /dev/openfirm
@@ -181,6 +184,7 @@ sun8ih3ccu* at fdt? pass 2 # H3 CCU
sun8ih3rccu* at fdt? pass 2 # H3 CCU (PRCM)
sun9ia80ccu* at fdt? pass 2 # A80 CCU
sun50ia64ccu* at fdt? pass 2 # A64 CCU
+sun50ih6ccu* at fdt? pass 2 # H6 CCU
sunxiresets* at fdt? pass 1 # Misc. clock resets
sunxigates* at fdt? pass 1 # Misc. clock gates
sunxigmacclk* at fdt? pass 2 # GMAC MII/RGMII clock mux
