diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2016-06-16 16:17:20 +0200 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2016-06-16 16:17:20 +0200 |
| commit | b61dc669d8b01b49b3a5eb5b494d4270bb4c1b0b (patch) | |
| tree | d888d6c2453d9da7df27db96a4df54d58d2431bd /projects/cli-test | |
| parent | bba436de5395bda8c83a31720a4243eba2646086 (diff) | |
| parent | e961e9818193acbb18c503830a554e52285e096b (diff) | |
Merge branch 'master' into ft-ks_flash
Diffstat (limited to 'projects/cli-test')
| -rw-r--r-- | projects/cli-test/Makefile | 25 | ||||
| -rw-r--r-- | projects/cli-test/cli-test.c | 1 |
2 files changed, 22 insertions, 4 deletions
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile index cc1a281..e043566 100644 --- a/projects/cli-test/Makefile +++ b/projects/cli-test/Makefile @@ -1,10 +1,27 @@ TEST = cli-test -OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c mgmt-keystore.c +OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c -CFLAGS += -I$(LIBCLI_DIR) -I$(LIBHAL_DIR) -LIBS += $(LIBCLI_DIR)/libcli.a -LIBS += $(LIBHAL_DIR)/libhal.a +BOARD_OBJS = \ + $(TOPLEVEL)/stm-init.o \ + $(TOPLEVEL)/stm-fmc.o \ + $(TOPLEVEL)/stm-uart.o \ + $(TOPLEVEL)/syscalls.o \ + $(TOPLEVEL)/stm-rtc.o \ + $(TOPLEVEL)/spiflash_n25q128.o \ + $(TOPLEVEL)/stm-fpgacfg.o \ + $(TOPLEVEL)/stm-keystore.o \ + $(TOPLEVEL)/stm-sdram.o \ + $(TOPLEVEL)/stm-flash.o \ + $(BOARD_DIR)/TOOLCHAIN_GCC_ARM/startup_stm32f429xx_rtos.o \ + $(BOARD_DIR)/system_stm32f4xx.o \ + $(BOARD_DIR)/stm32f4xx_hal_msp.o \ + $(BOARD_DIR)/stm32f4xx_it_rtos.o + +CFLAGS += -I$(LIBCLI_DIR) +CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M + +LIBS += $(LIBCLI_DIR)/libcli.a $(RTOS_DIR)/librtos.a all: $(TEST:=.elf) diff --git a/projects/cli-test/cli-test.c b/projects/cli-test/cli-test.c index a387751..10b31a4 100644 --- a/projects/cli-test/cli-test.c +++ b/projects/cli-test/cli-test.c @@ -43,6 +43,7 @@ #include "mgmt-keystore.h" #include <string.h> +#include <strings.h> /* MGMT UART interrupt receive buffer (data will be put in a larger ring buffer) */ |