Moved the tsunami devices into the dev/alpha directory. Other devices "generic" devic...

[gem5.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index 0d0cb24867f2d7a37732d5f98a082b1287d08da5..b383f58d69502076211ed993aa5785e42af0e6c7 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -47,6 +47,7 @@ Import('env')
 # Base sources used by all configurations.
 
 base_sources = Split('''
+       base/annotate.cc
        base/circlebuf.cc
        base/cprintf.cc
        base/fast_alloc.cc
@@ -89,16 +90,17 @@ base_sources = Split('''
        cpu/pc_event.cc
         cpu/quiesce_event.cc
        cpu/static_inst.cc
-        cpu/sampler/sampler.cc
         cpu/simple_thread.cc
         cpu/thread_state.cc
 
         mem/bridge.cc
         mem/bus.cc
+        mem/dram.cc
         mem/mem_object.cc
         mem/packet.cc
         mem/physical.cc
         mem/port.cc
+        mem/tport.cc
 
         mem/cache/base_cache.cc
         mem/cache/cache.cc
@@ -209,34 +211,6 @@ full_system_sources = Split('''
        cpu/intr_control.cc
         cpu/profile.cc
 
-       dev/alpha_console.cc
-       dev/baddev.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/isa_fake.cc
-       dev/ns_gige.cc
-       dev/pciconfigall.cc
-       dev/pcidev.cc
-       dev/pcifake.cc
-       dev/pktfifo.cc
-       dev/platform.cc
-        dev/simconsole.cc
-       dev/simple_disk.cc
-       dev/sinic.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
 
@@ -250,7 +224,8 @@ full_system_sources = Split('''
 
        sim/pseudo_inst.cc
         ''')
-
+       #dev/sinic.cc
+        #dev/i8254xGBe.cc
 
 if env['TARGET_ISA'] == 'alpha':
     full_system_sources += Split('''
@@ -299,7 +274,7 @@ alpha_eio_sources = Split('''
        encumbered/eio/eio.cc
         ''')
 
-if env['TARGET_ISA'] == 'ALPHA_ISA':
+if env['TARGET_ISA'] == 'alpha':
     syscall_emulation_sources += alpha_eio_sources
     
 memtest_sources = Split('''
@@ -315,9 +290,12 @@ env.Append(CPPPATH=Dir('.'))
 # Add a flag defining what THE_ISA should be for all compilation
 env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
 
-arch_sources = SConscript('arch/SConscript', exports = 'env')
+arch_sources = SConscript(os.path.join('arch', 'SConscript'), exports = 'env')
+
+cpu_sources = SConscript(os.path.join('cpu', 'SConscript'), exports = 'env')
 
-cpu_sources = SConscript('cpu/SConscript', exports = 'env')
+dev_sources = SConscript(os.path.join('dev', 'SConscript'), exports = 'env')
+full_system_sources += dev_sources
 
 # This is outside of cpu/SConscript since the source directory isn't
 # underneath 'cpu'.