aboutsummaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2017-05-10 00:00:04 -0400
committerPaul Selkirk <paul@psgd.org>2017-05-10 00:00:04 -0400
commit65b94ef5ba1981c74a99cb43ee768fbf480c698b (patch)
tree15215df2a92b88ef7918ad25ef276d15dbe7381d /projects
parent4d69f1a0ef2ef3aa23b0ac9f1b9cbc84582136a7 (diff)
Sigh, right offset for the wrong register. Get the PC (the address we
interrupted) rather than LR (the return address from the function we interrupted). Also, change u_short and u_int to unsigned short and unsigned int, since gcc recently decided that those aren't part of the C99 standard. Finally, add profilable versions of memcpy, memset, and friends, because they get called a lot in the course of unit testing, and it would be nice to know who's calling them.
Diffstat (limited to 'projects')
-rw-r--r--projects/hsm/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index 6add6a8..4df60d7 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -9,9 +9,8 @@ OBJS = mgmt-cli.o \
mgmt-masterkey.o \
mgmt-misc.o \
mgmt-task.o \
- log.o
-
-BOARD_OBJS += $(TOPLEVEL)/task.o
+ log.o \
+ $(TOPLEVEL)/task.o
CFLAGS += -DNUM_RPC_TASK=4
@@ -26,6 +25,7 @@ LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
LDFLAGS += -Wl,--gc-sections
ifdef DO_PROFILING
+OBJS += $(TOPLEVEL)/memfunc.o
LIBS += $(LIBPROF_BLD)/libprof.a
LDFLAGS += --specs=rdimon.specs -lc -lrdimon
endif
@@ -33,7 +33,7 @@ endif
all: $(PROJ:=.elf)
%.elf: %.o $(BOARD_OBJS) $(OBJS) $(LIBS)
- $(CC) $(LDFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map
+ $(CC) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map $(LDFLAGS)
$(OBJCOPY) -O binary $*.elf $*.bin
$(SIZE) $*.elf