Merge m5.eecs.umich.edu:/bk/newmem

into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : bd6352647798275a12d52d55a129cdddd8e25423

1 files changed, 24 insertions, 22 deletions

diff --git a/SConscript b/SConscript
index ea77f0ec7..921b8bc84 100644
--- a/SConscript
+++ b/SConscript
@@ -183,31 +183,11 @@ full_system_sources = Split('''
         cpu/profile.cc
 
 	dev/alpha_console.cc
-	dev/baddev.cc
-        dev/simconsole.cc
 	dev/disk_image.cc
-	dev/etherbus.cc
-	dev/etherdump.cc
-	dev/etherint.cc
-	dev/etherlink.cc
-	dev/etherpkt.cc
-	dev/ethertap.cc
-	dev/ide_ctrl.cc
-	dev/ide_disk.cc
 	dev/io_device.cc
-	dev/ns_gige.cc
-	dev/pciconfigall.cc
-	dev/pcidev.cc
-	dev/pcifake.cc
-	dev/pktfifo.cc
 	dev/platform.cc
-	dev/sinic.cc
+        dev/simconsole.cc
 	dev/simple_disk.cc
-	dev/tsunami.cc
-	dev/tsunami_cchip.cc
-	dev/isa_fake.cc
-	dev/tsunami_io.cc
-	dev/tsunami_pchip.cc
 	dev/uart.cc
 	dev/uart8250.cc
 
@@ -218,10 +198,32 @@ full_system_sources = Split('''
 	kern/linux/linux_syscalls.cc
 	kern/linux/printk.cc
 
-	mem/functional/memory_control.cc
+        mem/vport.cc
+
 	sim/pseudo_inst.cc
         ''')
 
+#	dev/baddev.cc
+#	dev/etherbus.cc
+#	dev/etherdump.cc
+#	dev/etherint.cc
+#	dev/etherlink.cc
+#	dev/etherpkt.cc
+#	dev/ethertap.cc
+#	dev/ide_ctrl.cc
+#	dev/ide_disk.cc
+#	dev/ns_gige.cc
+#	dev/pciconfigall.cc
+#	dev/pcidev.cc
+#	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('''
 	kern/tru64/dump_mbuf.cc