altos: Rename 'core' to 'kernel'

[fw/altos] / src / product / Makefile.telenano

diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index 7204304465da8f691fa150b6026088b401e5fb37..d2fcb6d8b8ca5d45f4e9929f834cad9a4c50849c 100644 (file)
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -4,8 +4,8 @@
 # Define TELENANO_VER and TELENANO_DEF and then
 # include this file
 
 # Define TELENANO_VER and TELENANO_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 \


@@ -44,6 +47,7 @@ CC1111_SRC = \
        ao_packet_slave.c \
        ao_radio.c \
        ao_romconfig.c \
        ao_packet_slave.c \
        ao_radio.c \
        ao_romconfig.c \

+       ao_string.c \

        ao_timer.c \
        _bp.c
 
        ao_timer.c \
        _bp.c
 


@@ -58,7 +62,8 @@ SRC = \
        $(DRIVER_SRC) \
        $(PRODUCT_SRC)
 
        $(DRIVER_SRC) \
        $(PRODUCT_SRC)
 

-PROG = telenano-v$(TELENANO_VER)-$(VERSION).ihx
+PROGNAME = telenano-v$(TELENANO_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx

 PRODUCT=TeleNano-v$(TELENANO_VER)
 PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
 IDPRODUCT=0x000a
 PRODUCT=TeleNano-v$(TELENANO_VER)
 PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
 IDPRODUCT=0x000a


@@ -77,22 +82,18 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
 # Otherwise, print the full command line.
 quiet ?= $($1)
 

-all: ../$(PROG)
+all: $(PROG)

 
 

-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile

        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..

-       $(call quiet,CHECK_STACK) ../core/ao.h $(PMEM)
+       $(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@

 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
 distclean:     clean
 
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
 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: