diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2022-08-19 11:00:37 +0100 |
|---|---|---|
| committer | Andre Przywara <andre.przywara@arm.com> | 2022-10-11 16:11:39 +0100 |
| commit | 589aaba46e1ea9fbbf8033b38e7ac56812e5dc23 (patch) | |
| tree | 1fb79475fe173afed98a9f2776f3ae94ae69c6cc /fdts/fvp-base-gicv3-psci-dynamiq.dts | |
| parent | b92033075aa27031091e184b54f4dc278ecb27bc (diff) | |
| download | arm-trusted-firmware-589aaba46e1ea9fbbf8033b38e7ac56812e5dc23.tar.gz | |
refactor(fvp): fdts: consolidate GICv3 base FVP DT files
The GICv2 and GICv3 version of the FVP DT files are unnecessarily split,
as the common part of the peripherals is the same: it's literally just
the interrupt controller node that is different.
To facilitate a unification, refactor the DT include files to explicitly
include a snippet with just the GICv3 description, and a generic base DT
file for the rest. This generic file can then be reused by the GICv2
versions later.
Since we can only have a /memreserve/ entry *before* any DT nodes, move
that line to each file, to allow including the GIC DT file separately.
Change-Id: I9ff357d3fe0ce46e280c30131aeae97a99631512
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'fdts/fvp-base-gicv3-psci-dynamiq.dts')
| -rw-r--r-- | fdts/fvp-base-gicv3-psci-dynamiq.dts | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fdts/fvp-base-gicv3-psci-dynamiq.dts b/fdts/fvp-base-gicv3-psci-dynamiq.dts index b693f7512..1bf803e22 100644 --- a/fdts/fvp-base-gicv3-psci-dynamiq.dts +++ b/fdts/fvp-base-gicv3-psci-dynamiq.dts @@ -13,6 +13,11 @@ #define PE_PER_CPU 1 #endif +#include "fvp-defs-dynamiq.dtsi" + /dts-v1/; -#include "fvp-base-gicv3-psci-dynamiq-common.dtsi" +/memreserve/ 0x80000000 0x00010000; + +#include "fvp-base-gicv3.dtsi" +#include "fvp-base-psci-common.dtsi" |