From d41224076057a6117eb96d19037655c416b2fea4 Mon Sep 17 00:00:00 2001 From: Brian Pow Date: Sun, 4 Feb 2018 21:54:35 +0800 Subject: [PATCH 1/2] added 'make mfkey' and 'make nonce2key', 'make all' now builds mfkey and nonce2key --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 54518020b..e61006b71 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,13 @@ FLASH_PORT=com3 PATHSEP=\\# endif -all clean: %: client/% bootrom/% armsrc/% recovery/% +all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/% + +mfkey/%: FORCE + $(MAKE) -C tools/mfkey $(patsubst mfkey/%,%,$@) + +nonce2key/%: FORCE + $(MAKE) -C tools/nonce2key $(patsubst nonce2key/%,%,$@) bootrom/%: FORCE $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@) @@ -45,8 +51,10 @@ help: @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 - + client: client/all flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL) From 05f4a817824677a3932057e86eef9865d0f1e02a Mon Sep 17 00:00:00 2001 From: Brian Pow Date: Sun, 4 Feb 2018 22:00:24 +0800 Subject: [PATCH 2/2] FIX: craptev1-v1.1.tar.xz and crapto1-v3.3.tar.xz will be redownloaded even it exists --- tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 7f06d6726..e193b776c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,10 @@ get_craptev1: # wget http://crapto1.netgarage.org/craptev1-v1.0.tar.xz - wget http://crapto1.netgarage.org/craptev1-v1.1.tar.xz + wget -N http://crapto1.netgarage.org/craptev1-v1.1.tar.xz tar Jxvf craptev1-v1.1.tar.xz get_crapto1: - wget http://crapto1.netgarage.org/crapto1-v3.3.tar.xz + wget -N http://crapto1.netgarage.org/crapto1-v3.3.tar.xz mkdir crapto1-v3.3 tar Jxvf crapto1-v3.3.tar.xz -C crapto1-v3.3