diff options
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/build_macros.mk | 3 | ||||
| -rw-r--r-- | make_helpers/defaults.mk | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 44c537b4..28ce2a4b 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -252,10 +252,11 @@ endef define MAKE_LD $(eval DEP := $(1).d) +$(eval IMAGE := IMAGE_BL$(call uppercase,$(3))) $(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs @echo " PP $$<" - $$(Q)$$(CPP) $$(CPPFLAGS) -P -D__ASSEMBLY__ -D__LINKER__ $(MAKE_DEP) -o $$@ $$< + $$(Q)$$(CPP) $$(CPPFLAGS) -P -D__ASSEMBLY__ -D__LINKER__ $(MAKE_DEP) -D$(IMAGE) -o $$@ $$< -include $(DEP) diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index 908da221..435de20e 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -23,10 +23,6 @@ ARCH := aarch64 ARM_ARCH_MAJOR := 8 ARM_ARCH_MINOR := 0 -# Determine the version of ARM GIC architecture to use for interrupt management -# in EL3. The platform port can change this value if needed. -ARM_GIC_ARCH := 2 - # Base commit to perform code check on BASE_COMMIT := origin/master @@ -116,9 +112,6 @@ HW_ASSISTED_COHERENCY := 0 # Set the default algorithm for the generation of Trusted Board Boot keys KEY_ALG := rsa -# Flag to enable new version of image loading -LOAD_IMAGE_V2 := 0 - # Enable use of the console API allowing multiple consoles to be registered # at the same time. MULTI_CONSOLE_API := 0 @@ -153,6 +146,10 @@ SDEI_SUPPORT := 0 # platform Makefile is free to override this value. SEPARATE_CODE_AND_RODATA := 0 +# If the BL31 image initialisation code is recalimed after use for the secondary +# cores stack +RECLAIM_INIT_CODE := 0 + # Default to SMCCC Version 1.X SMCCC_MAJOR_VERSION := 1 @@ -169,14 +166,14 @@ SPIN_ON_BL1_EXIT := 0 # Flags to build TF with Trusted Boot support TRUSTED_BOARD_BOOT := 0 -# Build option to choose whether Trusted firmware uses Coherent memory or not. +# Build option to choose whether Trusted Firmware uses Coherent memory or not. USE_COHERENT_MEM := 1 -# Build option to choose wheter Trusted firmware uses library at ROM -USE_ROMLIB := 0 +# Build option to choose whether Trusted Firmware uses library at ROM +USE_ROMLIB := 0 # Use tbbr_oid.h instead of platform_oid.h -USE_TBBR_DEFS = $(ERROR_DEPRECATED) +USE_TBBR_DEFS := 1 # Build verbosity V := 0 |