summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2026-09-07 21:33:45 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2026-09-07 21:33:45 +0000
commit38269bb73d34b4a31100adf208a27e4c28e7d611 (patch)
tree0d383dafca63c22ef6cc475ce347a76c641cca50 /Makefile
parent58f4fe3a0b8b97fd097aff2ec884cc77ac535650 (diff)
parentd7135a7214e49c6364ba518cdac343aa595a8db8 (diff)
downloadarm-trusted-firmware-master.tar.gz
arm-trusted-firmware-master.zip
Merge changes I716e0539,I6c327584,I38509b94,I5ff3c402,I44591e4b, ... into integrationHEADmaster
* changes: feat(st): enable some warning flags feat(build): enable -Wundef for C files if W >= 1 refactor(zlib): move zlib to a lib refactor(compiler-rt): move compiler_rt to a lib feat(build): introduce BL_FLAGS fix(st-usb): staticize dwc3_dev_init fix(st): staticize verify_signature fix(stm32mp1): manage all flags for PKA algos refactor(st-clock): remove STM32MP_M33_TDCID flag fix(xlat): check definition of PLAT_XLAT_TABLES_DYNAMIC flag fix(el3-runtime): add some missing prototypes fix(scmi): remove scmi_msg_get_voltage_handler fix(io): correct SIZE_MAX management fix(libc): define __BSD_VISIBLE to 0 fix(build): move FIRME_SUPPORT flags to Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0e6209618..67defe4d1 100644
--- a/Makefile
+++ b/Makefile
@@ -169,8 +169,6 @@ endif
################################################################################
# Common sources and include directories
################################################################################
-include lib/compiler-rt/compiler-rt.mk
-
# Allow overriding the timestamp, for example for reproducible builds, or to
# synchronize timestamps across multiple projects.
# This must be set to a C string (including quotes where applicable).
@@ -191,8 +189,7 @@ BL_COMMON_SOURCES += common/bl_common.c \
plat/common/plat_bl_common.c \
plat/common/plat_log_common.c \
plat/common/${ARCH}/plat_common.c \
- plat/common/${ARCH}/platform_helpers.S \
- ${COMPILER_RT_SRCS}
+ plat/common/${ARCH}/platform_helpers.S
ifeq ($($(ARCH)-cc-id),arm-clang)
BL_COMMON_SOURCES += lib/${ARCH}/armclang_printf.S
@@ -668,6 +665,8 @@ $(call assert_booleans,\
TEST_IO_SHORT_READ_FI \
SDEI_SUPPORT \
SMC_PCI_SUPPORT \
+ FIRME_SUPPORT \
+ FIRME_SUPPORT_IDE_KM \
))
# Numeric_Flags
@@ -960,6 +959,8 @@ $(call add_defines,\
SDEI_SUPPORT \
USE_GIC_DRIVER \
SMC_PCI_SUPPORT \
+ FIRME_SUPPORT \
+ FIRME_SUPPORT_IDE_KM \
))
ifeq (${PLATFORM_REPORT_CTX_MEM_USE}, 1)
@@ -1013,6 +1014,12 @@ endif #(SPD)
include ${MAKE_HELPERS_DIRECTORY}cflags.mk
################################################################################
+# Include compiler-rt. It is built with MAKE_LIB so it must be included after
+# some macros are defined, especially BUILD_PLAT
+################################################################################
+include lib/compiler-rt/compiler-rt.mk
+
+################################################################################
# Build targets
################################################################################