diff options
author | Balint Dobszay <balint.dobszay@arm.com> | 2020-01-10 17:16:27 +0100 |
---|---|---|
committer | Balint Dobszay <balint.dobszay@arm.com> | 2020-01-14 10:30:38 +0100 |
commit | 2d51b55ee5d2a30b4e9140d8f9b6ccc541301db5 (patch) | |
tree | 315022576d9ad07a49f0157d85591bca43eb14b8 /fdts | |
parent | dadd8060f104eb254a26226a7bdf238aef225eb3 (diff) | |
download | arm-trusted-firmware-2d51b55ee5d2a30b4e9140d8f9b6ccc541301db5.tar.gz |
Replace dts includes with C preprocessor syntax
Using the /include/ syntax, the include was evaluated by dtc, only after running
the preprocessor, therefore the .dtsi files were not preprocessed. This patch
adds the #include syntax instead. Evaluating this and preprocessing the files
now happens in a single step, done by the C preprocessor.
Change-Id: I6d0104b6274316fc736e84973502a4d6c2c9d6e0
Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Diffstat (limited to 'fdts')
-rw-r--r-- | fdts/fvp-base-gicv2-psci-aarch32.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv2-psci.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-1t.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-aarch32-1t.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-aarch32-common.dtsi | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-aarch32.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-common.dtsi | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-dynamiq-2t.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci-dynamiq.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-ve-Cortex-A5x1.dts | 4 | ||||
-rw-r--r-- | fdts/fvp-ve-Cortex-A7x1.dts | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/fdts/fvp-base-gicv2-psci-aarch32.dts b/fdts/fvp-base-gicv2-psci-aarch32.dts index 87ac68d67..e71a39519 100644 --- a/fdts/fvp-base-gicv2-psci-aarch32.dts +++ b/fdts/fvp-base-gicv2-psci-aarch32.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -279,7 +279,7 @@ <0 0 41 &gic 0 41 4>, <0 0 42 &gic 0 42 4>; - /include/ "rtsm_ve-motherboard-aarch32.dtsi" + #include "rtsm_ve-motherboard-aarch32.dtsi" }; panels { diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index 941040d8e..c9c9d9594 100644 --- a/fdts/fvp-base-gicv2-psci.dts +++ b/fdts/fvp-base-gicv2-psci.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -233,7 +233,7 @@ <4 0 0 0x0c000000 0x04000000>, <5 0 0 0x10000000 0x04000000>; - /include/ "rtsm_ve-motherboard.dtsi" + #include "rtsm_ve-motherboard.dtsi" }; panels { diff --git a/fdts/fvp-base-gicv3-psci-1t.dts b/fdts/fvp-base-gicv3-psci-1t.dts index 36fbd4444..3c82f7b13 100644 --- a/fdts/fvp-base-gicv3-psci-1t.dts +++ b/fdts/fvp-base-gicv3-psci-1t.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-common.dtsi" +#include "fvp-base-gicv3-psci-common.dtsi" &CPU0 { reg = <0x0 0x0>; diff --git a/fdts/fvp-base-gicv3-psci-aarch32-1t.dts b/fdts/fvp-base-gicv3-psci-aarch32-1t.dts index f7c936210..d1d33485c 100644 --- a/fdts/fvp-base-gicv3-psci-aarch32-1t.dts +++ b/fdts/fvp-base-gicv3-psci-aarch32-1t.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-aarch32-common.dtsi" +#include "fvp-base-gicv3-psci-aarch32-common.dtsi" &CPU0 { reg = <0x0>; diff --git a/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi b/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi index 6179c66e7..f9809db8b 100644 --- a/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi +++ b/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -286,7 +286,7 @@ <0 0 41 &gic 0 0 0 41 4>, <0 0 42 &gic 0 0 0 42 4>; - /include/ "rtsm_ve-motherboard-aarch32.dtsi" + #include "rtsm_ve-motherboard-aarch32.dtsi" }; panels { diff --git a/fdts/fvp-base-gicv3-psci-aarch32.dts b/fdts/fvp-base-gicv3-psci-aarch32.dts index 2833cdfac..513014b32 100644 --- a/fdts/fvp-base-gicv3-psci-aarch32.dts +++ b/fdts/fvp-base-gicv3-psci-aarch32.dts @@ -1,9 +1,9 @@ /* - * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-aarch32-common.dtsi" +#include "fvp-base-gicv3-psci-aarch32-common.dtsi" diff --git a/fdts/fvp-base-gicv3-psci-common.dtsi b/fdts/fvp-base-gicv3-psci-common.dtsi index 631c4e345..94ed67d55 100644 --- a/fdts/fvp-base-gicv3-psci-common.dtsi +++ b/fdts/fvp-base-gicv3-psci-common.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -240,7 +240,7 @@ <4 0 0 0x0c000000 0x04000000>, <5 0 0 0x10000000 0x04000000>; - /include/ "rtsm_ve-motherboard.dtsi" + #include "rtsm_ve-motherboard.dtsi" }; panels { diff --git a/fdts/fvp-base-gicv3-psci-dynamiq-2t.dts b/fdts/fvp-base-gicv3-psci-dynamiq-2t.dts index f35eaf482..48269a065 100644 --- a/fdts/fvp-base-gicv3-psci-dynamiq-2t.dts +++ b/fdts/fvp-base-gicv3-psci-dynamiq-2t.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-common.dtsi" +#include "fvp-base-gicv3-psci-common.dtsi" &CPU0 { reg = <0x0 0x0>; diff --git a/fdts/fvp-base-gicv3-psci-dynamiq.dts b/fdts/fvp-base-gicv3-psci-dynamiq.dts index 614c5d5c0..51c7acacf 100644 --- a/fdts/fvp-base-gicv3-psci-dynamiq.dts +++ b/fdts/fvp-base-gicv3-psci-dynamiq.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-common.dtsi" +#include "fvp-base-gicv3-psci-common.dtsi" &CPU0 { reg = <0x0 0x0>; diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts index 3ea429ce9..65fa4b0d9 100644 --- a/fdts/fvp-base-gicv3-psci.dts +++ b/fdts/fvp-base-gicv3-psci.dts @@ -1,9 +1,9 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /dts-v1/; -/include/ "fvp-base-gicv3-psci-common.dtsi" +#include "fvp-base-gicv3-psci-common.dtsi" diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts index 03b61dd73..b6da90549 100644 --- a/fdts/fvp-foundation-gicv2-psci.dts +++ b/fdts/fvp-foundation-gicv2-psci.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -182,6 +182,6 @@ <4 0 0 0x0c000000 0x04000000>, <5 0 0 0x10000000 0x04000000>; - /include/ "fvp-foundation-motherboard.dtsi" + #include "fvp-foundation-motherboard.dtsi" }; }; diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts index 1488ed7f7..81071e255 100644 --- a/fdts/fvp-foundation-gicv3-psci.dts +++ b/fdts/fvp-foundation-gicv3-psci.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -191,6 +191,6 @@ <4 0 0 0x0c000000 0x04000000>, <5 0 0 0x10000000 0x04000000>; - /include/ "fvp-foundation-motherboard.dtsi" + #include "fvp-foundation-motherboard.dtsi" }; }; diff --git a/fdts/fvp-ve-Cortex-A5x1.dts b/fdts/fvp-ve-Cortex-A5x1.dts index 0f766016d..9d2d1d552 100644 --- a/fdts/fvp-ve-Cortex-A5x1.dts +++ b/fdts/fvp-ve-Cortex-A5x1.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -139,6 +139,6 @@ <0 0 5 &gic 0 5 4>, <0 0 42 &gic 0 42 4>; - /include/ "rtsm_ve-motherboard-aarch32.dtsi" + #include "rtsm_ve-motherboard-aarch32.dtsi" }; }; diff --git a/fdts/fvp-ve-Cortex-A7x1.dts b/fdts/fvp-ve-Cortex-A7x1.dts index fca3d90ab..28de91d3c 100644 --- a/fdts/fvp-ve-Cortex-A7x1.dts +++ b/fdts/fvp-ve-Cortex-A7x1.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -71,6 +71,6 @@ <0 0 5 &gic 0 5 4>, <0 0 42 &gic 0 42 4>; - /include/ "rtsm_ve-motherboard-aarch32.dtsi" + #include "rtsm_ve-motherboard-aarch32.dtsi" }; }; |