Platforms cannot override ENABLE_STACK_PROTECTOR
Include stack_protector's makefile after including platform.mk to allow platforms override ENABLE_STACK_PROTECTOR Fixes ARM-software/tf-issues#567 Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
This commit is contained in:
parent
fb45044bc5
commit
46e5e035ab
13
Makefile
13
Makefile
|
@ -274,13 +274,6 @@ endif
|
||||||
# over the sources.
|
# over the sources.
|
||||||
endif
|
endif
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Include libraries' Makefile that are used in all BL
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
include lib/stack_protector/stack_protector.mk
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Include the platform specific Makefile after the SPD Makefile (the platform
|
# Include the platform specific Makefile after the SPD Makefile (the platform
|
||||||
# makefile may use all previous definitions in this file)
|
# makefile may use all previous definitions in this file)
|
||||||
|
@ -440,6 +433,12 @@ ifneq (${FIP_ALIGN},0)
|
||||||
FIP_ARGS += --align ${FIP_ALIGN}
|
FIP_ARGS += --align ${FIP_ALIGN}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# Include libraries' Makefile that are used in all BL
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
include lib/stack_protector/stack_protector.mk
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Auxiliary tools (fiptool, cert_create, etc)
|
# Auxiliary tools (fiptool, cert_create, etc)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
Loading…
Reference in New Issue