Thread: Use inherited baseCpu rather than cpu in SimpleThread

[gem5.git] / src / dev / SConscript

diff --git a/src/dev/SConscript b/src/dev/SConscript
index bd6b16c43a81a68f7757087228e62a61b9236c44..744e7b3c1fdee328d18cb040a7d1e7a28d2fd826 100644 (file)
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -31,21 +31,27 @@
 
 Import('*')
 
+if env['TARGET_ISA'] == 'no':
+    Return()
+
 if env['FULL_SYSTEM']:
     SimObject('BadDevice.py')
+    SimObject('CopyEngine.py')
     SimObject('Device.py')
     SimObject('DiskImage.py')
     SimObject('Ethernet.py')
     SimObject('Ide.py')
     SimObject('Pci.py')
     SimObject('Platform.py')
-    SimObject('SimConsole.py')
     SimObject('SimpleDisk.py')
+    SimObject('Terminal.py')
     SimObject('Uart.py')
 
     Source('baddev.cc')
+    Source('copy_engine.cc')
     Source('disk_image.cc')
     Source('etherbus.cc')
+    Source('etherdevice.cc')
     Source('etherdump.cc')
     Source('etherint.cc')
     Source('etherlink.cc')
@@ -63,41 +69,43 @@ if env['FULL_SYSTEM']:
     Source('pcidev.cc')
     Source('pktfifo.cc')
     Source('platform.cc')
-    Source('simconsole.cc')
+    Source('ps2.cc')
     Source('simple_disk.cc')
     Source('sinic.cc')
+    Source('terminal.cc')
     Source('uart.cc')
     Source('uart8250.cc')
 
-    TraceFlag('Console')
-    TraceFlag('ConsoleVerbose')
-    TraceFlag('DiskImageRead')
-    TraceFlag('DiskImageWrite')
-    TraceFlag('DMA')
-    TraceFlag('Ethernet')
-    TraceFlag('EthernetCksum')
-    TraceFlag('EthernetDMA')
-    TraceFlag('EthernetData')
-    TraceFlag('EthernetDesc')
-    TraceFlag('EthernetEEPROM')
-    TraceFlag('EthernetIntr')
-    TraceFlag('EthernetPIO')
-    TraceFlag('EthernetSM')
-    TraceFlag('IdeCtrl')
-    TraceFlag('IdeDisk')
-    TraceFlag('Intel8254Timer')
-    TraceFlag('IsaFake')
-    TraceFlag('MC146818')
-    TraceFlag('PCIDEV')
-    TraceFlag('PciConfigAll')
-    TraceFlag('SimpleDisk')
-    TraceFlag('SimpleDiskData')
-    TraceFlag('Uart')
+    DebugFlag('DiskImageRead')
+    DebugFlag('DiskImageWrite')
+    DebugFlag('DMA')
+    DebugFlag('DMACopyEngine')
+    DebugFlag('Ethernet')
+    DebugFlag('EthernetCksum')
+    DebugFlag('EthernetDMA')
+    DebugFlag('EthernetData')
+    DebugFlag('EthernetDesc')
+    DebugFlag('EthernetEEPROM')
+    DebugFlag('EthernetIntr')
+    DebugFlag('EthernetPIO')
+    DebugFlag('EthernetSM')
+    DebugFlag('IdeCtrl')
+    DebugFlag('IdeDisk')
+    DebugFlag('Intel8254Timer')
+    DebugFlag('IsaFake')
+    DebugFlag('MC146818')
+    DebugFlag('PCIDEV')
+    DebugFlag('PciConfigAll')
+    DebugFlag('SimpleDisk')
+    DebugFlag('SimpleDiskData')
+    DebugFlag('Terminal')
+    DebugFlag('TerminalVerbose')
+    DebugFlag('Uart')
 
     CompoundFlag('DiskImageAll', [ 'DiskImageRead', 'DiskImageWrite' ])
     CompoundFlag('EthernetAll', [ 'Ethernet', 'EthernetPIO', 'EthernetDMA',
         'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM',
-        'EthernetCksum' ])
+        'EthernetCksum', 'EthernetEEPROM' ])
     CompoundFlag('EthernetNoData', [ 'Ethernet', 'EthernetPIO', 'EthernetDesc',
         'EthernetIntr', 'EthernetSM', 'EthernetCksum' ])
     CompoundFlag('IdeAll', [ 'IdeCtrl', 'IdeDisk' ])