From f7b41f06526695fb1813314cbceff3764a12f5f4 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 3 Jun 2019 21:01:32 +0000
Subject: [PATCH] mcu-flash.mk: Work around broken clean target

If MCU_BOARD_LC is empty, rm $(MCU_MEM|FLASH_FETCH_FILE_BIN) fails with unknown options.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/mcu-flash.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/make/mcu-flash.mk b/make/mcu-flash.mk
index 40fd4354..5803ff83 100644
--- a/make/mcu-flash.mk
+++ b/make/mcu-flash.mk
@@ -6,27 +6,27 @@ flash-fetch: $(MCU_FLASH_FETCH_FILE_HEX)
 flash-fetch-mem: $(MCU_MEM_FETCH_FILE_HEX)
 clean: flash-clean-fetch
 flash-clean-fetch:
-	rm -f $(MCU_FLASH_FETCH_FILE_BIN) $(MCU_FLASH_FETCH_FILE_HEX) *.tmp
-	rm -f $(MCU_MEM_FETCH_FILE_BIN) $(MCU_MEM_FETCH_FILE_HEX)
+	$(RM) -f -- $(MCU_FLASH_FETCH_FILE_BIN) $(MCU_FLASH_FETCH_FILE_HEX) *.tmp
+	$(RM) -f -- $(MCU_MEM_FETCH_FILE_BIN) $(MCU_MEM_FETCH_FILE_HEX)
 flash-clean-push:
-	rm -f $(MCU_FLASH_PUSH_FILE_BIN) $(MCU_FLASH_PUSH_FILE_HEX) *.tmp
-	rm -f $(MCU_MEM_PUSH_FILE_BIN) $(MCU_MEM_PUSH_FILE_HEX)
+	$(RM) -f -- $(MCU_FLASH_PUSH_FILE_BIN) $(MCU_FLASH_PUSH_FILE_HEX) *.tmp
+	$(RM) -f -- $(MCU_MEM_PUSH_FILE_BIN) $(MCU_MEM_PUSH_FILE_HEX)
 flash-clean: flash-clean-fetch flash-clean-push
 $(MCU_FLASH_FETCH_FILE_BIN):
 	$(TIME) $(MCU_OPENOCD) -c "init" -c "reset init" -c "flash read_bank $(MCU_FLASH_FETCH_BANK) $@.tmp $(MCU_FLASH_FETCH_OFFSET) $(MCU_FLASH_FETCH_SIZE)" -c "exit"
-	mv $@.tmp $@
+	$(MV) $@.tmp $@
 $(MCU_MEM_FETCH_FILE_BIN):
 	$(MCU_OPENOCD) -c "init" -c "reset init" -c "dump_image $@.tmp $(MCU_MEM_FETCH_OFFSET) $(MCU_MEM_FETCH_SIZE)" -c "exit"
-	mv $@.tmp $@
+	$(MV) $@.tmp $@
 %.hex: %.elf
 	$(OBJCOPY) -O ihex $< $@.tmp
-	mv $@.tmp $@
+	$(MV) $@.tmp $@
 clean: flash-clean-hex
 flash-clean-hex:
-	rm -rf $(MCU_FLASH_PUSH_FILE_HEX)
+	$(RM) -rf $(MCU_FLASH_PUSH_FILE_HEX)
 %.hex: %.bin
 	$(OBJCOPY) $(MCU_OBJCOPY_FETCH_OPTS) -I binary -O ihex $< $@.tmp
-	mv $@.tmp $@
+	$(MV) $@.tmp $@
 flash-push: $(MCU_FLASH_PUSH_FILE_HEX)
 	# see http://openocd.org/doc/html/Flash-Programming.html
 	$(TIME) $(MCU_OPENOCD) -c "program $< verify reset exit $(MCU_FLASH_PUSH_OFFSET)"