svn commit: r204680 - in user/jmallett/octeon/sys/mips: cavium conf

[Juli Mallett]

Author: jmallett
Date: Thu Mar  4 00:40:53 2010
New Revision: 204680
URL: http://svn.freebsd.org/changeset/base/204680

Log:
  Switch to CF root, add /dev/random support (SSH works!) and let Octeon go to
  multi-user as long as it's not O32.
  
  Sponsored by:	Packet Forensics

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
  user/jmallett/octeon/sys/mips/conf/OCTEON1
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Thu Mar  4 00:40:53 2010	(r204680)
@@ -730,7 +730,9 @@ platform_start(__register_t a0, __regist
 {
 	uint64_t platform_counter_freq;
 
+#if defined(__mips_o32)
 	boothowto |= RB_SINGLE;
+#endif
 
 	/* Initialize pcpu stuff */
 	mips_pcpu0_init();

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1	Thu Mar  4 00:40:53 2010	(r204680)
@@ -44,7 +44,6 @@ hints		"OCTEON1.hints"		#Default places 
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-#XXXimp: Need to make work with 64-bit too
 options 	ISA_MIPS64
 
 options		DDB
@@ -59,10 +58,10 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Po
 #options	ROOTDEVNAME=\"ufs:ad0s1a\"	# Original
 options		NO_SWAPPING
 
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_COMPAT
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_COMPAT
 
 options         FFS                     #Berkeley Fast Filesystem
 options         SOFTUPDATES             #Enable FFS soft updates support
@@ -87,11 +86,12 @@ device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf
+device		random
 
 #
 # Use the following for  Compact Flash file-system
 device 		cf
-#options         ROOTDEVNAME = \"ufs:cf0s2\"	# Unmask if compact flash is needed as RFS
+options 	ROOTDEVNAME=\"ufs:cf0s1\"
 
 #
 # Use the following for RFS in mem-device

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Wed Mar  3 23:37:53 2010	(r204679)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Thu Mar  4 00:40:53 2010	(r204680)
@@ -50,10 +50,10 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Po
 #options	ROOTDEVNAME=\"ufs:ad0s1a\"	# Original
 options		NO_SWAPPING
 
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_COMPAT
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_COMPAT
 
 options         FFS                     #Berkeley Fast Filesystem
 options         SOFTUPDATES             #Enable FFS soft updates support
@@ -78,11 +78,12 @@ device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf
+device		random
 
 #
 # Use the following for  Compact Flash file-system
 device 		cf
-#options 	ROOTDEVNAME=\"ufs:cf0s1\"
+options 	ROOTDEVNAME=\"ufs:cf0s1\"
 
 #
 # Use the following for RFS in mem-device