mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-19 02:54:24 +00:00
Merge "build(corstone1000): add CORSTONE1000_WITH_BL32 preprocessor flag" into integration
This commit is contained in:
commit
df6404b2d3
2 changed files with 12 additions and 2 deletions
|
@ -34,9 +34,14 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
|
|||
.image_info.image_base = BL31_BASE,
|
||||
.image_info.image_max_size = BL31_LIMIT - BL31_BASE,
|
||||
|
||||
#ifdef CORSTONE1000_WITH_BL32
|
||||
.next_handoff_image_id = BL32_IMAGE_ID,
|
||||
#else
|
||||
.next_handoff_image_id = BL33_IMAGE_ID,
|
||||
#endif
|
||||
},
|
||||
|
||||
#ifdef CORSTONE1000_WITH_BL32
|
||||
/* Fill BL32 related information */
|
||||
{
|
||||
.image_id = BL32_IMAGE_ID,
|
||||
|
@ -65,7 +70,7 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
|
|||
VERSION_2, image_info_t, 0),
|
||||
.next_handoff_image_id = INVALID_IMAGE_ID,
|
||||
},
|
||||
|
||||
#endif
|
||||
/* Fill BL33 related information */
|
||||
{
|
||||
.image_id = BL33_IMAGE_ID,
|
||||
|
|
|
@ -28,9 +28,14 @@ FIP_BL2_ARGS := tb-fw
|
|||
|
||||
override NEED_BL2U := no
|
||||
override NEED_BL31 := yes
|
||||
NEED_BL32 := yes
|
||||
NEED_BL32 ?= yes
|
||||
override NEED_BL33 := yes
|
||||
|
||||
# Add CORSTONE1000_WITH_BL32 as a preprocessor define (-D option)
|
||||
ifeq (${NEED_BL32},yes)
|
||||
$(eval $(call add_define,CORSTONE1000_WITH_BL32))
|
||||
endif
|
||||
|
||||
# Include GICv2 driver files
|
||||
include drivers/arm/gic/v2/gicv2.mk
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue