Skip to content

GitLab

Commit 4ed750a4 authored by Mark Dykes's avatar Mark Dykes Committed by TrustedFirmware Code Review
Browse files

Merge "plat: pass -D option to BL*_CPPFLAGS instead of BL*_CFLAGS" into integration

parents f80f2d1c 11a3c5ee
Hide whitespace changes
Inline Side-by-side
plat/arm/board/fvp/platform.mk
View file @ 4ed750a4
...@@ -297,30 +297,30 @@ endif ...@@ -297,30 +297,30 @@ endif
# Enable the dynamic translation tables library. # Enable the dynamic translation tables library.
ifeq (${ARCH},aarch32) ifeq (${ARCH},aarch32)
ifeq (${RESET_TO_SP_MIN},1) ifeq (${RESET_TO_SP_MIN},1)
BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL32_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
else # AArch64 else # AArch64
ifeq (${RESET_TO_BL31},1) ifeq (${RESET_TO_BL31},1)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
ifeq (${SPD},trusty) ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
endif endif
ifeq (${ALLOW_RO_XLAT_TABLES}, 1) ifeq (${ALLOW_RO_XLAT_TABLES}, 1)
ifeq (${ARCH},aarch32) ifeq (${ARCH},aarch32)
BL32_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
else # AArch64 else # AArch64
BL31_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
ifeq (${SPD},tspd) ifeq (${SPD},tspd)
BL32_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
endif endif
endif endif
endif endif
ifeq (${USE_DEBUGFS},1) ifeq (${USE_DEBUGFS},1)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
# Add support for platform supplied linker script for BL31 build # Add support for platform supplied linker script for BL31 build
......
plat/arm/board/juno/platform.mk
View file @ 4ed750a4
...@@ -147,19 +147,19 @@ ENABLE_SVE_FOR_NS := 0 ...@@ -147,19 +147,19 @@ ENABLE_SVE_FOR_NS := 0
# Enable the dynamic translation tables library. # Enable the dynamic translation tables library.
ifeq (${ARCH},aarch32) ifeq (${ARCH},aarch32)
ifeq (${RESET_TO_SP_MIN},1) ifeq (${RESET_TO_SP_MIN},1)
BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL32_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
else else
ifeq (${RESET_TO_BL31},1) ifeq (${RESET_TO_BL31},1)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
endif endif
ifeq (${ALLOW_RO_XLAT_TABLES}, 1) ifeq (${ALLOW_RO_XLAT_TABLES}, 1)
ifeq (${JUNO_AARCH32_EL3_RUNTIME}, 1) ifeq (${JUNO_AARCH32_EL3_RUNTIME}, 1)
BL32_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
else else
BL31_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
endif endif
endif endif
......
plat/arm/board/rdn1edge/platform.mk
View file @ 4ed750a4
...@@ -38,7 +38,7 @@ BL2_SOURCES += ${RDN1EDGE_BASE}/rdn1edge_trusted_boot.c ...@@ -38,7 +38,7 @@ BL2_SOURCES += ${RDN1EDGE_BASE}/rdn1edge_trusted_boot.c
endif endif
# Enable dynamic addition of MMAP regions in BL31 # Enable dynamic addition of MMAP regions in BL31
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
# Add the FDT_SOURCES and options for Dynamic Config # Add the FDT_SOURCES and options for Dynamic Config
FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_fw_config.dts FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_fw_config.dts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment