refactor(Makefile): move NEED_<IMAGE> before their use
In later patch tbbr_tools.mk requires NEED_BL2 definition which is defined after inclusion of this mk file. Move NEED_<IMAGE> definitions earlier to their use Signed-off-by: Manish Pandey <manish.pandey2@arm.com> Change-Id: Ieff999b255690755779d0cd35d5aba2d3794873c
This commit is contained in:
parent
de278f333b
commit
5f24ce968e
36
Makefile
36
Makefile
|
@ -776,10 +776,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
|
||||||
|
@ -794,6 +800,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
|
||||||
|
@ -831,6 +841,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
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -874,30 +888,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
|
||||||
|
|
Loading…
Reference in New Issue