From: Bertrand Marquis <bertrand.marquis@arm.com>
Date: Wed, 25 Sep 2019 17:24:56 +0000 (+0100)
Subject: system-arm: Use dts include instead of cpp in ARM DTBs
X-Git-Tag: v19.0.0.0~285
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03a09a9f5c1e06b3711d803bfed7e5efa1d68486;p=gem5.git

system-arm: Use dts include instead of cpp in ARM DTBs

Change-Id: I342691a42e84dfe53659a7acb3b8db04e52e3002
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22824
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/system/arm/dt/Makefile b/system/arm/dt/Makefile
index c472a0e09..2d8ca6ec8 100644
--- a/system/arm/dt/Makefile
+++ b/system/arm/dt/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 ARM Limited
+# Copyright (c) 2015-2016, 2019 ARM Limited
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ VEXPRESS_GEM5_V2_DTSIS=\
 GEN_DTS=mkdir -p .gen; \
 	$(CPP) -x assembler-with-cpp \
 		$(DTC_CPP_FLAGS) \
-		-DCONF_PLATFORM=\"platforms/$(1)\" \
+		-DCONF_PLATFORM=\"../platforms/$(1)\" \
 		-DCONF_CPUS=$(2) \
 		-o $@ $<
 
diff --git a/system/arm/dt/armv7.dts b/system/arm/dt/armv7.dts
index c9c252347..96b37ec57 100644
--- a/system/arm/dt/armv7.dts
+++ b/system/arm/dt/armv7.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 ARM Limited
+ * Copyright (c) 2015-2016, 2019 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
 
 /dts-v1/;
 
-#include CONF_PLATFORM
+/include/ CONF_PLATFORM
 
 #define CPU(n) \
 	cpu@ ## n { \
diff --git a/system/arm/dt/armv8.dts b/system/arm/dt/armv8.dts
index 20d58a812..e221e6a45 100644
--- a/system/arm/dt/armv8.dts
+++ b/system/arm/dt/armv8.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 ARM Limited
+ * Copyright (c) 2015-2016, 2019 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
 
 /memreserve/ 0x80000000 0x00010000;
 
-#include CONF_PLATFORM
+/include/ CONF_PLATFORM
 
 #define CPU(n) \
 	cpu@ ## n { \
diff --git a/system/arm/dt/armv8_big_little.dts b/system/arm/dt/armv8_big_little.dts
index 83d2db76f..347cfe394 100644
--- a/system/arm/dt/armv8_big_little.dts
+++ b/system/arm/dt/armv8_big_little.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 ARM Limited
+ * Copyright (c) 2015-2016, 2019 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 
 /memreserve/ 0x80000000 0x00010000;
 
-#include CONF_PLATFORM
+/include/ CONF_PLATFORM
 
 /* Assign a unique ID for pre-defined configurations. The selected
  * configuration is picked up from CONF_CPUS
diff --git a/system/arm/dt/platforms/vexpress_gem5_v1.dtsi b/system/arm/dt/platforms/vexpress_gem5_v1.dtsi
index 60f68f7b2..d9c387703 100644
--- a/system/arm/dt/platforms/vexpress_gem5_v1.dtsi
+++ b/system/arm/dt/platforms/vexpress_gem5_v1.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 ARM Limited
+ * Copyright (c) 2015-2019 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  * Authors: Andreas Sandberg
  */
 
-#include "vexpress_gem5_v1_base.dtsi"
+/include/ "vexpress_gem5_v1_base.dtsi"
 
 / {
 	/* The display processor needs custom configuration to setup its
diff --git a/system/arm/dt/platforms/vexpress_gem5_v2.dtsi b/system/arm/dt/platforms/vexpress_gem5_v2.dtsi
index 8c7a903c7..9e4ccbdf5 100644
--- a/system/arm/dt/platforms/vexpress_gem5_v2.dtsi
+++ b/system/arm/dt/platforms/vexpress_gem5_v2.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 ARM Limited
+ * Copyright (c) 2015-2019 ARM Limited
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  * Authors: Andreas Sandberg
  */
 
-#include "vexpress_gem5_v2_base.dtsi"
+/include/ "vexpress_gem5_v2_base.dtsi"
 
 / {
 	/* The display processor needs custom configuration to setup its