Merge branch 'osd' into ico
Conflicts resolved: core/net/mac/contikimac/contikimac.c
This commit is contained in:
commit
7d63a0f487
1020 changed files with 70078 additions and 10930 deletions
|
@ -1,5 +1,5 @@
|
|||
CONTIKI_PROJECT=border-router
|
||||
all: $(CONTIKI_PROJECT)
|
||||
EXE=border-router
|
||||
all: $(EXE)
|
||||
APPS = slip-cmd
|
||||
|
||||
CONTIKI=../../..
|
||||
|
@ -25,3 +25,11 @@ include $(CONTIKI)/Makefile.include
|
|||
|
||||
connect-router: border-router.native
|
||||
sudo ./border-router.native aaaa::1/64
|
||||
|
||||
avr-size: $(EXE).$(TARGET).sz
|
||||
|
||||
flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
|
||||
|
||||
.PHONY: flash avr-size
|
||||
.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue