aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2016-06-06 11:47:03 -0400
committerPaul Selkirk <paul@psgd.org>2016-06-06 11:47:03 -0400
commitee19acbdedc509c54b47f15b7bef6b9d13aa9b5c (patch)
treeec15141c6a962fdfa53c64841ac052f33730ec43
parent573363d96582af69dbecf6099bd17a3cc41f5d0f (diff)
Don't break builds for dev-bridge board.
-rw-r--r--Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1f4ca74..87cc787 100644
--- a/Makefile
+++ b/Makefile
@@ -50,21 +50,25 @@ export LDSCRIPT = $(BOARD_DIR)/TOOLCHAIN_GCC_ARM/STM32F429BI.ld
export BOOTLOADER_LDSCRIPT = $(BOARD_DIR)/TOOLCHAIN_GCC_ARM/STM32F429BI_bootloader.ld
# board-specific objects, to link into every project
-export BOARD_OBJS = \
+BOARD_OBJS = \
$(TOPLEVEL)/stm-init.o \
$(TOPLEVEL)/stm-fmc.o \
$(TOPLEVEL)/stm-uart.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 \
$(TOPLEVEL)/syscalls.o \
$(BOARD_DIR)/TOOLCHAIN_GCC_ARM/startup_stm32f429xx.o \
$(BOARD_DIR)/system_stm32f4xx.o \
$(BOARD_DIR)/stm32f4xx_hal_msp.o \
$(BOARD_DIR)/stm32f4xx_it.o
+ifeq (${BOARD},TARGET_CRYPTECH_ALPHA)
+BOARD_OBJS += \
+ $(TOPLEVEL)/stm-rtc.o \
+ $(TOPLEVEL)/spiflash_n25q128.o \
+ $(TOPLEVEL)/stm-fpgacfg.o \
+ $(TOPLEVEL)/stm-keystore.o \
+ $(TOPLEVEL)/stm-sdram.o \
+ $(TOPLEVEL)/stm-flash.o
+endif
+export BOARD_OBJS
# cross-building tools
PREFIX=arm-none-eabi-
@@ -124,7 +128,6 @@ $(LIBTFM_DIR)/libtfm.a:
$(MAKE) -C $(LIBTFM_DIR) PREFIX=$(PREFIX)
$(LIBHAL_DIR)/libhal.a: $(LIBTFM_DIR)/libtfm.a
-# $(MAKE) -C $(LIBHAL_DIR) RPC_CLIENT=local IO_BUS=fmc KS=volatile libhal.a
$(MAKE) -C $(LIBHAL_DIR) IO_BUS=fmc RPC_SERVER=yes RPC_TRANSPORT=serial KS=volatile libhal.a
$(LIBCLI_DIR)/libcli.a: