diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2023-05-03 15:47:45 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-05-03 15:47:45 +0200 |
| commit | 73ede2bf1914929f0842560f01b6d996d4196ef1 (patch) | |
| tree | 1ebc72a2830a5150712956cd6bea1fc28e6cd5b4 | |
| parent | f50107d3df52204af137c8e6e1eb9b768ab34da9 (diff) | |
| parent | 11ccf5d99a8248911ac2c13ab2e62802c64a3884 (diff) | |
| download | arm-trusted-firmware-73ede2bf1914929f0842560f01b6d996d4196ef1.tar.gz | |
Merge changes I92826714,I9431f9d1 into integration
* changes:
build(psci): move `runtime_errata.S` to PSCI
build: allow BL-specific includes/definitions
| -rw-r--r-- | lib/psci/aarch64/runtime_errata.S (renamed from lib/cpus/aarch64/runtime_errata.S) | 0 | ||||
| -rw-r--r-- | lib/psci/psci_lib.mk | 2 | ||||
| -rw-r--r-- | make_helpers/build_macros.mk | 15 |
3 files changed, 13 insertions, 4 deletions
diff --git a/lib/cpus/aarch64/runtime_errata.S b/lib/psci/aarch64/runtime_errata.S index 8d466914e..8d466914e 100644 --- a/lib/cpus/aarch64/runtime_errata.S +++ b/lib/psci/aarch64/runtime_errata.S diff --git a/lib/psci/psci_lib.mk b/lib/psci/psci_lib.mk index 6864202d8..c71580f95 100644 --- a/lib/psci/psci_lib.mk +++ b/lib/psci/psci_lib.mk @@ -22,7 +22,7 @@ PSCI_LIB_SOURCES := lib/el3_runtime/cpu_data_array.c \ ifeq (${ARCH}, aarch64) PSCI_LIB_SOURCES += lib/el3_runtime/aarch64/context.S \ - lib/cpus/aarch64/runtime_errata.S + lib/psci/aarch64/runtime_errata.S endif ifeq (${USE_COHERENT_MEM}, 1) diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 9ca6bdf0c..0c82a715a 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -326,7 +326,10 @@ define MAKE_C $(eval OBJ := $(1)/$(patsubst %.c,%.o,$(notdir $(2)))) $(eval DEP := $(patsubst %.o,%.d,$(OBJ))) -$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3))) + +$(eval BL_DEFINES := $($(call uppercase,$(3))_DEFINES)) +$(eval BL_INCLUDE_DIRS := $($(call uppercase,$(3))_INCLUDE_DIRS)) +$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3)) $(addprefix -D,$(BL_DEFINES)) $(addprefix -I,$(BL_INCLUDE_DIRS))) $(eval BL_CFLAGS := $($(call uppercase,$(3))_CFLAGS)) $(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | $(3)_dirs @@ -346,7 +349,10 @@ define MAKE_S $(eval OBJ := $(1)/$(patsubst %.S,%.o,$(notdir $(2)))) $(eval DEP := $(patsubst %.o,%.d,$(OBJ))) -$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3))) + +$(eval BL_DEFINES := $($(call uppercase,$(3))_DEFINES)) +$(eval BL_INCLUDE_DIRS := $($(call uppercase,$(3))_INCLUDE_DIRS)) +$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3)) $(addprefix -D,$(BL_DEFINES)) $(addprefix -I,$(BL_INCLUDE_DIRS))) $(eval BL_ASFLAGS := $($(call uppercase,$(3))_ASFLAGS)) $(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | $(3)_dirs @@ -365,7 +371,10 @@ endef define MAKE_LD $(eval DEP := $(1).d) -$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3))) + +$(eval BL_DEFINES := $($(call uppercase,$(3))_DEFINES)) +$(eval BL_INCLUDE_DIRS := $($(call uppercase,$(3))_INCLUDE_DIRS)) +$(eval BL_CPPFLAGS := $($(call uppercase,$(3))_CPPFLAGS) -DIMAGE_$(call uppercase,$(3)) $(addprefix -D,$(BL_DEFINES)) $(addprefix -I,$(BL_INCLUDE_DIRS))) $(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | $(3)_dirs $$(ECHO) " PP $$<" |