diff options
author | Max Shvetsov <maksims.svecovs@arm.com> | 2020-02-25 13:55:00 +0000 |
---|---|---|
committer | Max Shvetsov <maksims.svecovs@arm.com> | 2020-03-03 11:38:36 +0000 |
commit | 033039f8e5ad0ff231261e316f27bf22bc5713a2 (patch) | |
tree | d59515f432ced3e90cc3a911d9f0ef3ea33f1cbc /plat | |
parent | 93ff138b59d493fe93ba7fee99e9f1d0f1acb361 (diff) | |
download | platform_external_arm-trusted-firmware-033039f8e5ad0ff231261e316f27bf22bc5713a2.tar.gz platform_external_arm-trusted-firmware-033039f8e5ad0ff231261e316f27bf22bc5713a2.tar.bz2 platform_external_arm-trusted-firmware-033039f8e5ad0ff231261e316f27bf22bc5713a2.zip |
SPMD: add command line parameter to run SPM at S-EL2 or S-EL1
Added SPMD_SPM_AT_SEL2 build command line parameter.
Set to 1 to run SPM at S-EL2.
Set to 0 to run SPM at S-EL1 (pre-v8.4 or S-EL2 is disabled).
Removed runtime EL from SPM core manifest.
Change-Id: Icb4f5ea4c800f266880db1d410d63fe27a1171c0
Signed-off-by: Artsem Artsemenka <artsem.artsemenka@arm.com>
Signed-off-by: Max Shvetsov <maksims.svecovs@arm.com>
Diffstat (limited to 'plat')
-rw-r--r-- | plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts | 1 | ||||
-rw-r--r-- | plat/common/plat_spmd_manifest.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts index e1c106f1e..c94a209fd 100644 --- a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts +++ b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts @@ -11,7 +11,6 @@ attribute { maj_ver = <0x0>; min_ver = <0x9>; - runtime_el = <0x1>; exec_state = <0x0>; load_address = <0x0 0x6000000>; entrypoint = <0x0 0x6000000>; diff --git a/plat/common/plat_spmd_manifest.c b/plat/common/plat_spmd_manifest.c index 4c789795e..9c3dc7177 100644 --- a/plat/common/plat_spmd_manifest.c +++ b/plat/common/plat_spmd_manifest.c @@ -37,12 +37,6 @@ static int manifest_parse_attribute(spmc_manifest_sect_attribute_t *attr, return -ENOENT; } - rc = fdtw_read_cells(fdt, node, "runtime_el", 1, &attr->runtime_el); - if (rc) { - ERROR("Missing SPM core runtime EL in manifest.\n"); - return -ENOENT; - } - rc = fdtw_read_cells(fdt, node, "exec_state", 1, &attr->exec_state); if (rc) NOTICE("Execution state not specified in SPM core manifest.\n"); @@ -61,7 +55,6 @@ static int manifest_parse_attribute(spmc_manifest_sect_attribute_t *attr, VERBOSE("SPM core manifest attribute section:\n"); VERBOSE(" version: %x.%x\n", attr->major_version, attr->minor_version); - VERBOSE(" runtime_el: 0x%x\n", attr->runtime_el); VERBOSE(" binary_size: 0x%x\n", attr->binary_size); VERBOSE(" load_address: 0x%llx\n", attr->load_address); VERBOSE(" entrypoint: 0x%llx\n", attr->entrypoint); |