summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-04-10 14:14:25 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-04-10 14:14:25 -0400
commite17a15f4c5d9a0b65de5e4b0ddceac81385d5360 (patch)
treea559a7023720aeb8f34e5e29875e6eb64f5eabcf /SConscript
parent5e11a1763dc0c30438e424938960f76d39742e0b (diff)
parente8b6eb49bcaa768c40c10e354bb66cae0a65a2a1 (diff)
downloadgem5-e17a15f4c5d9a0b65de5e4b0ddceac81385d5360.tar.xz
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : 36da0febc30675e955a10eb8bc45586b6242a8c3
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript14
1 files changed, 8 insertions, 6 deletions
diff --git a/SConscript b/SConscript
index 5244ad1e6..3693435b6 100644
--- a/SConscript
+++ b/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('''