dev: Include DmaDevice in NULL builds
authorAndreas Sandberg <andreas.sandberg@arm.com>
Mon, 19 Dec 2016 16:25:38 +0000 (16:25 +0000)
committerAndreas Sandberg <andreas.sandberg@arm.com>
Mon, 19 Dec 2016 16:25:38 +0000 (16:25 +0000)
Builds for the NULL ISA include Device.py, which contains the Python
declaration of DmaDevice, but don't include the actual C++
implementation. Add dma_device.cc to the NULL build to the Python and
C++ worlds consistent again.

Change-Id: I47a57181a1f4d5a7276467678bf16fbc7f161681
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
src/dev/SConscript

index 2f3ec5d174c80ee74e6bce206c9cc5b1977e2532..9cfda05440f48e403356450580886e791b5df62d 100644 (file)
@@ -34,7 +34,10 @@ Import('*')
 SimObject('Device.py')
 Source('io_device.cc')
 Source('isa_fake.cc')
+Source('dma_device.cc')
+
 DebugFlag('IsaFake')
+DebugFlag('DMA')
 
 if env['TARGET_ISA'] == 'null':
     Return()
@@ -45,7 +48,6 @@ SimObject('Terminal.py')
 SimObject('Uart.py')
 
 Source('baddev.cc')
-Source('dma_device.cc')
 Source('intel_8254_timer.cc')
 Source('mc146818.cc')
 Source('pixelpump.cc')
@@ -55,7 +57,6 @@ Source('terminal.cc')
 Source('uart.cc')
 Source('uart8250.cc')
 
-DebugFlag('DMA')
 DebugFlag('Intel8254Timer')
 DebugFlag('MC146818')
 DebugFlag('Terminal')