Skip to content

Commit bd9fc4b

Browse files
hartun01jonmason
authored andcommitted
ci,arm-bsp: corstone1000: New MACHINE_FEATURES for Corstone-1000 FVP multicore
Introduce `corstone1000_fvp_smp` as a value of the `MACHINE_FEATURES` variable to support Corstone-1000 FVP Symmetric Multiprocessing. A new YAML file is created to add this new machine only for the FVP variant of the target platform. The multicore feature is enabled in TrustedFirmware-A, TrustedFirmware-M, and OP-TEE based on this machine feature. Signed-off-by: Harsimran Singh Tungal <harsimransingh.tungal@arm.com>
1 parent e437bc8 commit bd9fc4b

4 files changed

Lines changed: 12 additions & 0 deletions

File tree

kas/corstone1000-fvp-multicore.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
2+
3+
header:
4+
version: 14
5+
6+
local_conf_header:
7+
fvp-multicore: |
8+
MACHINE_FEATURES += "corstone1000_fvp_smp"

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ EXTRA_OEMAKE:append = " \
5555
BL32=${RECIPE_SYSROOT}/${nonarch_base_libdir}/firmware/tee-pager_v2.bin \
5656
FVP_USE_GIC_DRIVER=FVP_GICV2 \
5757
"
58+
EXTRA_OEMAKE:append:corstone1000-fvp = "${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', ' ENABLE_MULTICORE=1', '', d)}"

meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ TFM_DEBUG = "1"
1010
TFM_PLATFORM_IS_FVP ?= "FALSE"
1111
EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}"
1212
EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF"
13+
EXTRA_OECMAKE:append:corstone1000-fvp = " -DENABLE_MULTICORE=${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', 'TRUE', 'FALSE', d)}"
1314

1415
SRC_URI += " \
1516
file://0001-arm-trusted-firmware-m-disable-address-warnings-into.patch \

meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ EXTRA_OEMAKE += " CFG_TEE_BENCHMARK=n"
1717
EXTRA_OEMAKE += " CFG_CORE_SEL1_SPMC=y CFG_CORE_FFA=y"
1818

1919
EXTRA_OEMAKE += " CFG_WITH_SP=y"
20+
21+
EXTRA_OEMAKE:append:corstone1000-fvp = "${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', ' CFG_TEE_CORE_NB_CORE=4', '', d)}"

0 commit comments

Comments
 (0)