Module Name: src
Committed By: nonaka
Date: Fri Jan 30 15:04:35 UTC 2015
Modified Files:
src/distrib/evbppc/md-kernel: Makefile
src/etc/etc.evbppc: Makefile.inc
src/sys/arch/evbppc/mpc85xx: machdep.c
Added Files:
src/sys/arch/evbppc/conf: INSTALL_RB850GX2 RB850GX2
Log Message:
Added RouterBOARD RB850Gx2 config. md root only.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbppc/md-kernel/Makefile
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbppc/conf/INSTALL_RB850GX2 \
src/sys/arch/evbppc/conf/RB850GX2
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/md-kernel/Makefile
diff -u src/distrib/evbppc/md-kernel/Makefile:1.5 src/distrib/evbppc/md-kernel/Makefile:1.6
--- src/distrib/evbppc/md-kernel/Makefile:1.5 Sat Aug 2 15:51:18 2014
+++ src/distrib/evbppc/md-kernel/Makefile Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/08/02 15:51:18 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/30 15:04:35 nonaka Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,7 @@ RAMDISKDIR!= cd ${.CURDIR}/../ramdisk &&
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= INSTALL_OPENBLOCKS266 ${RAMDISK} - \
+ INSTALL_RB850GX2 ${RAMDISK} - \
INSTALL_TWRP1025 ${RAMDISK} - \
INSTALL_WALNUT ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
Index: src/etc/etc.evbppc/Makefile.inc
diff -u src/etc/etc.evbppc/Makefile.inc:1.12 src/etc/etc.evbppc/Makefile.inc:1.13
--- src/etc/etc.evbppc/Makefile.inc:1.12 Fri Feb 28 06:10:54 2014
+++ src/etc/etc.evbppc/Makefile.inc Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2014/02/28 06:10:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2015/01/30 15:04:35 nonaka Exp $
#
# etc.evbppc/Makefile.inc -- evbppc-specific etc Makefile targets
#
@@ -9,9 +9,11 @@
.if ${MACHINE_ARCH} == "powerpc"
KERNEL_SETS= WALNUT EXPLORA451 OPENBLOCKS200 OPENBLOCKS266
KERNEL_SETS+= EV64260 PMPPC
-KERNEL_SETS+= MPC8536DS MPC8548CDS P2020DS P2020RDB RB800 TWRP1025
+KERNEL_SETS+= MPC8536DS MPC8548CDS P2020DS P2020RDB RB800 RB850GX2
+KERNEL_SETS+= TWRP1025
KERNEL_SUFFIXES= img
BUILD_KERNELS= INSTALL_WALNUT INSTALL_OPENBLOCKS266 INSTALL_PMPPC
-BUILD_KERNELS+= INSTALL_P2020DS INSTALL_P2020RDB INSTALL_TWRP1025
+BUILD_KERNELS+= INSTALL_P2020DS INSTALL_P2020RDB INSTALL_RB850GX2
+BUILD_KERNELS+= INSTALL_TWRP1025
.endif
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.40 src/sys/arch/evbppc/mpc85xx/machdep.c:1.41
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.40 Fri Jan 23 07:27:05 2015
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Jan 30 15:04:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.40 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: machdep.c,v 1.41 2015/01/30 15:04:35 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1082,6 +1082,7 @@ calltozero(void)
panic("call to 0 from %p", __builtin_return_address(0));
}
+#if !defined(ROUTERBOOT)
static void
parse_cmdline(char *cp)
{
@@ -1117,6 +1118,7 @@ parse_cmdline(char *cp)
if (root_string[0])
printf(" root=%s", root_string);
}
+#endif /* !ROUTERBOOT */
void
initppc(vaddr_t startkernel, vaddr_t endkernel,
@@ -1129,12 +1131,14 @@ initppc(vaddr_t startkernel, vaddr_t end
printf(" initppc(%#"PRIxVADDR", %#"PRIxVADDR", %p, %p, %p, %p)<enter>",
startkernel, endkernel, a0, a1, a2, a3);
+#if !defined(ROUTERBOOT)
if (a2[0] != '\0')
printf(" consdev=<%s>", a2);
if (a3[0] != '\0') {
printf(" cmdline=<%s>", a3);
parse_cmdline(a3);
}
+#endif /* !ROUTERBOOT */
/*
* Make sure we don't enter NAP or SLEEP if PSL_POW (MSR[WE]) is set.
Added files:
Index: src/sys/arch/evbppc/conf/INSTALL_RB850GX2
diff -u /dev/null src/sys/arch/evbppc/conf/INSTALL_RB850GX2:1.1
--- /dev/null Fri Jan 30 15:04:35 2015
+++ src/sys/arch/evbppc/conf/INSTALL_RB850GX2 Fri Jan 30 15:04:35 2015
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL_RB850GX2,v 1.1 2015/01/30 15:04:35 nonaka Exp $
+
+include "arch/evbppc/conf/RB850GX2"
+
+#ident "INSTALL_RB850GX2-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
Index: src/sys/arch/evbppc/conf/RB850GX2
diff -u /dev/null src/sys/arch/evbppc/conf/RB850GX2:1.1
--- /dev/null Fri Jan 30 15:04:35 2015
+++ src/sys/arch/evbppc/conf/RB850GX2 Fri Jan 30 15:04:35 2015
@@ -0,0 +1,167 @@
+# $NetBSD: RB850GX2,v 1.1 2015/01/30 15:04:35 nonaka Exp $
+#
+# RouterBOARD RB850Gx2
+#
+
+include "arch/evbppc/conf/std.mpc85xx"
+
+options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+ident "RB850GX2-$Revision: 1.1 $"
+
+maxusers 32
+
+#options UVMHIST
+#options UVMHIST_PRINT
+
+options P1023
+options SYS_CLK=66666667
+#options HZ=1000
+no options GUR_BASE
+options GUR_BASE=0xff600000
+options ROUTERBOOT
+
+#options INSECURE # disable kernel security levels
+#options NTP # NTP phase/frequency locked loop
+options KTRACE # system call tracing via ktrace(1)
+options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
+
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+
+options USERCONF # userconf(4) support
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
+# Diagnostic/debugging support options
+options DIAGNOSTIC # cheap kernel consistency checks
+options DEBUG # expensive debugging checks/support
+#options SYSCALL_DEBUG # syscall debugging
+options DDB # in-kernel debugger
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options TRAP_PANICWAIT
+makeoptions COPY_SYMTAB=1 # size for embedded symbol table
+
+makeoptions DEBUG="-g" # compile full symbol table
+
+# Compatibility options
+#options COMPAT_09 # NetBSD 0.9,
+#options COMPAT_10 # NetBSD 1.0,
+#options COMPAT_11 # NetBSD 1.1,
+#options COMPAT_12 # NetBSD 1.2,
+options COMPAT_13 # NetBSD 1.3,
+options COMPAT_14 # NetBSD 1.4,
+options COMPAT_15 # NetBSD 1.5,
+options COMPAT_16 # NetBSD 1.6,
+options COMPAT_20 # NetBSD 2.0,
+options COMPAT_30 # NetBSD 3.0,
+options COMPAT_40 # NetBSD 4.0,
+options COMPAT_50 # NetBSD 5.0,
+options COMPAT_60 # NetBSD 6.0, and
+options COMPAT_70 # NetBSD 7.0 binary compatibility.
+options COMPAT_43 # and 4.3BSD
+#options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
+
+# File systems
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system TMPFS # efficient memory file system
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system PTYFS # /dev/pts/N support
+
+# File system options
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
+options FFS_EI # FFS Endian Independent support
+options WAPBL # File system journaling support
+options NFSSERVER # Network File System server
+#options FFS_NO_SNAPSHOT # No FFS snapshot support
+options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+options NFS_BOOT_DHCP # Support DHCP NFS root
+
+# Networking options
+#options GATEWAY # packet forwarding
+options INET # IP + ICMP + TCP + UDP
+options INET_CSUM_COUNTERS
+options TCP_CSUM_COUNTERS
+options UDP_CSUM_COUNTERS
+options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # IP multicast routing
+#options NETATALK # AppleTalk networking protocols
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options IPFILTER_LOG # ipmon(8) log support
+#options IPFILTER_LOOKUP # ippool(8) support
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options MIIVERBOSE # verbose PHY autoconfig messages
+
+# Kernel root file system and dump configuration.
+config netbsd root on ? type ?
+
+#
+# Device configuration
+#
+
+mainbus0 at root # Processor Local Bus
+
+cpunode* at mainbus? node ?
+gpio* at gpiobus?
+
+options MULTIPROCESSOR
+cpu* at cpunode?
+
+obio0 at cpunode? # On-chip Peripheral Bus
+
+e500wdog* at cpunode? # Watchdog timer
+
+ddrc* at cpunode?
+duart* at cpunode?
+com* at duart? port ?
+options CONSADDR="DUART2_BASE"
+
+pq3pcie* at cpunode? # PCI-Express controller
+pci* at pq3pcie?
+
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+pci* at ppb?
+
+diic* at cpunode? # i2c bus
+iic* at diic?
+
+pseudo-device loop # network loopback
+pseudo-device bpfilter # packet filter
+pseudo-device clockctl # user control of clock subsystem
+pseudo-device drvctl # user control of drive subsystem
+pseudo-device ksyms # /dev/ksyms
+pseudo-device pty # pseudo-terminals
+pseudo-device vnd # disk-like interface to files
+pseudo-device putter # for puffs and pud
+pseudo-device lockstat # lock profiling
