aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--projects/libhal-test/Makefile6
-rw-r--r--stm-fmc.h2
3 files changed, 6 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 5166b08..57ed42c 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ export CFLAGS
all: board-test cli-test libhal-test hsm
init:
- git submodule update --init --recursive
+ git submodule update --init --recursive --remote
$(MBED_DIR)/libstmf4.a:
$(MAKE) -C $(MBED_DIR)
@@ -108,7 +108,7 @@ $(MBED_DIR)/libstmf4.a:
board-test: $(BOARD_OBJS) $(LIBS)
$(MAKE) -C projects/board-test
-cli-test: $(BOARD_OBJS) $(LIBS)
+cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
$(MAKE) -C projects/cli-test
$(RTOS_DIR)/librtos.a:
@@ -133,9 +133,6 @@ libhal-test: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
hsm: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
$(MAKE) -C projects/hsm
-cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
- $(MAKE) -C projects/cli-test
-
# don't automatically delete objects, to avoid a lot of unnecessary rebuilding
.SECONDARY: $(BOARD_OBJS)
@@ -144,6 +141,7 @@ cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
clean:
rm -f $(BOARD_OBJS)
$(MAKE) -C projects/board-test clean
+ $(MAKE) -C projects/cli-test clean
$(MAKE) -C projects/rtos-test clean
$(MAKE) -C projects/libhal-test clean
$(MAKE) -C projects/hsm clean
diff --git a/projects/libhal-test/Makefile b/projects/libhal-test/Makefile
index b0def35..a380297 100644
--- a/projects/libhal-test/Makefile
+++ b/projects/libhal-test/Makefile
@@ -1,4 +1,4 @@
-TEST = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa
+TEST = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa test-mkmif
#TEST += test-rpc_hash test-rpc_pkey test-rpc_get_version test-rpc_get_random
TEST += test-rpc_server
@@ -16,9 +16,7 @@ vpath %.c $(LIBHAL_DIR)/tests $(LIBHAL_DIR)/utils
%.elf: %.mo main.o $(BOARD_OBJS) $(LIBC_OBJS) $(LIBS)
$(CC) $(CFLAGS) $^ -o $*.elf -T$(LDSCRIPT) -g -Wl,-Map=$*.map
- $(OBJCOPY) -O ihex $*.elf $*.hex
$(OBJCOPY) -O binary $*.elf $*.bin
- $(OBJDUMP) -St $*.elf >$*.lst
$(SIZE) $*.elf
# don't automatically delete objects, to avoid a lot of unnecessary rebuilding
@@ -27,7 +25,5 @@ vpath %.c $(LIBHAL_DIR)/tests $(LIBHAL_DIR)/utils
clean:
rm -f *.o *.mo
rm -f *.elf
- rm -f *.hex
rm -f *.bin
rm -f *.map
- rm -f *.lst
diff --git a/stm-fmc.h b/stm-fmc.h
index 1e6a670..8c37bd7 100644
--- a/stm-fmc.h
+++ b/stm-fmc.h
@@ -35,6 +35,8 @@
#ifndef __STM_FMC_H
#define __STM_FMC_H
+#include "stm32f4xx_hal.h"
+
#define FMC_FPGA_BASE_ADDR 0x60000000
#define FMC_FPGA_ADDR_MASK 0x03FFFFFC // there are 26 physical lines, but "only" 24 usable for now
#define FMC_FPGA_NWAIT_MAX_POLL_TICKS 10