Module Name: src
Committed By: jmcneill
Date: Thu Jun 6 22:41:02 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf: GENERIC GENERIC64
Log Message:
Attach sunxi dma controllers earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/GENERIC64
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/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.36 src/sys/arch/evbarm/conf/GENERIC:1.37
--- src/sys/arch/evbarm/conf/GENERIC:1.36 Wed Jun 5 03:38:09 2019
+++ src/sys/arch/evbarm/conf/GENERIC Thu Jun 6 22:41:02 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.36 2019/06/05 03:38:09 thorpej Exp $
+# $NetBSD: GENERIC,v 1.37 2019/06/06 22:41:02 jmcneill Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -315,8 +315,8 @@ vcmbox* at bcmmbox?
# DMA controller
bcmdmac* at fdt? # Broadcom BCM283x DMA controller
-sun4idma* at fdt? # Allwinner DMA controller (sun4i)
-sun6idma* at fdt? # Allwinner DMA controller (sun6i)
+sun4idma* at fdt? pass 4 # Allwinner DMA controller (sun4i)
+sun6idma* at fdt? pass 4 # Allwinner DMA controller (sun6i)
tegraapbdma* at fdt? pass 4 # NVIDIA Tegra APB DMA
# FUSE controller
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.95 src/sys/arch/evbarm/conf/GENERIC64:1.96
--- src/sys/arch/evbarm/conf/GENERIC64:1.95 Fri May 31 14:52:17 2019
+++ src/sys/arch/evbarm/conf/GENERIC64 Thu Jun 6 22:41:02 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.95 2019/05/31 14:52:17 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.96 2019/06/06 22:41:02 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -218,7 +218,7 @@ qemufwcfg* at acpi?
# DMA controller
bcmdmac* at fdt? # Broadcom BCM283x DMA controller
-sun6idma* at fdt? # Allwinner DMA controller (sun6i)
+sun6idma* at fdt? pass 4 # Allwinner DMA controller (sun6i)
tegraapbdma* at fdt? pass 4 # NVIDIA Tegra APB DMA
# FUSE controller
