summaryrefslogtreecommitdiff
path: root/src/python/SConscript
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2007-04-23 14:38:04 -0400
committerRon Dreslinski <rdreslin@umich.edu>2007-04-23 14:38:04 -0400
commit3eb4ba3abb0457fce0415b9fd5afb623028b1482 (patch)
tree356ec82872760b74a3dad82aad18ef27719d9b4d /src/python/SConscript
parent3b95161da834baa0d1bd635934ed308c2ec03632 (diff)
parent46f6fa8b45a1a1a572085f33c5173b189f76e407 (diff)
downloadgem5-3eb4ba3abb0457fce0415b9fd5afb623028b1482.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/head --HG-- extra : convert_revision : 11df5fb2a8f1fa020d042e75b22a7f2f2bcbd9ab
Diffstat (limited to 'src/python/SConscript')
-rw-r--r--src/python/SConscript5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/python/SConscript b/src/python/SConscript
index e1095eabe..3c5ab4da1 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -103,7 +103,6 @@ SimObject('m5/objects/Process.py')
SimObject('m5/objects/Repl.py')
SimObject('m5/objects/Root.py')
SimObject('m5/objects/Sampler.py')
-SimObject('m5/objects/Scsi.py')
SimObject('m5/objects/SimConsole.py')
SimObject('m5/objects/SimpleCPU.py')
SimObject('m5/objects/SimpleDisk.py')
@@ -114,7 +113,3 @@ SimObject('m5/objects/T1000.py')
#SimObject('m5/objects/Tru64System.py')
SimObject('m5/objects/Tsunami.py')
SimObject('m5/objects/Uart.py')
-
-if env['ALPHA_TLASER']:
- SimObject('m5/objects/DmaEngine.py')
- SimObject('m5/objects/Turbolaser.py')