Build: Correct Unix specific echo commands

Some recent changes have added direct use of the echo command without
parameters.  This fails on a Windows shell, because echo without
parameters reports the mode ("ECHO is on").
This is corrected using the ECHO_BLANK_LINE macro already provided
for that purpose.

Change-Id: I5fd7192861b4496f6f46b4f096e80a752cd135d6
Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>

diff --git a/Makefile b/Makefile
index d0568d9174f50fccc1aeb84932ee2bd17aed99df..984fbdae36041c7856b7c7a55a3d50c067a2d2ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -653,18 +653,18 @@ ${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
 ifneq (${GENERATE_COT},0)
 fwu_certificates: ${FWU_CRT_DEPS} ${CRTTOOL}
        ${Q}${CRTTOOL} ${FWU_CRT_ARGS}
-       @echo
+       @${ECHO_BLANK_LINE}
        @echo "Built $@ successfully"
        @echo "FWU certificates can be found in ${BUILD_PLAT}"
-       @echo
+       @${ECHO_BLANK_LINE}
 endif
 
 ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL}
        ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
        ${Q}${FIPTOOL} info $@
-       @echo
+       @${ECHO_BLANK_LINE}
        @echo "Built $@ successfully"
-       @echo
+       @${ECHO_BLANK_LINE}
 
 fiptool: ${FIPTOOL}
 fip: ${BUILD_PLAT}/${FIP_NAME}

diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
index cc51393787bc032055d33d45352f66733902e669..2cdbfa30029f37e5be9b4724344337b5b0f5bf00 100644 (file)
--- a/make_helpers/build_macros.mk
+++ b/make_helpers/build_macros.mk
@@ -347,9 +347,9 @@ $(DUMP): $(ELF)
 $(BIN): $(ELF)
        @echo "  BIN     $$@"
        $$(Q)$$(OC) -O binary $$< $$@
-       @echo
+       @${ECHO_BLANK_LINE}
        @echo "Built $$@ successfully"
-       @echo
+       @${ECHO_BLANK_LINE}
 
 .PHONY: bl$(1)
 bl$(1): $(BIN) $(DUMP)