Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "fvpr_cleanup" into integration

Browse source 
* changes:
  refactor(tbbr): remove "fvp_r" platform specific check
  refactor(Makefile): move NEED_<IMAGE> before their use
This commit is contained in:
Mark Dykes 2021-10-06 23:44:11 +02:00 • committed by TrustedFirmware Code Review
commit 3c0df4cb49
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Makefile
View file

@ -805,10 +805,16 @@ endif
# Process platform overrideable behaviour # Process platform overrideable behaviour
################################################################################ ################################################################################
# Using BL2 implies that a BL33 image also needs to be supplied for the FIP and ifdef BL1_SOURCES
# Certificate generation tools. This flag can be overridden by the platform. NEED_BL1 := yes
endif
ifdef BL2_SOURCES ifdef BL2_SOURCES
ifdef EL3_PAYLOAD_BASE NEED_BL2 := yes
# Using BL2 implies that a BL33 image also needs to be supplied for the FIP and
# Certificate generation tools. This flag can be overridden by the platform.
ifdef EL3_PAYLOAD_BASE
# If booting an EL3 payload there is no need for a BL33 image # If booting an EL3 payload there is no need for a BL33 image
# in the FIP file. # in the FIP file.
NEED_BL33 := no NEED_BL33 := no
@ -823,6 +829,10 @@ ifdef BL2_SOURCES
endif endif
endif endif
ifdef BL2U_SOURCES
NEED_BL2U := yes
endif
# If SCP_BL2 is given, we always want FIP to include it. # If SCP_BL2 is given, we always want FIP to include it.
ifdef SCP_BL2 ifdef SCP_BL2
NEED_SCP_BL2 := yes NEED_SCP_BL2 := yes
@ -860,6 +870,10 @@ ifneq (${FIP_ALIGN},0)
FIP_ARGS += --align ${FIP_ALIGN} FIP_ARGS += --align ${FIP_ALIGN}
endif endif
ifdef FDT_SOURCES
NEED_FDT := yes
endif
################################################################################ ################################################################################
# Include libraries' Makefile that are used in all BL # Include libraries' Makefile that are used in all BL
################################################################################ ################################################################################
@ -903,30 +917,22 @@ DOCS_PATH ?= docs
################################################################################ ################################################################################
# Include BL specific makefiles # Include BL specific makefiles
################################################################################ ################################################################################
ifdef BL1_SOURCES
NEED_BL1 := yes ifeq (${NEED_BL1},yes)
include bl1/bl1.mk include bl1/bl1.mk
endif endif
ifdef BL2_SOURCES ifeq (${NEED_BL2},yes)
NEED_BL2 := yes
include bl2/bl2.mk include bl2/bl2.mk
endif endif
ifdef BL2U_SOURCES ifeq (${NEED_BL2U},yes)
NEED_BL2U := yes
include bl2u/bl2u.mk include bl2u/bl2u.mk
endif endif
ifeq (${NEED_BL31},yes) ifeq (${NEED_BL31},yes)
ifdef BL31_SOURCES
include bl31/bl31.mk include bl31/bl31.mk
endif endif
endif
ifdef FDT_SOURCES
NEED_FDT := yes
endif
################################################################################ ################################################################################
# Build options checks # Build options checks

3
make_helpers/tbbr/tbbr_tools.mk
View file

@ -11,6 +11,7 @@
# Expected environment: # Expected environment:
# #
# BUILD_PLAT: output directory # BUILD_PLAT: output directory
# NEED_BL2: indicates whether BL2 is needed by the platform
# NEED_BL32: indicates whether BL32 is needed by the platform # NEED_BL32: indicates whether BL32 is needed by the platform
# BL2: image filename (optional). Default is IMG_BIN(2) (see macro IMG_BIN) # BL2: image filename (optional). Default is IMG_BIN(2) (see macro IMG_BIN)
# SCP_BL2: image filename (optional). Default is IMG_BIN(30) # SCP_BL2: image filename (optional). Default is IMG_BIN(30)
@ -67,8 +68,8 @@ $(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD
# Add the BL2 CoT (image cert) # Add the BL2 CoT (image cert)
ifeq (${NEED_BL2},yes)
ifeq (${BL2_AT_EL3}, 0) ifeq (${BL2_AT_EL3}, 0)
ifneq (${PLAT},fvp_r)
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) $(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert))
endif endif
endif endif