Ciro Santilli has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/22824 )
Change subject: system-arm: Use dts include instead of cpp in ARM DTBs
......................................................................
system-arm: Use dts include instead of cpp in ARM DTBs
Change-Id: I342691a42e84dfe53659a7acb3b8db04e52e3002
Signed-off-by: Bertrand Marquis <[email protected]>
---
M system/arm/dt/Makefile
M system/arm/dt/armv7.dts
M system/arm/dt/armv8.dts
M system/arm/dt/armv8_big_little.dts
M system/arm/dt/platforms/vexpress_gem5_v1.dtsi
M system/arm/dt/platforms/vexpress_gem5_v2.dtsi
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/system/arm/dt/Makefile b/system/arm/dt/Makefile
index c472a0e..2d8ca6e 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 @@
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 c9c2523..96b37ec 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 20d58a8..e221e6a 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 83d2db7..347cfe3 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 60f68f7..d9c3877 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 8c7a903..9e4ccbd 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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/22824
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: I342691a42e84dfe53659a7acb3b8db04e52e3002
Gerrit-Change-Number: 22824
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
