Hello Andreas Sandberg,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/16143
to review the following change.
Change subject: system-arm: Fix dtsi dependencies in Makefile
......................................................................
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 <[email protected]>
Reviewed-by: Ciro Santilli <[email protected]>
Reviewed-by: Ruben Ayrapetyan <[email protected]>
---
M system/arm/dt/Makefile
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/system/arm/dt/Makefile b/system/arm/dt/Makefile
index 9d2faf0..626ff08 100644
--- a/system/arm/dt/Makefile
+++ b/system/arm/dt/Makefile
@@ -50,6 +50,14 @@
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 @@
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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16143
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I9131e0b1b2e521bb09d14721dec38bf6a2d98583
Gerrit-Change-Number: 16143
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
