projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add separate 'ao_launch_tick'. Use in pyro and lockout.
[fw/altos]
/
src
/
product
/
Makefile.telemini
diff --git
a/src/product/Makefile.telemini
b/src/product/Makefile.telemini
index 75beeae480492381320b264dbd2bd89e04f244df..ff8b9d5649d83e0e9fad17f9710cfe8730e9df03 100644
(file)
--- a/
src/product/Makefile.telemini
+++ b/
src/product/Makefile.telemini
@@
-4,8
+4,8
@@
# Define TELEMINI_VER and TELEMINI_DEF and then
# include this file
# Define TELEMINI_VER and TELEMINI_DEF and then
# include this file
-vpath %.c ..:../
core
:../cc1111:../drivers:../product
-vpath %.h ..:../
core
:../cc1111:../drivers:../product
+vpath %.c ..:../
kernel
:../cc1111:../drivers:../product
+vpath %.h ..:../
kernel
:../cc1111:../drivers:../product
vpath ao-make-product.5c ../util
ifndef VERSION
vpath ao-make-product.5c ../util
ifndef VERSION
@@
-15,6
+15,8
@@
endif
INC = \
ao.h \
ao_pins.h \
INC = \
ao.h \
ao_pins.h \
+ ao_arch.h \
+ ao_arch_funcs.h \
cc1111.h \
ao_product.h
cc1111.h \
ao_product.h
@@
-33,7
+35,8
@@
CORE_SRC = \
ao_stdio.c \
ao_storage.c \
ao_task.c \
ao_stdio.c \
ao_storage.c \
ao_task.c \
- ao_telemetry.c
+ ao_telemetry.c \
+ ao_freq.c
CC1111_SRC = \
ao_adc.c \
CC1111_SRC = \
ao_adc.c \
@@
-60,7
+63,8
@@
SRC = \
$(DRIVER_SRC) \
$(PRODUCT_SRC)
$(DRIVER_SRC) \
$(PRODUCT_SRC)
-PROG = telemini-v$(TELEMINI_VER)-$(VERSION).ihx
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
PRODUCT=TeleMini-v$(TELEMINI_VER)
PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
IDPRODUCT=0x000a
PRODUCT=TeleMini-v$(TELEMINI_VER)
PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
IDPRODUCT=0x000a
@@
-79,10
+83,10
@@
endif
# Otherwise, print the full command line.
quiet ?= $($1)
# Otherwise, print the full command line.
quiet ?= $($1)
-all:
../
$(PROG)
+all: $(PROG)
-
../
$(PROG): $(REL) Makefile
- $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
&& cp $(PROG) $(PMAP) ..
+$(PROG): $(REL) Makefile
+ $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version
@@
-90,11
+94,7
@@
ao_product.h: ao-make-product.5c ../Version
distclean: clean
distclean: clean
-clean:
- rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
- rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
- rm -f ao_product.h
- rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
install:
install: