aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-02-02Add locking around keystore operations.Rob Austein
2016-12-23Don't wrap key number in "keystore show keys".Rob Austein
2016-12-21Initialize PINs before trying to use them in bootloader.Rob Austein
2016-12-21Rewrite core upload loop to simplify and fix race conditions.Rob Austein
2016-12-20Flush output to serial device after writing.Rob Austein
2016-12-20Merge branch 'master' into ksngRob Austein
2016-12-20Make stm_flash_sector_num a little more efficient.Paul Selkirk
2016-12-20The bootloader upgrade reboots now, so we don't need to log out of the CLI.Paul Selkirk
2016-12-20Fix bootloader upload callback routine to write the correct number of bytes t...Paul Selkirk
2016-12-20cli_receive_data: re-enable UART DMA before returning. Based on Fredrik's fix...Paul Selkirk
2016-12-19Merge branch 'master' into ksng.Rob Austein
2016-11-25Add debugging code to cryptech_upload.Rob Austein
2016-11-15Reinitialize keystore data structures after wiping keystore flash.Rob Austein
2016-11-14Track removal of hal_rpc_pkey_list().Rob Austein
2016-11-14hal_rpc_pkey_find() -> hal_rpc_pkey_open().Rob Austein
2016-11-02Wait for WIP to clear before returning from erase operations too.Rob Austein
2016-11-01Tweak CLI keystore commands for latest libhal RPC keystore API.Rob Austein
2016-11-01Don't return from flash write calls until WIP flag clears.Rob Austein
2016-10-09Track changes to libhal pkey API.Rob Austein
2016-10-07Track changes to libhal RPC pkey API.Rob Austein
2016-10-07strcasecmp() is not a standard function.Rob Austein
2016-09-27"keystore erase" now clears entire keystore flash.Rob Austein
2016-09-26Fix function pointer type, typo in variable name.Rob Austein
2016-09-23Use subsectors instead of sectors in keystore.Rob Austein
2016-09-20Still some problem with uart receive under heavy load, so change to a 2-byte ...Paul Selkirk
2016-09-16Change default gcc optimization level to -Og.Rob Austein
2016-09-16Revised ks_flash. Compiles, not yet tested.Rob Austein
2016-09-13Track libhal cleanup (function names, const-ification).Rob Austein
2016-09-09Fix frelling sw/stm32/Makefile to rebuild libraries properly.Rob Austein
2016-09-09Track removal of `type` argument from hal_rpc_pkey_find().Rob Austein
2016-09-05add bit-for-bit testing of FMC address and data busFredrik Thulin
2016-09-02Whack with club until working with new keystore API.Rob Austein
2016-09-01"make clean" needs to use "rm -f" to avoid gratuitous failures.Rob Austein
2016-08-23Merge branch 'master' of git.cryptech.is:sw/stm32Paul Selkirk
2016-08-23Show running threads.Paul Selkirk
2016-08-23Reset table of cores after resetting FPGA from CLI.Paul Selkirk
2016-08-23Multi-client testing revealed race conditions in uart receive codePaul Selkirk
2016-08-15Incorporate FPGA comms test from projects/board-test/fmc-test.cFredrik Thulin
2016-08-15cli_receive_data: re-enable UART DMA before returningFredrik Thulin
2016-08-11Multiple threads and multiple cores, to deal with multiple clients.Paul Selkirk
2016-08-11re-implement 'show fpga cores'Fredrik Thulin
2016-07-21Use a fresh port of libcli, which retains more of the original API.Paul Selkirk
2016-07-16Don't run empty "export" command.Rob Austein
2016-07-13'masterkey set' without args sets master key to a random valuePaul Selkirk
2016-07-13probe_cores() finally does the right thing, so we don't have to call it early.Paul Selkirk
2016-07-12Make username a command-line option, default "so" as it used to be.Rob Austein
2016-07-12Allow wheel to upload firmware/bitstreamsPaul Selkirk
2016-07-12Re-disable 'keystore set key'; hexdump binary key names; remove unused 'show'...Paul Selkirk
2016-07-12merge from projects/hsmFredrik Thulin
2016-07-12Merge branch 'master' of git.cryptech.is.:sw/stm32Fredrik Thulin
js_keywrap&id=ee19acbdedc509c54b47f15b7bef6b9d13aa9b5c'>ee19acb
26f1290
4c6b056
fb73e2d






26f1290
4c6b056

26f1290

4c6b056
a59302f
7f390d5
9278e9b
a5850b4






4c6b056
26f1290
4a38cf6





f296bc7
26f1290
4a38cf6

26f1290
79b1ba7

fb73e2d
e3db117
9bbc072

4a38cf6


a5850b4
4a38cf6

e3db117

26f1290
e3db117

9278e9b
e3db117

802a6f3
e3db117
79b1ba7
9278e9b
e3db117
a59302f

75ddc74
684b0c0

4c6b056
79b1ba7

f296bc7
9278e9b
26f1290
79b1ba7

e9cd8ff
4a38cf6
79b1ba7
a59302f
26f1290

4a38cf6

e3db117


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
                                       
                      
 




                                                                          
 


                                                                        
 


                                                                          
 










                                                                          
 
                                                                      
                              
                                       
 
                                   
                             
 




                                                                      








                                                         
 
                                    
 
               
                                                               
                                                                                     
 
                                                    
              
                                
                               

                                

                                                              

                                          









                                        
 
                      






                               
 

                                                 

                                                                   
                                                          
                                                                                                                       
                                                               
                  






                                                                        
             
 





                                   
                                                   
 

                              
 

                                      
 
                                                                                                   

                                    


                              
                                                     

                                     

                                                 
 

                                                                                                  
 

                                
 
                                                         
                                       
 
                                                                                              

                               
                                                        

                                      
                                                                              

                         
                                                                
 
      

                                            
                                          
                                           
                                             
                                     

                

                                    


                                      
# Copyright (c) 2015-2016, NORDUnet A/S
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
# - Redistributions of source code must retain the above copyright notice,
#   this list of conditions and the following disclaimer.
#
# - Redistributions in binary form must reproduce the above copyright
#   notice, this list of conditions and the following disclaimer in the
#   documentation and/or other materials provided with the distribution.
#
# - Neither the name of the NORDUnet nor the names of its contributors may
#   be used to endorse or promote products derived from this software
#   without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# absolute path, because we're going to be passing things to sub-makes
export TOPLEVEL = $(abspath .)
export CRYPTECH_ROOT = $(abspath ../..)

# define board: dev-bridge or alpha
BOARD = TARGET_CRYPTECH_ALPHA

export LIBS_DIR = $(TOPLEVEL)/libraries
export MBED_DIR = $(LIBS_DIR)/mbed
export CMSIS_DIR = $(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4
export BOARD_DIR = $(CMSIS_DIR)/$(BOARD)
export RTOS_DIR = $(MBED_DIR)/rtos

export LIBHAL_SRC = $(CRYPTECH_ROOT)/sw/libhal
export LIBHAL_BLD = $(LIBS_DIR)/libhal

export LIBCLI_SRC = $(CRYPTECH_ROOT)/user/ft/libcli
export LIBCLI_BLD = $(LIBS_DIR)/libcli

export LIBTFM_SRC = $(CRYPTECH_ROOT)/sw/thirdparty/libtfm
export LIBTFM_BLD = $(LIBS_DIR)/libtfm

export LIBS = $(MBED_DIR)/libstmf4.a

# linker script
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
BOARD_OBJS = \
	$(TOPLEVEL)/stm-init.o \
	$(TOPLEVEL)/stm-fmc.o \
	$(TOPLEVEL)/stm-uart.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-
export CC=$(PREFIX)gcc
export AS=$(PREFIX)as
export AR=$(PREFIX)ar
export OBJCOPY=$(PREFIX)objcopy
export OBJDUMP=$(PREFIX)objdump
export SIZE=$(PREFIX)size

# whew, that's a lot of cflags
CFLAGS  = -ggdb -O2 -Wall -Warray-bounds #-Wextra
CFLAGS += -mcpu=cortex-m4 -mthumb -mlittle-endian -mthumb-interwork
CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
CFLAGS += -DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F429xx
CFLAGS += -D__CORTEX_M4 -DTARGET_STM -DTARGET_STM32F4 -DTARGET_STM32F429ZI -DTOOLCHAIN_GCC -D__FPU_PRESENT=1 -D$(BOARD)
CFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections
CFLAGS += -std=c99
CFLAGS += -I$(TOPLEVEL)
CFLAGS += -I$(MBED_DIR)/api
CFLAGS += -I$(MBED_DIR)/targets/cmsis
CFLAGS += -I$(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4
CFLAGS += -I$(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4/$(BOARD)
CFLAGS += -I$(MBED_DIR)/targets/hal/TARGET_STM/TARGET_STM32F4
CFLAGS += -I$(MBED_DIR)/targets/hal/TARGET_STM/TARGET_STM32F4/$(BOARD)
export CFLAGS

%.o : %.c
	$(CC) $(CFLAGS) -c -o $@ $<

%.o : %.S
	$(CC) $(CFLAGS) -c -o $@ $<

all: board-test cli-test libhal-test hsm bootloader

$(MBED_DIR)/libstmf4.a:
	$(MAKE) -C $(MBED_DIR)

board-test: $(BOARD_OBJS) $(LIBS)
	$(MAKE) -C projects/board-test

cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_BLD)/libcli.a $(LIBHAL_BLD)/libhal.a $(RTOS_DIR)/librtos.a
	$(MAKE) -C projects/cli-test

$(RTOS_DIR)/librtos.a:
	$(MAKE) -C $(RTOS_DIR)

rtos-test: $(RTOS_OBJS) $(LIBS) $(RTOS_DIR)/librtos.a
	$(MAKE) -C projects/rtos-test

$(LIBTFM_BLD)/libtfm.a:
	$(MAKE) -C $(LIBTFM_BLD) PREFIX=$(PREFIX)

$(LIBHAL_BLD)/libhal.a: $(LIBTFM_BLD)/libtfm.a
	$(MAKE) -C $(LIBHAL_BLD) IO_BUS=fmc RPC_MODE=server RPC_TRANSPORT=serial KS=flash libhal.a

$(LIBCLI_BLD)/libcli.a:
	$(MAKE) -C $(LIBCLI_BLD)

libhal-test: $(BOARD_OBJS) $(LIBS) $(LIBHAL_BLD)/libhal.a
	$(MAKE) -C projects/libhal-test

hsm: $(BOARD_OBJS) $(LIBS) $(LIBHAL_BLD)/libhal.a $(RTOS_DIR)/librtos.a $(LIBCLI_BLD)/libcli.a
	$(MAKE) -C projects/hsm

bootloader: $(BOARD_OBJS) $(LIBS) $(LIBHAL_BLD)/libhal.a
	$(MAKE) -C projects/bootloader

# don't automatically delete objects, to avoid a lot of unnecessary rebuilding
.SECONDARY: $(BOARD_OBJS)

.PHONY: board-test rtos-test libhal-test cli-test hsm bootloader

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

distclean: clean
	$(MAKE) -C $(MBED_DIR) clean
	$(MAKE) -C $(RTOS_DIR) clean
	$(MAKE) -C $(LIBHAL_BLD) clean
	$(MAKE) -C $(LIBTFM_BLD) clean
	$(MAKE) -C $(LIBCLI_BLD) clean