SE/FS: Build the devices in SE mode.

2011-09-30 00:28:33 -07:00
parent 35e20c7470
commit 51f7a66660
25 changed files with 129 additions and 92 deletions
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -34,79 +34,77 @@ 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('SimpleDisk.py')
-    SimObject('Terminal.py')
-    SimObject('Uart.py')
+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('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')
-    Source('etherpkt.cc')
-    Source('ethertap.cc')
-    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('ps2.cc')
-    Source('simple_disk.cc')
-    Source('sinic.cc')
-    Source('terminal.cc')
-    Source('uart.cc')
-    Source('uart8250.cc')
+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')
+Source('etherpkt.cc')
+Source('ethertap.cc')
+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('ps2.cc')
+Source('simple_disk.cc')
+Source('sinic.cc')
+Source('terminal.cc')
+Source('uart.cc')
+Source('uart8250.cc')

-    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', 'EthernetEEPROM' ])
-    CompoundFlag('EthernetNoData', [ 'Ethernet', 'EthernetPIO', 'EthernetDesc',
-        'EthernetIntr', 'EthernetSM', 'EthernetCksum' ])
-    CompoundFlag('IdeAll', [ 'IdeCtrl', 'IdeDisk' ])
+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', 'EthernetEEPROM' ])
+CompoundFlag('EthernetNoData', [ 'Ethernet', 'EthernetPIO', 'EthernetDesc',
+    'EthernetIntr', 'EthernetSM', 'EthernetCksum' ])
+CompoundFlag('IdeAll', [ 'IdeCtrl', 'IdeDisk' ])