Module Name: src
Committed By: macallan
Date: Tue Nov 25 04:55:13 UTC 2014
Modified Files:
src/sys/arch/evbmips/conf: CI20
Log Message:
remove some cargoculted goop
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/CI20
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/evbmips/conf/CI20
diff -u src/sys/arch/evbmips/conf/CI20:1.2 src/sys/arch/evbmips/conf/CI20:1.3
--- src/sys/arch/evbmips/conf/CI20:1.2 Sat Nov 22 19:48:36 2014
+++ src/sys/arch/evbmips/conf/CI20 Tue Nov 25 04:55:13 2014
@@ -1,14 +1,13 @@
-# $NetBSD: CI20,v 1.2 2014/11/22 19:48:36 martin Exp $
+# $NetBSD: CI20,v 1.3 2014/11/25 04:55:13 macallan Exp $
#
# MIPS Creator CI20
#
-# for now
include "arch/evbmips/conf/std.ingenic"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CI20-$Revision: 1.2 $"
+#ident "CI20-$Revision: 1.3 $"
maxusers 32
@@ -19,10 +18,8 @@ makeoptions CPUFLAGS+="-mips32r2"
makeoptions NEED_MDSETIMAGE="yes"
makeoptions NEED_BINARY="yes"
makeoptions NEED_UBOOTIMAGE="gz"
-options COM_16650,COM_TOLERANCE=50 # +/- 5%
+options COM_TOLERANCE=50 # +/- 5%
options CONSPEED=115200 # u-boot default
-options CONSADDR=0x10030000
-options MEMSIZE="(256*1024*1024)"
# Options for necessary to use MD
#options MEMORY_DISK_HOOKS
@@ -126,13 +123,6 @@ options INET # Internet protocols
# Warning, these may compile large string tables into the kernel!
options MIIVERBOSE # verbose PHY autoconfig messages
-# Bitmask for enabling the PCI IDE channels in the southbridge.
-# Set bit 0 (0x01) for channel 0, bit 1 (0x02) for channel 1.
-#
-# Do this if your firmware (usually PMON and YAMON) doens't enable the IDE
-# channels for you (thus causing the NetBSD `pciide' driver to ignore them).
-#options PCI_NETBSD_ENABLE_IDE=0x1
-
options NFS_BOOT_BOOTP
#options NFS_BOOT_DHCP
#options NFS_V2_ONLY
@@ -142,20 +132,19 @@ config netbsd root on ? type ?
mainbus0 at root
cpu0 at mainbus?
#wdog0 at mainbus?
-#options COM_REGMAP
com* at mainbus?
-#ehci* at arbus? addr ?
-#usb* at ehci?
+#apbus0 at mainbus?
+
+# On-board USB
+#dwctwo* at apbus?
+#usb* at dwctwo?
#uhub* at usb?
#uhub* at uhub? port ?
#umass* at uhub? port ? configuration ? interface ?
#scsibus* at umass? channel ?
#sd* at scsibus? target ? lun ?
-#ae* at arbus? addr ?
-#ath* at arbus? addr ?
-#athflash* at arbus? addr ?
-#argpio* at arbus? addr ?
-#gpio* at argpio?
+#jzgpio* at apbus? addr ?
+#gpio* at jzgpio?
# no RTC! so fake with a stub (required to prevent evbmips panic)
