Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 22:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "macro-cleanup" into integration

Browse source 
* changes:
  plat: remove redundant =1 from -D option
  Pass more -D options to BL*_CPPFLAGS instead of BL*_CFLAGS
This commit is contained in:
Mark Dykes 2020-04-02 21:54:17 +00:00 • committed by TrustedFirmware Code Review
commit cb2e35b58a
6 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -547,15 +547,15 @@ endif
endif endif
ifeq (${ARCH},aarch64) ifeq (${ARCH},aarch64)
BL1_CFLAGS += -DIMAGE_AT_EL3 BL1_CPPFLAGS += -DIMAGE_AT_EL3
ifeq ($(BL2_AT_EL3),1) ifeq ($(BL2_AT_EL3),1)
BL2_CFLAGS += -DIMAGE_AT_EL3 BL2_CPPFLAGS += -DIMAGE_AT_EL3
else else
BL2_CFLAGS += -DIMAGE_AT_EL1 BL2_CPPFLAGS += -DIMAGE_AT_EL1
endif endif
BL2U_CFLAGS += -DIMAGE_AT_EL1 BL2U_CPPFLAGS += -DIMAGE_AT_EL1
BL31_CFLAGS += -DIMAGE_AT_EL3 BL31_CPPFLAGS += -DIMAGE_AT_EL3
BL32_CFLAGS += -DIMAGE_AT_EL1 BL32_CPPFLAGS += -DIMAGE_AT_EL1
endif endif
# Include the CPU specific operations makefile, which provides default # Include the CPU specific operations makefile, which provides default

4
include/lib/cpus/aarch64/cpu_macros.S
View file

@ -25,10 +25,6 @@
/* Word size for 64-bit CPUs */ /* Word size for 64-bit CPUs */
#define CPU_WORD_SIZE 8 #define CPU_WORD_SIZE 8
#if defined(IMAGE_BL1) || defined(IMAGE_BL31) ||(defined(IMAGE_BL2) && BL2_AT_EL3)
#define IMAGE_AT_EL3
#endif
/* /*
* Whether errata status needs reporting. Errata status is printed in debug * Whether errata status needs reporting. Errata status is printed in debug
* builds for both BL1 and BL31 images. * builds for both BL1 and BL31 images.

14
plat/arm/board/fvp/platform.mk
View file

@ -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_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL32_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
endif endif
else # AArch64 else # AArch64
ifeq (${RESET_TO_BL31},1) ifeq (${RESET_TO_BL31},1)
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
endif endif
ifeq (${SPD},trusty) ifeq (${SPD},trusty)
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
endif endif
endif endif
ifeq (${ALLOW_RO_XLAT_TABLES}, 1) ifeq (${ALLOW_RO_XLAT_TABLES}, 1)
ifeq (${ARCH},aarch32) ifeq (${ARCH},aarch32)
BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
else # AArch64 else # AArch64
BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
ifeq (${SPD},tspd) ifeq (${SPD},tspd)
BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
endif endif
endif endif
endif endif
ifeq (${USE_DEBUGFS},1) ifeq (${USE_DEBUGFS},1)
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
endif endif
# Add support for platform supplied linker script for BL31 build # Add support for platform supplied linker script for BL31 build

8
plat/arm/board/juno/platform.mk
View file

@ -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_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL32_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
endif endif
else else
ifeq (${RESET_TO_BL31},1) ifeq (${RESET_TO_BL31},1)
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
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_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
else else
BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
endif endif
endif endif

2
plat/arm/board/rdn1edge/platform.mk
View file

@ -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_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
# 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

4
plat/socionext/uniphier/platform.mk
View file

@ -17,8 +17,8 @@ override ENABLE_PIE := 1
ALLOW_RO_XLAT_TABLES := 1 ALLOW_RO_XLAT_TABLES := 1
ifeq ($(ALLOW_RO_XLAT_TABLES),1) ifeq ($(ALLOW_RO_XLAT_TABLES),1)
BL31_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
BL32_CFLAGS += -DPLAT_RO_XLAT_TABLES=1 BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES
endif endif
# Cortex-A53 revision r0p4-51rel0 # Cortex-A53 revision r0p4-51rel0