From 052ab529c4a02ee60974c20a1dd954238ec40c4c Mon Sep 17 00:00:00 2001 From: Evan Lloyd Date: Tue, 11 Apr 2017 16:52:00 +0100 Subject: [PATCH] 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 --- Makefile | 8 ++++---- make_helpers/build_macros.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d0568d91..984fbdae 100644 --- 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 cc513937..2cdbfa30 100644 --- 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) -- 2.30.2