summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2016-12-19 16:25:38 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2016-12-19 16:25:38 +0000
commit73627fa007f130c4dad34aadf1afa1d614de4669 (patch)
tree0938bc906e999e934790e969189e09fabd1ec110
parentd113153b52306a97710ce5da1523862685aba1ae (diff)
downloadgem5-73627fa007f130c4dad34aadf1afa1d614de4669.tar.xz
dev: Include DmaDevice in NULL builds
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>
-rw-r--r--src/dev/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dev/SConscript b/src/dev/SConscript
index 2f3ec5d17..9cfda0544 100644
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -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')