Module Name: src
Committed By: jmcneill
Date: Tue Jan 27 16:35:48 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: INTEGRATOR_CP files.integrator
Log Message:
enable plmmc(4)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/INTEGRATOR_CP
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/files.integrator
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/INTEGRATOR_CP
diff -u src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.9 src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.10
--- src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.9 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbarm/conf/INTEGRATOR_CP Tue Jan 27 16:35:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INTEGRATOR_CP,v 1.9 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: INTEGRATOR_CP,v 1.10 2015/01/27 16:35:47 jmcneill Exp $
#
# INTEGRATOR_CP -- ARM Integrator CP kernel
#
@@ -135,6 +135,7 @@ makeoptions COPY_SYMTAB=1
options PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=38400,PLCONMODE=0xB00
config netbsd root on ? type ?
+config netbsd-ld0 root on ld0 type ?
config netbsd-sm0 root on sm0 type nfs
# The main bus device
@@ -154,6 +155,13 @@ plcom1 at ifpga? offset 0x07000000 irq
# PL030 real time clock
plrtc0 at ifpga? offset 0x05000000
+# PL181 MMCI host controller
+plmmc0 at ifpga? offset 0x0c000000 irq 23
+sdmmc* at plmmc0
+ld* at sdmmc?
+#options SDMMC_DEBUG
+#options SDMMCCISDEBUG
+
# PCI bus via ifpga
pci0 at ifpga? # PCI bus
Index: src/sys/arch/evbarm/conf/files.integrator
diff -u src/sys/arch/evbarm/conf/files.integrator:1.10 src/sys/arch/evbarm/conf/files.integrator:1.11
--- src/sys/arch/evbarm/conf/files.integrator:1.10 Tue Feb 19 10:57:09 2013
+++ src/sys/arch/evbarm/conf/files.integrator Tue Jan 27 16:35:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.integrator,v 1.10 2013/02/19 10:57:09 skrll Exp $
+# $NetBSD: files.integrator,v 1.11 2015/01/27 16:35:47 jmcneill Exp $
#
# ARM, Ltd. Integrator evaluation board configuraiton info
#
@@ -24,6 +24,10 @@ file arch/evbarm/ifpga/ifpga_pci.c ifpg
attach plcom at ifpga with plcom_ifpga
file arch/evbarm/ifpga/plcom_ifpga.c plcom_ifpga
+# Integrator MMCI host controller
+attach plmmc at ifpga with plmmc_ifpga
+file arch/evbarm/ifpga/plmmc_ifpga.c plmmc_ifpga
+
# Integrator real-time clock
device plrtc
attach plrtc at ifpga
