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

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

Browse Source 
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>
This commit is contained in:
Bertrand Marquis
2019-09-25 18:24:56 +01:00
committed by Ciro Santilli
parent c3686edebf
commit 03a09a9f5c
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/arm/dt/Makefile
View File

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

4
system/arm/dt/armv7.dts
View File

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

4
system/arm/dt/armv8.dts
View File

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

4
system/arm/dt/armv8_big_little.dts
View File

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

4
system/arm/dt/platforms/vexpress_gem5_v1.dtsi
View File

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

4
system/arm/dt/platforms/vexpress_gem5_v2.dtsi
View File

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