projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
chaoskey-v1.0
/
Makefile
diff --git
a/src/chaoskey-v1.0/Makefile
b/src/chaoskey-v1.0/Makefile
index f2c168baf3cf1a99f3fe7cc55b5c9b1aaf01e1aa..dea5b483f5158e719cf63dcf0d49c018f5e67fef 100644
(file)
--- a/
src/chaoskey-v1.0/Makefile
+++ b/
src/chaoskey-v1.0/Makefile
@@
-51,12
+51,13
@@
CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
PROGNAME=chaoskey-v1.0
PROG=$(PROGNAME)-$(VERSION).elf
HEX=$(PROGNAME)-$(VERSION).ihx
PROGNAME=chaoskey-v1.0
PROG=$(PROGNAME)-$(VERSION).elf
HEX=$(PROGNAME)-$(VERSION).ihx
+BIN=$(PROGNAME)-all-$(VERSION).bin
METAINFO=org.altusmetrum.ChaosKey.metainfo.xml
SRC=$(ALTOS_SRC) ao_chaoskey.c
OBJ=$(SRC:.c=.o)
METAINFO=org.altusmetrum.ChaosKey.metainfo.xml
SRC=$(ALTOS_SRC) ao_chaoskey.c
OBJ=$(SRC:.c=.o)
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX)
$(BIN)
$(PROG): Makefile $(OBJ) altos.ld
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
$(PROG): Makefile $(OBJ) altos.ld
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@
-66,6
+67,12
@@
ao_product.h: ao-make-product.5c ../Version
$(OBJ): $(INC)
$(OBJ): $(INC)
+$(BIN): $(PROG) $(LOADER)
+ $(MAKEBIN) --output=$@ --base=$(FLASH_ADDR) $(LOADER) $(PROG)
+
+$(LOADER):
+ +cd flash-loader && make
+
%.cab: $(PROG) $(HEX) $(METAINFO)
gcab --create --nopath $@ $(PROG) $(HEX) $(METAINFO)
%.cab: $(PROG) $(HEX) $(METAINFO)
gcab --create --nopath $@ $(PROG) $(HEX) $(METAINFO)