From e7646781e426ea4419fdd40705d7c6eed274fbc9 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 7 Nov 2017 12:44:38 +0100
Subject: [PATCH] make: mcuboot: prefix mcuboot make targets

---
 makefiles/mcuboot.mk    | 14 +++++++-------
 tests/mcuboot/README.md |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/makefiles/mcuboot.mk b/makefiles/mcuboot.mk
index 25eeb786c7..bc9cda2f27 100644
--- a/makefiles/mcuboot.mk
+++ b/makefiles/mcuboot.mk
@@ -13,7 +13,7 @@ MCUBOOT_BIN_MD5 ?= 0c71a0589bd3709fc2d90f07a0035ce7
 
 export IMAGE_HDR_SIZE ?= 512
 
-create-key: $(MCUBOOT_KEYFILE)
+mcuboot-create-key: $(MCUBOOT_KEYFILE)
 
 ifeq ($(BINDIR)/key.pem,$(MCUBOOT_KEYFILE))
 $(MCUBOOT_KEYFILE):
@@ -21,7 +21,7 @@ $(MCUBOOT_KEYFILE):
 	$(Q)$(IMGTOOL) keygen -k $@ -t rsa-2048
 endif
 
-mcuboot: create-key link
+mcuboot: mcuboot-create-key link
 	@$(COLOR_ECHO)
 	@$(COLOR_ECHO) '${COLOR_PURPLE}Re-linking for MCUBoot at $(SLOT0_SIZE)...${COLOR_RESET}'
 	@$(COLOR_ECHO)
@@ -39,14 +39,14 @@ mcuboot: create-key link
 $(MCUBOOT_BIN):
 	$(Q)$(DLCACHE) $(MCUBOOT_BIN_URL) $(MCUBOOT_BIN_MD5) $@
 
-.PHONY: flash-bootloader flash-mcuboot
+.PHONY: mcuboot-flash-bootloader mcuboot-flash
 
-flash-bootloader: HEXFILE = $(MCUBOOT_BIN)
-flash-bootloader: $(MCUBOOT_BIN) $(FLASHDEPS)
+mcuboot-flash-bootloader: HEXFILE = $(MCUBOOT_BIN)
+mcuboot-flash-bootloader: $(MCUBOOT_BIN) $(FLASHDEPS)
 	FLASH_ADDR=0x0 $(FLASHER) $(FFLAGS)
 
-flash-mcuboot: HEXFILE = $(SIGN_BINFILE)
-flash-mcuboot: mcuboot $(FLASHDEPS) flash-bootloader
+mcuboot-flash: HEXFILE = $(SIGN_BINFILE)
+mcuboot-flash: mcuboot $(FLASHDEPS) mcuboot-flash-bootloader
 	FLASH_ADDR=$(SLOT0_SIZE) $(FLASHER) $(FFLAGS)
 
 else
diff --git a/tests/mcuboot/README.md b/tests/mcuboot/README.md
index 08c69df7f5..61e5672e57 100644
--- a/tests/mcuboot/README.md
+++ b/tests/mcuboot/README.md
@@ -26,7 +26,7 @@ pip3 install --user pycrypto ecdsa pyasn1
 ```
 
 This test can be called using `make mcuboot` to produce such ELF file,
-which can also be flashed using `make flash-mcuboot`.This command also flashes
+which can also be flashed using `make mcuboot-flash`.This command also flashes
 the pre-compiled bootloader.
 
 It's also possible to build and flash MCUBoot by following the instructions on