mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-25 22:35:42 +00:00
feat(imx8mp): optionally take params from BL2
Optionally take params from BL2 to offer more flexibility to BL2 on where and if a BL32 image is expected. This uses imx_bl31_params_parse() to check if arg0 can safely be accessed as a pointer and actually contains a bl_params_t structure. If not, the hardcoded parameter values are used as before. Change-Id: I44537ba2baa7543e459e5691b69df14b0bd6e942 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
c37a877e56
commit
3d9fea941a
3 changed files with 14 additions and 1 deletions
plat/imx/imx8m/imx8mp
|
@ -29,6 +29,7 @@
|
|||
#include <imx8m_csu.h>
|
||||
#include <imx8m_snvs.h>
|
||||
#include <platform_def.h>
|
||||
#include <plat_common.h>
|
||||
#include <plat_imx8.h>
|
||||
|
||||
#define TRUSTY_PARAMS_LEN_BYTES (4096*2)
|
||||
|
@ -156,6 +157,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
|||
static console_t console;
|
||||
unsigned int val;
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
/* Enable CSU NS access permission */
|
||||
for (i = 0; i < 64; i++) {
|
||||
|
@ -213,6 +215,13 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
|||
bl32_image_ep_info.args.arg3 = BL32_FDT_OVERLAY_ADDR;
|
||||
#endif
|
||||
#endif
|
||||
ret = imx_bl31_params_parse(arg0, IMX_NS_OCRAM_SIZE, IMX_NS_OCRAM_BASE,
|
||||
&bl32_image_ep_info, &bl33_image_ep_info);
|
||||
if (ret != 0) {
|
||||
ret = imx_bl31_params_parse(arg0, IMX_TCM_BASE, IMX_TCM_SIZE,
|
||||
&bl32_image_ep_info,
|
||||
&bl33_image_ep_info);
|
||||
}
|
||||
|
||||
#if !defined(SPD_opteed) && !defined(SPD_trusty)
|
||||
enable_snvs_privileged_access();
|
||||
|
|
|
@ -172,6 +172,9 @@
|
|||
|
||||
#define MAX_CSU_NUM U(64)
|
||||
|
||||
#define IMX_TCM_BASE U(0x7E0000)
|
||||
#define IMX_TCM_SIZE U(0x40000)
|
||||
|
||||
#define OCRAM_S_BASE U(0x00180000)
|
||||
#define OCRAM_S_SIZE U(0x8000)
|
||||
#define OCRAM_S_LIMIT (OCRAM_S_BASE + OCRAM_S_SIZE)
|
||||
|
|
|
@ -26,7 +26,8 @@ IMX_GIC_SOURCES := ${GICV3_SOURCES} \
|
|||
plat/common/plat_psci_common.c \
|
||||
plat/imx/common/plat_imx8_gic.c
|
||||
|
||||
BL31_SOURCES += plat/imx/common/imx8_helpers.S \
|
||||
BL31_SOURCES += common/desc_image_load.c \
|
||||
plat/imx/common/imx8_helpers.S \
|
||||
plat/imx/imx8m/gpc_common.c \
|
||||
plat/imx/imx8m/imx_hab.c \
|
||||
plat/imx/imx8m/imx_aipstz.c \
|
||||
|
|
Loading…
Add table
Reference in a new issue