diff options
| author | Kevin Brodsky <kevin.brodsky@arm.com> | 2019-02-04 11:45:52 +0000 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@arm.com> | 2019-02-12 14:06:00 +0000 |
| commit | 9d4d620ef10eee49091244ec846cbc19a24ab411 (patch) | |
| tree | 4d23ab1b1754e141882f114decae41e41d62da63 /system | |
| parent | ee9293d0ec8bcf793b6622a746726f9745d0631f (diff) | |
| download | gem5-9d4d620ef10eee49091244ec846cbc19a24ab411.tar.xz | |
system-arm: Fix dtsi dependencies in Makefile
Making vexpress_gem5_vX.dtsi depend on vexpress_gem5_vX_base.dtsi
does nothing, since vexpress_gem5_vX.dtsi is never built (much in
the same way as there is no point in making a C header depend on
another).
Fix that by making all the .dts depend on both .dtsi's.
Change-Id: I9131e0b1b2e521bb09d14721dec38bf6a2d98583
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Ruben Ayrapetyan <ruben.ayrapetyan@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/16143
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'system')
| -rw-r--r-- | system/arm/dt/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/system/arm/dt/Makefile b/system/arm/dt/Makefile index 9d2faf0e0..626ff0891 100644 --- a/system/arm/dt/Makefile +++ b/system/arm/dt/Makefile @@ -50,6 +50,14 @@ TARGETS=\ armv8_gem5_v2_8cpu.dtb \ armv8_gem5_v2_16cpu.dtb +VEXPRESS_GEM5_V1_DTSIS=\ + platforms/vexpress_gem5_v1.dtsi \ + platforms/vexpress_gem5_v1_base.dtsi + +VEXPRESS_GEM5_V2_DTSIS=\ + platforms/vexpress_gem5_v2.dtsi \ + platforms/vexpress_gem5_v2_base.dtsi + GEN_DTS=mkdir -p .gen; \ $(CPP) -x assembler-with-cpp \ $(DTC_CPP_FLAGS) \ @@ -59,21 +67,17 @@ GEN_DTS=mkdir -p .gen; \ all: $(TARGETS) -platforms/vexpress_gem5_v1.dtsi: platforms/vexpress_gem5_v1_base.dtsi - -platforms/vexpress_gem5_v2.dtsi: platforms/vexpress_gem5_v2_base.dtsi - -.gen/armv7_gem5_v1_%cpu.dts: armv7.dts platforms/vexpress_gem5_v1.dtsi +.gen/armv7_gem5_v1_%cpu.dts: armv7.dts $(VEXPRESS_GEM5_V1_DTSIS) $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*) -.gen/armv8_gem5_v1_%cpu.dts: armv8.dts platforms/vexpress_gem5_v1.dtsi +.gen/armv8_gem5_v1_%cpu.dts: armv8.dts $(VEXPRESS_GEM5_V1_DTSIS) $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*) -.gen/armv8_gem5_v2_%cpu.dts: armv8.dts platforms/vexpress_gem5_v2.dtsi +.gen/armv8_gem5_v2_%cpu.dts: armv8.dts $(VEXPRESS_GEM5_V2_DTSIS) $(call GEN_DTS,vexpress_gem5_v2.dtsi,$*) .gen/armv8_gem5_v1_big_little%.dts: armv8_big_little.dts \ - platforms/vexpress_gem5_v1.dtsi + $(VEXPRESS_GEM5_V1_DTSIS) $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*) %.dtb: .gen/%.dts |