Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / nanopeak-v0.1 / Makefile

diff --git a/src/nanopeak-v0.1/Makefile b/src/nanopeak-v0.1/Makefile
index cb468a06b8b382e1438dc26f2359453e5a1e2ff6..774d4adc742e56ba23e7b8cbb0603c14d35f3185 100644 (file)
--- a/src/nanopeak-v0.1/Makefile
+++ b/src/nanopeak-v0.1/Makefile
@@ -2,30 +2,24 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:../product:..
+vpath % ../attiny:../drivers:../kernel:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
+include ../avr/Makefile.defs
+
 MCU=attiny85
 DUDECPUTYPE=t85
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADSLOW=-i 32 -B 32
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr25.x
 
-ifndef VERSION
-include ../Version
-endif
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
        ao_micropeak.c \
        ao_spi_attiny.c \
-       ao_led.c \
+       ao_led_tiny.c \
        ao_clock.c \
        ao_ms5607.c \
        ao_exti.c \
@@ -53,7 +47,7 @@ INC=\
 IDPRODUCT=0
 PRODUCT=NanoPeak-v0.1
 PRODUCT_DEF=-DNANOPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle