deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

checkpoint

Browse source
This commit is contained in:
Mariano Alvira 2010-02-21 10:25:22 -05:00
parent c4f6aa459e
commit 948478193e
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -40,7 +40,7 @@ include $(TOPDIR)/config.mk
AOBJS = AOBJS =
COBJS = $(patsubst %.c,%.o,$(wildcard src/*.c)) COBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
#TESTS = $(wildcard tests/*.c) #TESTS = $(wildcard tests/*.c)
TESTS = tests/blink-red.c #tests/nvm-read.c #TESTS = tests/blink-red.c #tests/nvm-read.c
TARGETS = $(patsubst %.c,%.o,$(TESTS)) TARGETS = $(patsubst %.c,%.o,$(TESTS))
# Add GCC lib # Add GCC lib
@ -54,12 +54,15 @@ ALL = $(TESTS:.c=.srec) $(TESTS:.c=.bin) $(TESTS:.c=.dis)
LIBOBJS = $(patsubst %.c,%.o,$(wildcard libmc1322x/*.c)) LIBOBJS = $(patsubst %.c,%.o,$(wildcard libmc1322x/*.c))
include $(TOPDIR)/board/dev/Makefile
all: board
libmc1322x: libmc1322x.a libmc1322x: libmc1322x.a
libmc1322x.a: $(LIBOBJS) libmc1322x.a: $(LIBOBJS)
$(AR) r libmc1322x.a $(LIBOBJS) $(AR) r libmc1322x.a $(LIBOBJS)
all: src/start.o src/isr.o $(ALL) #all: src/start.o src/isr.o $(ALL)
#tests/flasher.obj: src/maca.o src/nvm.o #tests/flasher.obj: src/maca.o src/nvm.o
#tests/nvm-read.obj: src/maca.o src/nvm.o #tests/nvm-read.obj: src/maca.o src/nvm.o

1
config.mk
View file

@ -56,6 +56,7 @@ gccincdir := $(shell $(CC) -print-file-name=include)
CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \ CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \
-D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \ -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \
-I$(TOPDIR)/libmc1322x/include \ -I$(TOPDIR)/libmc1322x/include \
-I$(TOPDIR)/board \
-fno-builtin -ffreestanding -nostdinc -isystem \ -fno-builtin -ffreestanding -nostdinc -isystem \
$(gccincdir) -pipe $(PLATFORM_CPPFLAGS) $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)

2
libmc1322x/include/maca.h
View file

@ -1,7 +1,7 @@
#ifndef _MACA_H_ #ifndef _MACA_H_
#define _MACA_H_ #define _MACA_H_
#include "embedded_types.h" #include <types.h>
#define MACA_BASE 0x80004000 #define MACA_BASE 0x80004000
#define MACA_RESET 0x80004004 #define MACA_RESET 0x80004004

4
tests/blink-red.c
View file

@ -1,5 +1,5 @@
#include "mc1322x.h" #include <mc1322x.h>
#include "boards.h" #include <boards.h>
#define MBAR_GPIO 0x80000000 #define MBAR_GPIO 0x80000000
#define GPIO_PAD_DIR0 ((volatile uint32_t *) 0x80000000) #define GPIO_PAD_DIR0 ((volatile uint32_t *) 0x80000000)