commit a7492eebbc12a20b6c372b7d1fefcb621b0422a7
author Chris Kay <chris.kay@arm.com> Fri May 05 12:33:23 2023 +0200
committer Chris Kay <chris.kay@arm.com> Tue Aug 29 15:03:21 2023 +0200
tree 383c72434ad760f3c4c4641850964d0e345c1f3d
parent f581825a871c99f6c31adab9cdacf9e5501a408f

build: sort bootloader image sources

To avoid duplicate symbol errors when compiling bootloader images which
pull in the same source file multiple times, sort source files before
generating bootloader image build rules in order to remove duplicates.

Change-Id: I03a60d9f752f8fe85f17ec14e265fd4a6223de32
Signed-off-by: Chris Kay <chris.kay@arm.com>

make_helpers/build_macros.mk

diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
index f0219c7..a5c93a6 100644
--- a/make_helpers/build_macros.mk
+++ b/make_helpers/build_macros.mk
@@ -504,7 +504,7 @@
 define MAKE_BL
         $(eval BUILD_DIR  := ${BUILD_PLAT}/$(1))
         $(eval BL_SOURCES := $($(call uppercase,$(1))_SOURCES))
-        $(eval SOURCES    := $(BL_SOURCES) $(BL_COMMON_SOURCES) $(PLAT_BL_COMMON_SOURCES))
+        $(eval SOURCES    := $(sort $(BL_SOURCES) $(BL_COMMON_SOURCES) $(PLAT_BL_COMMON_SOURCES)))
         $(eval OBJS       := $(addprefix $(BUILD_DIR)/,$(call SOURCES_TO_OBJS,$(SOURCES))))
         $(eval MAPFILE    := $(call IMG_MAPFILE,$(1)))
         $(eval ELF        := $(call IMG_ELF,$(1)))