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
/
nanopeak-v0.1
/
Makefile
diff --git
a/src/nanopeak-v0.1/Makefile
b/src/nanopeak-v0.1/Makefile
index cb468a06b8b382e1438dc26f2359453e5a1e2ff6..d377959490d09b632271ba88964a34f75540538b 100644
(file)
--- a/
src/nanopeak-v0.1/Makefile
+++ b/
src/nanopeak-v0.1/Makefile
@@
-2,25
+2,19
@@
# Tiny AltOS build
#
#
# Tiny AltOS build
#
#
-vpath % ../attiny:../drivers:../
core
:../product:..
+vpath % ../attiny:../drivers:../
kernel
:../product:..
vpath ao-make-product.5c ../util
vpath make-altitude-pa ../util
vpath ao-make-product.5c ../util
vpath make-altitude-pa ../util
+include ../avr/Makefile.defs
+
MCU=attiny85
DUDECPUTYPE=t85
#PROGRAMMER=stk500v2 -P usb
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:
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 \
ALTOS_SRC = \
ao_micropeak.c \
@@
-53,7
+47,7
@@
INC=\
IDPRODUCT=0
PRODUCT=NanoPeak-v0.1
PRODUCT_DEF=-DNANOPEAK
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
CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
NICKLE=nickle