derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system-arm: Fix dtsi dependencies in Makefile

Browse Source 
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>
This commit is contained in:
Kevin Brodsky
2019-02-04 11:45:52 +00:00
committed by Ciro Santilli
parent ee9293d0ec
commit 9d4d620ef1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/arm/dt/Makefile
View File

@@ -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