1 files changed, 13 insertions, 5 deletions

diff --git a/src/dev/SConscript b/src/dev/SConscript
index 0aba8ac35..c09ec3dcd 100644
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -33,19 +33,22 @@ Import('*')
 
 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')
@@ -54,24 +57,25 @@ if env['FULL_SYSTEM']:
     Source('i8254xGBe.cc')
     Source('ide_ctrl.cc')
     Source('ide_disk.cc')
+    Source('intel_8254_timer.cc')
     Source('io_device.cc')
     Source('isa_fake.cc')
+    Source('mc146818.cc')
     Source('ns_gige.cc')
     Source('pciconfigall.cc')
     Source('pcidev.cc')
     Source('pktfifo.cc')
     Source('platform.cc')
-    Source('simconsole.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('DMACopyEngine')
     TraceFlag('Ethernet')
     TraceFlag('EthernetCksum')
     TraceFlag('EthernetDMA')
@@ -83,17 +87,21 @@ if env['FULL_SYSTEM']:
     TraceFlag('EthernetSM')
     TraceFlag('IdeCtrl')
     TraceFlag('IdeDisk')
+    TraceFlag('Intel8254Timer')
     TraceFlag('IsaFake')
+    TraceFlag('MC146818')
     TraceFlag('PCIDEV')
     TraceFlag('PciConfigAll')
     TraceFlag('SimpleDisk')
     TraceFlag('SimpleDiskData')
+    TraceFlag('Terminal')
+    TraceFlag('TerminalVerbose')
     TraceFlag('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' ])