From 5a0c56d9b4d7076ddf8ed762c22519290de3f998 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Thu, 9 Jun 2016 11:47:00 -0400
Subject: Rename main.c to hsm.c for consistency and a slightly simpler
 Makefile.

---
 projects/hsm/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'projects/hsm/Makefile')

diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index f5546d8..d8fd1f9 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -1,8 +1,7 @@
 PROJ = hsm
 
-SRCS = main.c
-
-OBJS = $(SRCS:.c=.o)
+# objs in addition to $(PROJ).o
+OBJS = 
 
 CFLAGS += -I $(LIBHAL_DIR)
 
@@ -10,10 +9,10 @@ LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
 
 all: $(PROJ:=.elf)
 
-$(PROJ).elf: $(OBJS) $(BOARD_OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$(PROJ).map
-	$(OBJCOPY) -O binary $(PROJ).elf $(PROJ).bin
-	$(SIZE) $(PROJ).elf
+%.elf: %.o $(BOARD_OBJS) $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map
+	$(OBJCOPY) -O binary $*.elf $*.bin
+	$(SIZE) $*.elf
 
 clean:
 	rm -f *.o
-- 
cgit v1.2.3


From a5850b450733141f320a817c523b85dff49f52eb Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Mon, 13 Jun 2016 15:49:09 -0400
Subject: Only the HSM project needs the RTOS; most of the test projects can
 use the STM32 HAL code directly.

---
 projects/hsm/Makefile | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'projects/hsm/Makefile')

diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index d8fd1f9..1ee5323 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -3,9 +3,26 @@ PROJ = hsm
 # objs in addition to $(PROJ).o
 OBJS = 
 
-CFLAGS += -I $(LIBHAL_DIR)
+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
 
-LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
+CFLAGS += -I$(LIBHAL_DIR)
+CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M
+
+LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a $(RTOS_DIR)/librtos.a
 
 all: $(PROJ:=.elf)
 
-- 
cgit v1.2.3


From 3e31061ff6cbba7ea5bcb16dd0fa55b65ebf586f Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Tue, 14 Jun 2016 12:03:15 -0400
Subject: Import cli-test into hsm pretty much as-is.

---
 projects/hsm/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'projects/hsm/Makefile')

diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index 1ee5323..55e021f 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -1,7 +1,7 @@
 PROJ = hsm
 
 # objs in addition to $(PROJ).o
-OBJS = 
+OBJS = crc32.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c
 
 BOARD_OBJS = \
 	$(TOPLEVEL)/stm-init.o \
@@ -20,9 +20,12 @@ BOARD_OBJS = \
 	$(BOARD_DIR)/stm32f4xx_it_rtos.o
 
 CFLAGS += -I$(LIBHAL_DIR)
+CFLAGS += -I$(LIBCLI_DIR)
 CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M
 
-LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a $(RTOS_DIR)/librtos.a
+LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
+LIBS += $(RTOS_DIR)/librtos.a
+LIBS += $(LIBCLI_DIR)/libcli.a
 
 all: $(PROJ:=.elf)
 
-- 
cgit v1.2.3