diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-16 21:01:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 21:01:22 +0000 |
| commit | efb2826bb8160e2d8e0fcec85133a7468484f9fd (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /fdts/fvp-base-gicv3-psci-dynamiq.dts | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac (diff) | |
| parent | faa476c0caaa598afa5a6109d17102db5fe35ec6 (diff) | |
| download | platform_external_arm-trusted-firmware-master.tar.gz platform_external_arm-trusted-firmware-master.tar.bz2 platform_external_arm-trusted-firmware-master.zip | |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0caHEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a25534ceed4f8e188510641080d8b8ed49b8f62
Diffstat (limited to 'fdts/fvp-base-gicv3-psci-dynamiq.dts')
| -rw-r--r-- | fdts/fvp-base-gicv3-psci-dynamiq.dts | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/fdts/fvp-base-gicv3-psci-dynamiq.dts b/fdts/fvp-base-gicv3-psci-dynamiq.dts index 51c7acacf..b693f7512 100644 --- a/fdts/fvp-base-gicv3-psci-dynamiq.dts +++ b/fdts/fvp-base-gicv3-psci-dynamiq.dts @@ -4,38 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/dts-v1/; - -#include "fvp-base-gicv3-psci-common.dtsi" - -&CPU0 { - reg = <0x0 0x0>; -}; - -&CPU1 { - reg = <0x0 0x100>; -}; +/* DynamIQ configuration: 1 cluster with up to 8 CPUs */ -&CPU2 { - reg = <0x0 0x200>; -}; +/* Set default value if not passed from platform's makefile */ +#ifdef FVP_MAX_PE_PER_CPU +#define PE_PER_CPU FVP_MAX_PE_PER_CPU +#else +#define PE_PER_CPU 1 +#endif -&CPU3 { - reg = <0x0 0x300>; -}; - -&CPU4 { - reg = <0x0 0x400>; -}; - -&CPU5 { - reg = <0x0 0x500>; -}; - -&CPU6 { - reg = <0x0 0x600>; -}; +/dts-v1/; -&CPU7 { - reg = <0x0 0x700>; -}; +#include "fvp-base-gicv3-psci-dynamiq-common.dtsi" |