PERFORCE change 219958 for review

[Brooks Davis]

http://p4web.freebsd.org/@@219958?ac=10

Change 219958 by brooks at brooks_zenith on 2013/01/07 20:22:20

	Revert two premature changes in 219957 that I submitted by
	mistake.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#6 edit
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_DE4_MDROOT#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#6 (text+ko) ====

@@ -10,12 +10,7 @@
 
 ident		BERI_DE4_MDROOT
 
-#hints		"BERI_DE4.hints"	#Default places to look for devices.
-hints           "BERI_FDT_DE4.hints"    #Default places to look for devices.
-
-options         FDT
-options         FDT_DTB_STATIC
-makeoptions     FDT_DTS_FILE=beripad-de4.dts
+hints		"BERI_DE4.hints"	#Default places to look for devices.
 
 #
 # This kernel configuration uses an embedded 8MB memory root file system.

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_DE4_MDROOT#3 (text+ko) ====

@@ -9,9 +9,5 @@
 include		BERI_DE4_MDROOT
 ident		CHERI_DE4_MDROOT
 
-nooptions	MD_ROOT_SIZE
-options		MD_ROOT_SIZE=25600
-makeoptions	MFS_IMAGE=/home/bed22/demoroot.img
-
 nocpu		CPU_BERI
 cpu		CPU_CHERI