andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1290 from jeenu-arm/dynamiq 

DynamIQ on FVP
This commit is contained in:
davidcunado-arm 2018-02-28 20:10:29 +00:00 committed by GitHub
parent 73a9605197 fe7210cdca
commit fdcc08af3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/user-guide.rst
View File

@ -755,6 +755,9 @@ ARM FVP platform specific build options
- ``FVP_CCN`` : The CCN driver is selected. This is the default - ``FVP_CCN`` : The CCN driver is selected. This is the default
if ``FVP_CLUSTER_COUNT`` > 2. if ``FVP_CLUSTER_COUNT`` > 2.
- ``FVP_MAX_CPUS_PER_CLUSTER``: Sets the maximum number of CPUs implemented in
a single cluster. This option defaults to 4.
- ``FVP_MAX_PE_PER_CPU``: Sets the maximum number of PEs implemented on any CPU - ``FVP_MAX_PE_PER_CPU``: Sets the maximum number of PEs implemented on any CPU
in the system. This option defaults to 1. Note that the build option in the system. This option defaults to 1. Note that the build option
``ARM_PLAT_MT`` doesn't have any effect on FVP platforms. ``ARM_PLAT_MT`` doesn't have any effect on FVP platforms.

BIN
fdts/fvp-base-gicv3-psci-dynamiq.dtb Normal file
View File

Binary file not shown.

41
fdts/fvp-base-gicv3-psci-dynamiq.dts Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-common.dtsi"
&CPU0 {
reg = <0x0 0x0>;
};
&CPU1 {
reg = <0x0 0x100>;
};
&CPU2 {
reg = <0x0 0x200>;
};
&CPU3 {
reg = <0x0 0x300>;
};
&CPU4 {
reg = <0x0 0x400>;
};
&CPU5 {
reg = <0x0 0x500>;
};
&CPU6 {
reg = <0x0 0x600>;
};
&CPU7 {
reg = <0x0 0x700>;
};

5
plat/arm/board/fvp/fvp_def.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -10,7 +10,10 @@
#ifndef FVP_CLUSTER_COUNT #ifndef FVP_CLUSTER_COUNT
#define FVP_CLUSTER_COUNT 2 #define FVP_CLUSTER_COUNT 2
#endif #endif
#ifndef FVP_MAX_CPUS_PER_CLUSTER
#define FVP_MAX_CPUS_PER_CLUSTER 4 #define FVP_MAX_CPUS_PER_CLUSTER 4
#endif
#ifndef FVP_MAX_PE_PER_CPU #ifndef FVP_MAX_PE_PER_CPU
# define FVP_MAX_PE_PER_CPU 1 # define FVP_MAX_PE_PER_CPU 1

6
plat/arm/board/fvp/platform.mk
View File

@ -13,6 +13,9 @@ FVP_USE_SP804_TIMER := 0
# Default cluster count for FVP # Default cluster count for FVP
FVP_CLUSTER_COUNT := 2 FVP_CLUSTER_COUNT := 2
# Default number of CPUs per cluster on FVP
FVP_MAX_CPUS_PER_CLUSTER := 4
# Default number of threads per CPU on FVP # Default number of threads per CPU on FVP
FVP_MAX_PE_PER_CPU := 1 FVP_MAX_PE_PER_CPU := 1
@ -27,6 +30,9 @@ $(eval $(call add_define,FVP_USE_GIC_DRIVER))
# Pass FVP_CLUSTER_COUNT to the build system. # Pass FVP_CLUSTER_COUNT to the build system.
$(eval $(call add_define,FVP_CLUSTER_COUNT)) $(eval $(call add_define,FVP_CLUSTER_COUNT))
# Pass FVP_MAX_CPUS_PER_CLUSTER to the build system.
$(eval $(call add_define,FVP_MAX_CPUS_PER_CLUSTER))
# Pass FVP_MAX_PE_PER_CPU to the build system. # Pass FVP_MAX_PE_PER_CPU to the build system.
$(eval $(call add_define,FVP_MAX_PE_PER_CPU)) $(eval $(call add_define,FVP_MAX_PE_PER_CPU))