From 9f9ee2f1fd806ba4972e1c780e3784cc8728f622 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sat, 16 Mar 2019 11:22:36 +0100
Subject: [PATCH 1/3] Update ntag_3d.lua

---
 client/scripts/ntag_3d.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 2f08aac85..abbfe5946 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -20,7 +20,7 @@ example =[[
      script run ntag_3d -u 11223344556677 -c 46 -m 50 -p 5448 -s 4555  -l 200 -1
 ]]
 usage = [[
-script run calc_ntag_3d -h -t -u <uid> -c <color> -m <material> -p <region> -s <region> -l <length>
+script run ntag_3d -h -t -u <uid> -c <color> -m <material> -p <region> -s <region> -l <length>
 
 Arguments:
     -h             : this help

From d447fb838fc146b386e4e94d3f85d203b50bc774 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 17 Mar 2019 00:02:58 +0100
Subject: [PATCH 2/3] global makefile: cleanup targets

---
 Makefile | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 6e7c9abd5..327d1ab6d 100644
--- a/Makefile
+++ b/Makefile
@@ -56,22 +56,40 @@ recovery/%: FORCE
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test flash-bootrom flash-os flash-all style FORCE
+.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style FORCE
 
 help:
-	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
-	@echo Possible targets:
-	@echo + all           - Make bootrom, armsrc and the OS-specific host directory
-	@echo + client        - Make only the OS-specific host directory
-	@echo + flash-bootrom - Make bootrom and flash it
-	@echo + flash-os      - Make armsrc and flash os \(includes fpga\)
-	@echo + flash-all     - Make bootrom and armsrc and flash bootrom and os image
-	@echo + mfkey         - Make tools/mfkey
-	@echo + nounce2key    - Make tools/nounce2key
-	@echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
+	@echo "Multi-OS Makefile"
+	@echo
+	@echo "Possible targets:"
+	@echo "+ all           - Make all targets: bootrom, armsrc and OS-specific host tools"
+	@echo "+ clean         - Clean in all targets"
+	@echo
+	@echo "+ bootrom       - Make bootrom"
+	@echo "+ os            - Make armsrc \(includes fpga\)"
+	@echo "+ flash-bootrom - Make bootrom and flash it"
+	@echo "+ flash-os      - Make armsrc and flash os image \(includes fpga\)"
+	@echo "+ flash-all     - Make bootrom and armsrc and flash bootrom and os image"
+	@echo "+ recovery      - Make bootrom and armsrc images for JTAG flashing"
+	@echo
+	@echo "+ client        - Make only the OS-specific host client"
+	@echo "+ mfkey         - Make tools/mfkey"
+	@echo "+ nounce2key    - Make tools/nounce2key"
+	@echo
+	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
 
 client: client/all
 
+bootrom: bootrom/all
+
+os: armsrc/all
+
+recovery: recovery/all
+
+mfkey: mfkey/all
+
+nonce2key: nonce2key/all
+
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
 	$(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
 

From fd3d4925a2784eb48d007153ec320396374fc040 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 17 Mar 2019 00:03:22 +0100
Subject: [PATCH 3/3] mfkey: fix file modes

---
 tools/mfkey/Makefile  | 0
 tools/mfkey/crapto1.c | 0
 tools/mfkey/crapto1.h | 0
 tools/mfkey/crypto1.c | 0
 tools/mfkey/mfkey32.c | 0
 tools/mfkey/mfkey64.c | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tools/mfkey/Makefile
 mode change 100755 => 100644 tools/mfkey/crapto1.c
 mode change 100755 => 100644 tools/mfkey/crapto1.h
 mode change 100755 => 100644 tools/mfkey/crypto1.c
 mode change 100755 => 100644 tools/mfkey/mfkey32.c
 mode change 100755 => 100644 tools/mfkey/mfkey64.c

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
old mode 100755
new mode 100644