Minor fixes from code review

Author: danielinux

src/libwolfboot.c

@@ -46,7 +46,10 @@
 
 #define NVM_CACHE_SIZE WOLFBOOT_SECTOR_SIZE
 
+#ifdef EXT_FLASH
 static uint32_t ext_cache;
+#endif
+
 static const uint32_t wolfboot_magic_trail = WOLFBOOT_MAGIC_TRAIL;
 
 

tools/test-enc.mk

@@ -1,11 +1,20 @@
 ENC_TEST_UPDATE_VERSION?=2
 KEYGEN_TOOL=python3 ./tools/keytools/keygen.py
-SIGN_TOOL=python3 ./tools/keytools/sign.py
 SIGN_ARGS+=--ecc256 --encrypt /tmp/enc_key.der
 SIGN_ENC_ARGS+=--ecc256 --encrypt /tmp/enc_key.der
 USBTTY?=/dev/ttyACM0
 TIMEOUT?=60
 
+ifneq ("$(wildcard ./tools/keytools/sign)","")
+    SIGN_TOOL=./tools/keytools/sign
+else
+    ifneq ("$(wildcard ./tools/keytools/sign.exe)","")
+        SIGN_TOOL=./tools/keytools/sign.exe
+    else
+        SIGN_TOOL=python3 ./tools/keytools/sign.py
+    endif
+endif
+
 .config:
 	@rm -f $@
 	@echo [CONFIG]

tools/uart-flash-server/Makefile

@@ -1,5 +1,5 @@
 CC=$(CROSS_COMPILE)gcc
-CFLAGS=-Wall -DWOLFSSL_DTLS -DWOLFSSL_DEBUG -DTFM_TIMING_RESISTANT -DWOLFBOOT_SIGN_ECC256 -DWOLFBOOT_HASH_SHA256 -g -ggdb -I../../include -I../../hal -Wextra
+CFLAGS=-Wall -DWOLFSSL_DEBUG -DTFM_TIMING_RESISTANT -DWOLFBOOT_SIGN_ECC256 -DWOLFBOOT_HASH_SHA256 -g -ggdb -I../../include -I../../hal -Wextra
 
 EXE=ufserver
 

tools/uart-flash-server/ufserver.c

@@ -161,8 +161,8 @@ static int serial_open(const char *device, int rate)
 
 	fcntl(fd, F_SETFL, 0);
 	tcgetattr(fd, &options);
-	cfsetispeed(&options, speed ?: B460800);
-	cfsetospeed(&options, speed ?: B460800);
+	cfsetispeed(&options, speed ?: 460800);
+	cfsetospeed(&options, speed ?: 460800);
 	cfmakeraw(&options);
 	options.c_cflag |= (CLOCAL | CREAD);
 	options.c_cflag &= ~CRTSCTS;