diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-04 11:27:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 11:27:35 +0000 |
| commit | c57abde6f5b018a10162a76c1420f316dee1e50d (patch) | |
| tree | d763a824d0f02cf0080e70aca296ea1b1e599d00 /plat | |
| parent | 5735057d15ab5e36bd2640476a23dd1ead66254c (diff) | |
| parent | d57d2b315856fde5c9a2984ef46040c1ed7a28f6 (diff) | |
| download | platform_external_arm-trusted-firmware-c57abde6f5b018a10162a76c1420f316dee1e50d.tar.gz platform_external_arm-trusted-firmware-c57abde6f5b018a10162a76c1420f316dee1e50d.tar.bz2 platform_external_arm-trusted-firmware-c57abde6f5b018a10162a76c1420f316dee1e50d.zip | |
Merge pull request #1803 from sandrine-bailleux-arm/sb/arm-bl33-fixes
Fixes related to BL33 image on Arm platforms
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/include/platform_def.h | 2 | ||||
| -rw-r--r-- | plat/arm/common/aarch32/arm_bl2_mem_params_desc.c | 7 | ||||
| -rw-r--r-- | plat/arm/common/aarch64/arm_bl2_mem_params_desc.c | 7 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.c | 2 | ||||
| -rw-r--r-- | plat/arm/common/arm_nor_psci_mem_protect.c | 2 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/include/platform_def.h | 4 |
6 files changed, 13 insertions, 11 deletions
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index fcf363d7c..115310175 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -53,7 +53,7 @@ /* * Load address of BL33 for this platform port */ -#define PLAT_ARM_NS_IMAGE_OFFSET (ARM_DRAM1_BASE + UL(0x8000000)) +#define PLAT_ARM_NS_IMAGE_BASE (ARM_DRAM1_BASE + UL(0x8000000)) /* * PLAT_ARM_MMAP_ENTRIES depends on the number of entries in the diff --git a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c index e23dd258b..7aeeb2aed 100644 --- a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c +++ b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c @@ -75,12 +75,13 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t, IMAGE_ATTRIB_SKIP_LOADING), #else - .ep_info.pc = PLAT_ARM_NS_IMAGE_OFFSET, + .ep_info.pc = PLAT_ARM_NS_IMAGE_BASE, SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t, 0), - .image_info.image_base = PLAT_ARM_NS_IMAGE_OFFSET, - .image_info.image_max_size = ARM_DRAM1_SIZE, + .image_info.image_base = PLAT_ARM_NS_IMAGE_BASE, + .image_info.image_max_size = ARM_DRAM1_BASE + ARM_DRAM1_SIZE + - PLAT_ARM_NS_IMAGE_BASE, #endif /* PRELOADED_BL33_BASE */ .next_handoff_image_id = INVALID_IMAGE_ID, diff --git a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c index c0f42f310..0514b3994 100644 --- a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c +++ b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c @@ -176,12 +176,13 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t, IMAGE_ATTRIB_SKIP_LOADING), # else - .ep_info.pc = PLAT_ARM_NS_IMAGE_OFFSET, + .ep_info.pc = PLAT_ARM_NS_IMAGE_BASE, SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t, 0), - .image_info.image_base = PLAT_ARM_NS_IMAGE_OFFSET, - .image_info.image_max_size = ARM_DRAM1_SIZE, + .image_info.image_base = PLAT_ARM_NS_IMAGE_BASE, + .image_info.image_max_size = ARM_DRAM1_BASE + ARM_DRAM1_SIZE + - PLAT_ARM_NS_IMAGE_BASE, # endif /* PRELOADED_BL33_BASE */ .next_handoff_image_id = INVALID_IMAGE_ID, diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 5361d4ad1..0442945b8 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -40,7 +40,7 @@ uintptr_t plat_get_ns_image_entrypoint(void) #ifdef PRELOADED_BL33_BASE return PRELOADED_BL33_BASE; #else - return PLAT_ARM_NS_IMAGE_OFFSET; + return PLAT_ARM_NS_IMAGE_BASE; #endif } diff --git a/plat/arm/common/arm_nor_psci_mem_protect.c b/plat/arm/common/arm_nor_psci_mem_protect.c index dfbd12900..3a700598d 100644 --- a/plat/arm/common/arm_nor_psci_mem_protect.c +++ b/plat/arm/common/arm_nor_psci_mem_protect.c @@ -21,7 +21,7 @@ * until the end of DRAM1. * We limit the size of DRAM2 to 1 GB to avoid big delays while booting */ -#define DRAM1_NS_IMAGE_LIMIT (PLAT_ARM_NS_IMAGE_OFFSET + (32 << TWO_MB_SHIFT)) +#define DRAM1_NS_IMAGE_LIMIT (PLAT_ARM_NS_IMAGE_BASE + (32 << TWO_MB_SHIFT)) #define DRAM1_PROTECTED_SIZE (ARM_NS_DRAM1_END+1u - DRAM1_NS_IMAGE_LIMIT) static mem_region_t arm_ram_ranges[] = { diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index fb1041137..7b062fcaa 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -66,9 +66,9 @@ * BL33 specific defines. ******************************************************************************/ #ifndef PRELOADED_BL33_BASE -# define PLAT_ARM_NS_IMAGE_OFFSET 0x8000000 +# define PLAT_ARM_NS_IMAGE_BASE 0x8000000 #else -# define PLAT_ARM_NS_IMAGE_OFFSET PRELOADED_BL33_BASE +# define PLAT_ARM_NS_IMAGE_BASE PRELOADED_BL33_BASE #endif /******************************************************************************* |