stm32mp1: use ASFLAGS for binary paths

To simplify the rule that creates the concatenated binary, use ASFLAGS
instead of adding all paths in the AS command line. This allows a better
management if a binary is not present.

Change-Id: Ic8b4566e7dedc6f55be355a92e3b214cef138d9b
Signed-off-by: Yann Gautier <yann.gautier@st.com>

diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk
index 16c4b1cf26deda5437e5354afe4a679f50f3cc69..54f832a34752662b774fb4700f69081c4d523505 100644 (file)
--- a/plat/st/stm32mp1/platform.mk
+++ b/plat/st/stm32mp1/platform.mk
@@ -179,10 +179,11 @@ STM32IMAGE                ?= ${STM32IMAGEPATH}/stm32image${BIN_EXT}
 
 all: check_dtc_version ${STM32_TF_STM32} stm32image
 
+ASFLAGS                        += -DBL2_BIN_PATH=\"${BUILD_PLAT}/bl2.bin\"
 ifeq ($(AARCH32_SP),sp_min)
 # BL32 is built only if using SP_MIN
 BL32_DEP               := bl32
-BL32_PATH              := -DBL32_BIN_PATH=\"${BUILD_PLAT}/bl32.bin\"
+ASFLAGS                        += -DBL32_BIN_PATH=\"${BUILD_PLAT}/bl32.bin\"
 endif
 
 distclean realclean clean: clean_stm32image
@@ -205,8 +206,6 @@ check_dtc_version:
 ${BUILD_PLAT}/stm32mp1-%.o:    ${BUILD_PLAT}/fdts/%.dtb plat/st/stm32mp1/stm32mp1.S bl2 ${BL32_DEP}
                        @echo "  AS      stm32mp1.S"
                        ${Q}${AS} ${ASFLAGS} ${TF_CFLAGS} \
-                               ${BL32_PATH} \
-                               -DBL2_BIN_PATH=\"${BUILD_PLAT}/bl2.bin\" \
                                -DDTB_BIN_PATH=\"$<\" \
                                -c plat/st/stm32mp1/stm32mp1.S -o $@