Merge zizzer:/bk/newmem

into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 36da0febc30675e955a10eb8bc45586b6242a8c3

SConscript

@@ -184,11 +184,19 @@ full_system_sources = Split('''
         cpu/profile.cc
 
 	dev/alpha_console.cc
+	dev/baddev.cc
 	dev/disk_image.cc
 	dev/io_device.cc
+	dev/isa_fake.cc
 	dev/platform.cc
         dev/simconsole.cc
 	dev/simple_disk.cc
+	dev/tsunami.cc
+	dev/tsunami_cchip.cc
+	dev/tsunami_io.cc
+	dev/tsunami_fake.cc
+	dev/tsunami_pchip.cc
+
 	dev/uart.cc
 	dev/uart8250.cc
 
@@ -204,7 +212,6 @@ full_system_sources = Split('''
 	sim/pseudo_inst.cc
         ''')
 
-#	dev/baddev.cc
 #	dev/etherbus.cc
 #	dev/etherdump.cc
 #	dev/etherint.cc
@@ -219,11 +226,6 @@ full_system_sources = Split('''
 #	dev/pcifake.cc
 #	dev/pktfifo.cc
 #	dev/sinic.cc
-#	dev/tsunami.cc
-#	dev/tsunami_cchip.cc
-#	dev/isa_fake.cc
-#	dev/tsunami_io.cc
-#	dev/tsunami_pchip.cc
 
 if env['TARGET_ISA'] == 'alpha':
     full_system_sources += Split('''