RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #471 from OlegHahm/makefile_cleanup

Browse Source 
Makefile cleanup
This commit is contained in:
Oleg Hahm 2014-01-07 06:29:22 -08:00
commit b7c209e39f
122 changed files with 329 additions and 930 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,7 +1,10 @@
DIRS = $(RIOTCPU) core drivers sys
DIRS = $(RIOTCPU)/$(CPU) core drivers sys
.PHONY: all clean doc
include $(RIOTCPU)/$(CPU)/Makefile.include
include $(RIOTBOARD)/$(BOARD)/Makefile.include
all:
mkdir -p $(BINDIR)
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

15
Makefile.base
View File

@ -23,28 +23,25 @@ export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
.PHONY: clean
include $(RIOTCPU)/Makefile.base
include $(RIOTBOARD)/Makefile.base
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
@$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
$(AD)$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
@$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
@$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
$(AD)$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
$(AD)$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
$(BINDIR)%.o: %.s
@$(AS) $(ASFLAGS) $*.s -o $(BINDIR)$*.o
$(AD)$(AS) $(ASFLAGS) $*.s -o $(BINDIR)$*.o
$(BINDIR)%.o: %.S
@$(CC) -c $(CFLAGS) $*.S -o $(BINDIR)$*.o
$(AD)$(CC) -c $(CFLAGS) $*.S -o $(BINDIR)$*.o
# remove compilation products
clean::
@rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ)
$(AD)rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ)

51
Makefile.include
View File

@ -17,16 +17,23 @@ CPUDEF = $(shell echo $(CPU)|tr 'a-z' 'A-Z')
CFLAGS += -DBOARD=$(BB) -DCPU_$(CPUDEF)
export CFLAGS
export BINDIR =$(CURDIR)/bin/$(BOARD)/
ifeq ($(QUIET),1)
AD=@
else
AD=
endif
export AD
# mandatory includes!
include $(RIOTBASE)/Makefile.modules
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/Makefile.include
include $(RIOTBASE)/Makefile.modules
include $(RIOTCPU)/$(CPU)/Makefile.include
# your binaries to link
BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
BASELIBS += $(PROJBINDIR)/${PROJECT}.a
PROJBINDIR =$(CURDIR)/bin
BASELIBS += $(BINDIR)$(BOARD)_base.a
BASELIBS += $(BINDIR)${PROJECT}.a
# clumsy way to enable building native on osx:
BUILDOSXNATIVE = 0
@ -48,46 +55,46 @@ endif
.PHONY: all clean flash doc term
## make script for your project. Build RIOT-base here!
all: $(PROJBINDIR)/$(PROJECT).a
all: $(BINDIR)$(PROJECT).a
@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
"$(MAKE)" -C $(RIOTBOARD)
"$(MAKE)" -C $(RIOTBOARD)/$(BOARD)
"$(MAKE)" -C $(RIOTBASE)
@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i ; done ;
ifeq ($(BUILDOSXNATIVE),1)
@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
else
@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map $(LINKFLAGS)
@$(SIZE) $(PROJBINDIR)/$(PROJECT).elf
@$(OBJCOPY) $(OFLAGS) $(PROJBINDIR)/$(PROJECT).elf $(PROJBINDIR)/$(PROJECT).hex
@$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(PROJECT).map $(LINKFLAGS)
@$(SIZE) $(BINDIR)$(PROJECT).elf
@$(OBJCOPY) $(OFLAGS) $(BINDIR)$(PROJECT).elf $(BINDIR)$(PROJECT).hex
endif
## your make rules
## Only basic example - modify it for larger projects!!
#$(PROJBINDIR)/$(PROJECT).a: $(PROJBINDIR)/$(PROJECT).o
# $(AR) -rc $(PROJBINDIR)/project.a $(PROJBINDIR)/$(PROJECT).o
#$(BINDIR)/$(PROJECT).a: $(BINDIR)/$(PROJECT).o
# $(AR) -rc $(BINDIR)/project.a $(BINDIR)/$(PROJECT).o
# string array of all names of c files in dir
SRC = $(wildcard *.c)
# string array of all names replaced .c with .o
OBJ = $(SRC:%.c=${PROJBINDIR}/%.o)
OBJ = $(SRC:%.c=${BINDIR}%.o)
$(PROJBINDIR)/$(PROJECT).a: $(OBJ)
$(AR) -rc $(PROJBINDIR)/$(PROJECT).a $(OBJ)
$(BINDIR)$(PROJECT).a: $(OBJ)
$(AD)$(AR) -rc $(BINDIR)$(PROJECT).a $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
$(PROJBINDIR)/%.o: %.c $(PROJDEPS)
$(BINDIR)%.o: %.c $(PROJDEPS)
@echo; echo "Compiling.... $*.c"; echo
@test -d $(PROJBINDIR) || mkdir -p $(PROJBINDIR)
$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(PROJBINDIR)/$*.o
@test -d $(BINDIR) || mkdir -p $(BINDIR)
$(AD)$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
clean:
"$(MAKE)" -C $(RIOTBOARD) clean
"$(MAKE)" -C $(RIOTBOARD)/$(BOARD) clean
"$(MAKE)" -C $(RIOTBASE) clean
@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i clean ; done ;
rm -rf $(PROJBINDIR)
rm -rf $(BINDIR)
flash: all
$(FLASHER) $(FFLAGS)

3
Makefile.modules
View File

@ -1,8 +1,8 @@
export MAKEBASE =$(RIOTBASE)
export BINDIR =$(RIOTBASE)/bin/
UNDEF += $(BINDIR)startup.o
USEMODULE += cpu core sys
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
ED = $(USEMODULE:%=-DMODULE_%)
EXTDEFINES = $(shell echo $(ED)|tr 'a-z' 'A-Z')
BL=$(USEMODULE:%= $(BINDIR)%.a)
@ -16,4 +16,3 @@ include $(RIOTBASE)/Makefile.dep
export USEMODULE
export INCLUDES += -I$(RIOTBASE)/core/include

5
boards/Makefile
View File

@ -1,5 +0,0 @@
all:
"$(MAKE)" -C $(BOARD)
clean:
"$(MAKE)" -C $(BOARD) clean

36
boards/Makefile.base
View File

@ -1,36 +0,0 @@
ifeq ($(BOARD),msba2)
INCLUDES += -I$(RIOTBOARD)/msba2/include/
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBOARD)/msba2-common/drivers/include/
endif
ifeq ($(BOARD),msb-430)
INCLUDES += -I$(RIOTBOARD)/msb-430/include/
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
endif
ifeq ($(BOARD),msb-430h)
INCLUDES += -I$(RIOTBOARD)/msb-430h/include/
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
endif
ifeq ($(BOARD),wsn430-v1_3b)
INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include/
INCLUDES += -I$(RIOTBOARD)/wsn430-common/include/
endif
ifeq ($(BOARD),wsn430-v1_4)
INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include/
INCLUDES += -I$(RIOTBOARD)/wsn430-common/include/
endif
ifeq ($(BOARD),chronos)
INCLUDES += -I$(RIOTBOARD)/chronos/include/
INCLUDES += -I$(RIOTBOARD)/chronos/drivers/include/
endif
ifeq ($(BOARD),telosb)
INCLUDES += -I$(RIOTBOARD)/telosb/include/
endif
ifeq ($(BOARD),native)
INCLUDES += -I$(RIOTBOARD)/native/include/
endif
ifeq ($(BOARD),mbed_lpc1768)
INCLUDES += -I$(RIOTBOARD)/mbed_lpc1768/include/
endif

41
boards/avsextrem/Makefile
View File

@ -1,38 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = avsextrem_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = drivers $(RIOTBOARD)/msba2-common
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
"$(MAKE)" -C ../msba2-common
"$(MAKE)" -C drivers
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
"$(MAKE)" -C ../msba2-common clean
"$(MAKE)" -C drivers clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

2
boards/avsextrem/Makefile.include
View File

@ -1,3 +1,3 @@
export INCLUDES += -I$(RIOTBOARD)/msba2-common/include
export INCLUDES += -I$(RIOTBOARD)/avsextrem/include
include $(RIOTBOARD)/msba2-common/Makefile.include

2
boards/avsextrem/board_init.c
View File

@ -23,9 +23,7 @@
* @note $Id: board_init.c 1071 2013-09-19 16:50:56 kasmi $
*/
#include "lpc23xx.h"
#include "VIC.h"
#include "cpu.h"
#include "gpioint.h"
#define PCRTC BIT9
#define CL_CPU_DIV 4

27
boards/avsextrem/drivers/Makefile
View File

@ -1,24 +1,5 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBOARD)/$(BOARD)/include
$(BINDIR)avsextrem_base.a: $(OBJ)
$(AR) rcs $(BINDIR)${ARCH} $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ)
MODULE =avsextrem_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
include $(RIOTBASE)/Makefile.base

3
boards/avsextrem/drivers/avsextrem-cc1100.c
View File

@ -119,6 +119,9 @@ void cc1100_spi_init(void)
while (SPI_RX_AVAIL) { // while RNE (Receive FIFO Not Empty)...
dummy = SSP1DR; // read data
}
/* to suppress unused-but-set-variable */
(void) dummy;
}
uint8_t

3
boards/avsextrem/drivers/avsextrem-smb380.c
View File

@ -977,7 +977,6 @@ uint8_t SMB380_setAnyMotionLimit(uint16_t mg, uint16_t gvalueint)
return 0;
}
unsigned short uReg;
unsigned long cpsr = disableIRQ();
SMB380_Prepare();
/* 0,3g = 300 / 15,6mg = 19 */
@ -985,7 +984,7 @@ uint8_t SMB380_setAnyMotionLimit(uint16_t mg, uint16_t gvalueint)
SMB380_ssp_read();
//Set duration at this point
SMB380_ssp_write(SMB380_ANY_MOTION_DUR_HYST, 0, SMB380_READ_REGISTER);
uReg = SMB380_ssp_read();
SMB380_ssp_read();
SMB380_Unprepare();
restoreIRQ(cpsr);
return 1;

7
boards/avsextrem/drivers/avsextrem-ssp0.c
View File

@ -201,11 +201,14 @@ uint8_t SSP0Prepare(uint8_t chip, uint8_t datasize, uint8_t cpol, uint8_t cpha,
// Enable
SSP0CR1 |= BIT1; // SSP0 enabled
uint32_t Dummy;
uint32_t dummy;
for (uint32_t i = 0; i < FIFOSIZE; i++) {
Dummy = SSP0DR; // clear the RxFIFO
dummy = SSP0DR; // clear the RxFIFO
}
/* to suppress unused-but-set-variable */
(void) dummy;
return 1;
}

39
boards/chronos/Makefile
View File

@ -1,35 +1,12 @@
export ARCH = chronos_base.a
MODULE =$(BOARD)_base
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
DIRS = drivers
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/drivers/include
INCLUDES += -I$(RIOTBASE)/sys/drivers/cc110x_ng/include
INCLUDES += -I$(RIOTBASE)/core/include
INCLUDES += -I$(RIOTCPU)/msp430-common/include/
INCLUDES += -I$(RIOTCPU)/cc430/include/
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/fw_out && mv /tmp/fw_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C drivers clean
rm -f $(OBJ) $(DEP)
rm -f $(BINDIR)$(ARCH)
-rmdir $(BINDIR)
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

13
boards/chronos/Makefile.include
View File

@ -1,23 +1,22 @@
export INCLUDES += -I$(RIOTBOARD)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include/
export INCLUDES += -I$(RIOTCPU)/cc430/include/ -I$(RIOTCPU)/msp430-common/include/
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
## the cpu to build for
export CPU = cc430
export MCU = cc430f6137
# toolchain config
export PREFIX = @msp430-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = msp430-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU) -D CC430
export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)startup.o
export FLASHER = mspdebug
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
export USEMODULE += msp430_common
export FFLAGS = rf2500 "prog $(HEXFILE)"
export OFLAGS = -O ihex

25
boards/chronos/drivers/Makefile
View File

@ -1,24 +1,5 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/
$(BINDIR)chronos_drivers.a: $(OBJ)
$(AR) rcs $(BINDIR)chronos_base.a $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

29
boards/mbed_lpc1768/Makefile
View File

@ -1,28 +1,3 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
export ARCH = mbed_lpc1768_base.a
MODULE =$(BOARD)_base
INCLUDES += -Iinclude/
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
INCLUDES += -I$(RIOTBASE)/core/include
all: $(BINDIR)$(ARCH)
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
include $(RIOTBASE)/Makefile.base

11
boards/mbed_lpc1768/Makefile.include
View File

@ -3,9 +3,9 @@ export CPU = lpc1768
# toolchain config
export PREFIX = arm-none-eabi-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export CFLAGS = -DUSE_STDPERIPH_DRIVER -ggdb -g3 -std=gnu99 -O0 -Wall -Wstrict-prototypes -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian -mthumb -mthumb-interwork -nostartfiles
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -DUSE_STDPERIPH_DRIVER -ggdb -g3 -std=gnu99 -O0 -Wall -Wstrict-prototypes -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian -mthumb -mthumb-interwork -nostartfiles
export ASFLAGS = -ggdb -g3 -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
@ -17,12 +17,11 @@ LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
export FFLAGS = $(HEXFILE)
export ELFFILE = bin/$(PROJECT).elf
export DEBUGGER_FLAGS = $(ELFFILE)
INCLUDES += -Iinclude/
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ -I$(RIOTCPU)/$(CPU)/include
export OFLAGS = -O binary

36
boards/msb-430-common/Makefile
View File

@ -1,33 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/ -I${RIOTBOARD}/${BOARD}/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/
DIRS = drivers
.PHONY: $(BINDIR)$(ARCH)
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
echo $(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C drivers clean
rm -f $(OBJ) $(DEP)
rm -f $(BINDIR)$(ARCH)
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

12
boards/msb-430-common/Makefile.include
View File

@ -3,18 +3,18 @@ export CPU = msp430x16x
export MCU = msp430f1612
# toolchain config
export PREFIX = @msp430-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = msp430-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU)
export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
export LINKFLAGS = -mmcu=$(MCU) -lgcc
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
ifeq ($(strip $(FLASHER)),)
@ -36,5 +36,5 @@ endif
export FFLAGS += "prog $(HEXFILE)"
export USEMODULE += msp430_common
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
export OFLAGS = -O ihex

25
boards/msb-430-common/drivers/Makefile
View File

@ -1,24 +1,5 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/
$(BINDIR)msb-430_common_drivers.a: $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTBASE)/Makefile.base

37
boards/msb-430/Makefile
View File

@ -1,34 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = msb-430_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = $(RIOTBOARD)/msb-430-common
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430x16x/include/
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C ../msb-430-common
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
mkdir -p $(BINDIR)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C ../msb-430-common clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

40
boards/msb-430h/Makefile
View File

@ -1,37 +1,13 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = msb-430h_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = $(RIOTBOARD)/msb-430-common
INCLUDES += -I${RIOTBASE}/core/include/
INCLUDES += -Iinclude/ -I$(RIOTBOARD)/msb-430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(ARCH)
$(MAKE) -C ../msb-430-common
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C ../msb-430-common clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

2
boards/msb-430h/Makefile.include
View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/msb-430-common/Makefile.include

1
boards/msb-430h/driver_cc110x.c
View File

@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */
#include "irq.h"
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#define CC1100_GDO0 (P2IN & 0x02) // read serial I/O (GDO0)
#define CC1100_GDO1 (P3IN & 0x04) // read serial I/O (GDO1)

36
boards/msba2-common/Makefile
View File

@ -1,33 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
DIRS = drivers
.PHONY: $(BINDIR)msba2_common_base.a
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)msba2_common_base.a
"$(MAKE)" -C drivers
$(BINDIR)msba2_common_base.a: $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
"$(MAKE)" -C drivers clean
rm -f $(OBJ) $(DEP)
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

15
boards/msba2-common/Makefile.include
View File

@ -2,10 +2,10 @@
export CPU = lpc2387
# toolchain config
export PREFIX = @arm-none-eabi-
#export PREFIX = @arm-elf-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = arm-none-eabi-
#export PREFIX = arm-elf-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -O2 -Wall -Wstrict-prototypes -mcpu=arm7tdmi-s -gdwarf-2
export ASFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s
export AS = $(PREFIX)as
@ -19,9 +19,10 @@ LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
export FFLAGS = $(PORT) $(PROJBINDIR)/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
export FFLAGS = $(PORT) $(HEXFILE)
include $(RIOTBOARD)/msba2-common/Makefile.dep
export INCLUDES += -I$(RIOTCPU)/lpc2387/include
export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
export OFLAGS = -O ihex

2
boards/msba2-common/board_common_init.c
View File

@ -43,10 +43,8 @@ and the mailinglist (subscription via web site)
#include <string.h>
#include "board.h"
#include "lpc23xx.h"
#include "VIC.h"
#include "cpu.h"
#include "config.h"
#include "flashrom.h"
#define PCRTC BIT9
#define CL_CPU_DIV 4

25
boards/msba2-common/drivers/Makefile
View File

@ -1,24 +1,7 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
$(BINDIR)msba2_common_drivers.a: $(OBJ)
$(AR) rcs $(BINDIR)${ARCH} $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
include $(RIOTBASE)/Makefile.base

8
boards/msba2-common/drivers/msba2-cc110x.c
View File

@ -39,13 +39,15 @@ and the mailinglist (subscription via web site)
#include <stdio.h>
#include <stddef.h>
// core
#include "cpu.h"
/* core */
#include "irq.h"
// sys
/* cpu */
#include "cpu.h"
/* drivers */
#include "cc110x_ng.h"
#include "cc110x-arch.h"
#include "cc110x_spi.h"
#include "gpioint.h"
#define CC1100_GDO0 (FIO0PIN & BIT27) // read serial I/O (GDO0)

41
boards/msba2/Makefile
View File

@ -1,37 +1,12 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = msba2_base.a
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = $(RIOTBOARD)/msba2-common
INCLUDES += -I$(RIOTBOARD)/msba2/include/
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
all: $(BINDIR)$(ARCH)
$(MAKE) -C ../msba2-common
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C ../msba2-common clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

3
boards/msba2/Makefile.include
View File

@ -1,3 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/msba2/include -I$(RIOTBOARD)/msba2-common/include
export INCLUDES += -I$(RIOTBOARD)/msba2/include
include $(RIOTBOARD)/msba2-common/Makefile.include

34
boards/native/Makefile
View File

@ -1,31 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
export ARCH = native_base.a
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/cpu/native/include/
INCLUDES += -I$(RIOTBOARD)/native/include/
DIRS = drivers
all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
-mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
${MAKE} -C drivers clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
-rmdir -p $(BINDIR)
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

6
boards/native/Makefile.include
View File

@ -1,10 +1,10 @@
export INCLUDES += -I$(RIOTBOARD)/native/include
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
export CPU = native
# toolchain config
export PREFIX =
#export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
#export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -Wall -Wextra -pedantic -m32
export ASFLAGS =
export AS = $(PREFIX)as

34
boards/native/drivers/Makefile
View File

@ -1,32 +1,6 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(BINDIR)native-led.o
ifneq (,$(findstring ltc4150,$(USEMODULE)))
OBJ += $(BINDIR)native-ltc4150.o
endif
ifneq (,$(findstring uart0,$(USEMODULE)))
OBJ += $(BINDIR)native-uart0.o
endif
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/native/include/
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
$(BINDIR)native_drivers.a: $(OBJ)
@$(AR) rcs $(BINDIR)${ARCH} $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
@$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
include $(RIOTBASE)/Makefile.base

2
boards/native/drivers/native-uart0.c
View File

@ -225,6 +225,7 @@ void handle_uart_sock()
_native_uart_conn = s;
}
#ifdef MODULE_UART0
void _native_handle_uart0_input()
{
if (FD_ISSET(STDIN_FILENO, &_native_rfds)) {
@ -250,6 +251,7 @@ int _native_set_uart_fds(void)
return ((STDIN_FILENO > _native_uart_sock) ? STDIN_FILENO : _native_uart_sock);
}
}
#endif
void _native_init_uart0(char *stdiotype, char *ioparam)
{

40
boards/redbee-econotag/Makefile
View File

@ -1,37 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
export ARCH = $(BOARD)_base.a
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
INCLUDES += -I$(RIOTCPU)/arm_common/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
DIRS = drivers
.PHONY: $(BINDIR)/$(ARCH)
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(CFLAGS_MTHUMB) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(CFLAGS_MTHUMB) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
"$(MAKE)" -C drivers clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

8
boards/redbee-econotag/Makefile.include
View File

@ -2,9 +2,9 @@
export CPU = mc1322x
# toolchain config
export PREFIX = @arm-none-eabi-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = arm-none-eabi-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -march=armv4t -mtune=arm7tdmi-s -mlong-calls \
-msoft-float -mthumb-interwork -fno-strict-aliasing -fno-common \
-ffixed-r8 -ffunction-sections -ffreestanding -fno-builtin \
@ -24,7 +24,7 @@ LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)/$(PROJECT).hex
export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
export OFLAGS = -O binary --gap-fill=0xff

27
boards/redbee-econotag/drivers/Makefile
View File

@ -1,26 +1,7 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/sys/include/
include $(RIOTBOARD)/$(BOARD)/Makefile.include
.PHONY: redbee-econotag_drivers.a
$(BINDIR)redbee-econotag_common_drivers.a: $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_MTHUMB) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(CFLAGS_MTHUMB) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
INCLUDES += -Iinclude
include $(RIOTBASE)/Makefile.base

4
boards/redbee-econotag/drivers/include/uart.h
View File

@ -93,7 +93,7 @@ void uart_init(volatile struct UART_struct *uart, uint32_t baud);
void uart_set_baudrate(volatile struct UART_struct *uart, uint32_t baud);
void uart_flow_ctl(volatile struct UART_struct *uart, uint8_t on);
#undef UART0_BUFSIZE
#define UART0_BUFSIZE (32)
void uart1_putc(uint8_t c);
@ -102,4 +102,4 @@ uint8_t uart1_getc(void);
void uart2_putc(uint8_t c);
uint8_t uart2_getc(void);
#endif
#endif

5
boards/redbee-econotag/drivers/redbee_uart.c
View File

@ -179,7 +179,8 @@ int fw_puts(char *astring, int length)
return uart0_puts((uint8_t *) astring, (uint32_t) length);
}
int bl_uart_init(void)
void bl_uart_init(void)
{
uart_init(UART1, BAUTRATE_UART1);
}
}

35
boards/telosb/Makefile
View File

@ -1,34 +1,3 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = telosb_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I${RIOTBOARD}/${BOARD}/include/
INCLUDES += -I${RIOTBASE}/core/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include/ -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTBASE)/sys/net/include
all: $(BINDIR)$(ARCH)
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
include $(RIOTBASE)/Makefile.base

12
boards/telosb/Makefile.include
View File

@ -4,23 +4,23 @@ export CPU = msp430x16x
export MCU = msp430f1611
# toolchain config
export PREFIX = @msp430-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = msp430-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU)
export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)startup.o
export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export FLASHER = goodfet.bsl
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I $(RIOTBOARD)/$(BOARD)/include/
export INCLUDES += -I $(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
export OFLAGS = -O ihex

36
boards/wsn430-common/Makefile
View File

@ -1,33 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/wsn430-common/include/ -I${RIOTBOARD}/${BOARD}/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/
DIRS = drivers
.PHONY: $(BINDIR)$(ARCH)
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
#$(MAKE) -C drivers
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
echo $(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
#$(MAKE) -C drivers clean
rm -f $(OBJ) $(DEP)
rm -f $(BINDIR)$(ARCH)
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

12
boards/wsn430-common/Makefile.include
View File

@ -3,23 +3,23 @@ export CPU = msp430x16x
export MCU = msp430f1611
# toolchain config
export PREFIX = @msp430-
export CC = @$(PREFIX)gcc
export AR = @$(PREFIX)ar
export PREFIX = msp430-
export CC = $(PREFIX)gcc
export AR = $(PREFIX)ar
export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU)
export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)startup.o
export FLASHER = mspdebug
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
export HEXFILE = $(BINDIR)$(PROJECT).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBASE)/sys/net/include/
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
export OFLAGS = -O ihex

5
boards/wsn430-common/drivers/Makefile
View File

@ -0,0 +1,5 @@
MODULE =$(BOARD)_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTBASE)/Makefile.base

40
boards/wsn430-v1_3b/Makefile
View File

@ -1,36 +1,12 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = wsn430-v1_3b_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = $(RIOTBOARD)/wsn430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
INCLUDES += -I${RIOTBASE}/core/include/
INCLUDES += -Iinclude/ -I$(RIOTBOARD)/wsn430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/include
#INCLUDES += -I/usr/msp430/include/
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C ../wsn430-common
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C ../wsn430-common clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

2
boards/wsn430-v1_3b/Makefile.include
View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include -I$(RIOTBOARD)/wsn430-common/include
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include

38
boards/wsn430-v1_4/Makefile
View File

@ -1,35 +1,11 @@
SRC = $(wildcard *.c)
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
export ARCH = wsn430-v1_4_base.a
MODULE =$(BOARD)_base
DEP = $(SRC:%.c=$(BINDIR)%.d)
DIRS = $(RIOTBOARD)/wsn430-common
INCLUDES += -I${RIOTBASE}/core/include/
INCLUDES += -Iinclude/ -I$(RIOTBOARD)/wsn430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include/ -I$(RIOTBASE)/sys/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
all: $(BINDIR)$(ARCH)
$(MAKE) -C ../wsn430-common
include $(RIOTBASE)/Makefile.base
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
mkdir -p $(BINDIR)
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
$(MAKE) -C ../wsn430-common clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

2
boards/wsn430-v1_4/Makefile.include
View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include

2
core/Makefile
View File

@ -1,5 +1,3 @@
MODULE =core
INCLUDES += -Iinclude/ -I../sys/include -I../sys/lib -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include
include $(RIOTBASE)/Makefile.base

42
cpu/Makefile
View File

@ -1,42 +0,0 @@
ifeq ($(CPU),lpc1768)
DIRS = lpc1768
endif
ifeq ($(CPU),lpc2387)
DIRS = arm_common lpc_common lpc2387
endif
ifeq ($(CPU),mc1322x)
DIRS = arm_common mc1322x
endif
ifeq ($(CPU),cc430)
DIRS = msp430-common cc430
endif
ifeq ($(CPU),msp430x16x)
DIRS = msp430-common msp430x16x
endif
ifeq ($(CPU),native)
DIRS = native
endif
.PHONY: cpus
.PHONY: $(DIRS)
cpus: $(DIRS)
$(DIRS):
@"$(MAKE)" -C $@
clean:
@"$(MAKE)" -C lpc1768 clean
@"$(MAKE)" -C lpc2387 clean
@"$(MAKE)" -C mc1322x clean
@"$(MAKE)" -C lpc_common clean
@"$(MAKE)" -C arm_common clean
@"$(MAKE)" -C cc430 clean
@"$(MAKE)" -C msp430-common clean
@"$(MAKE)" -C msp430x16x clean
@"$(MAKE)" -C native clean

24
cpu/Makefile.base
View File

@ -1,24 +0,0 @@
ifeq ($(CPU),lpc1768)
INCLUDES += -I$(MAKEBASE)/cpu/lpc1768/include
endif
ifeq ($(CPU),lpc2387)
INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
INCLUDES += -I$(MAKEBASE)/cpu/lpc_common/include/
INCLUDES += -I$(MAKEBASE)/cpu/lpc2387/include
endif
ifeq ($(CPU),mc1322x)
INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
INCLUDES += -I$(MAKEBASE)/cpu/mc1322x/include
endif
ifeq ($(CPU),msp430x16x)
INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/
INCLUDES += -I$(MAKEBASE)/cpu/msp430x16x/include/
endif
ifeq ($(CPU),cc430)
INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/
INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
endif
ifeq ($(CPU),native)
INCLUDES += -I$(MAKEBASE)/cpu/native/include/
endif

19
cpu/Makefile.include
View File

@ -1,19 +0,0 @@
### Minimal setup
ifeq ($(CPU),lpc1768)
export UNDEF += $(BINDIR)syscalls.o
endif
ifeq ($(CPU),lpc2387)
export USEMODULE += arm_common lpc_common
export UNDEF += $(BINDIR)syscalls.o $(BINDIR)lpc_syscalls.o
export INCLUDES += -I$(RIOTCPU)/arm_common/include
export INCLUDES += -I$(RIOTCPU)/lpc_common/include
endif
ifeq ($(CPU),mc1322x)
export USEMODULE += arm_common
export UNDEF += $(BINDIR)syscalls.o
export UNDEF += $(BINDIR)mc1322x_syscalls.o
export INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include
endif
ifeq ($(CPU),native)
export INCLUDES += -I$(RIOTCPU)/native/include
endif

1
cpu/arm_common/Makefile
View File

@ -1,5 +1,4 @@
MODULE =arm_common
INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../.. -I../../sys/lib/fat
CFLAGS += $(CFLAGS_BASIC)
include $(RIOTBASE)/Makefile.base

4
cpu/arm_common/Makefile.include Normal file
View File

@ -0,0 +1,4 @@
INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
export UNDEF += $(BINDIR)syscalls.o

5
cpu/cc430/Makefile
View File

@ -1,7 +1,8 @@
MODULE = cpu
INCLUDES += -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/cc110x_ng/include
DIRS =
DIRS = $(RIOTCPU)/msp430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

4
cpu/cc430/Makefile.include Normal file
View File

@ -0,0 +1,4 @@
INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
include $(RIOTCPU)/msp430-common/Makefile.include

3
cpu/lpc1768/Makefile
View File

@ -7,9 +7,6 @@ CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3
LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(PROJECT).map,--cref --specs=nano.specs
LD_SYS_LIBS = -lc -lgcc -lnosys
INCLUDES = -Iinclude
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/lib
all: $(BINDIR)$(MODULE).a
include $(RIOTBASE)/Makefile.base

3
cpu/lpc1768/Makefile.include Normal file
View File

@ -0,0 +1,3 @@
INCLUDES += -I$(MAKEBASE)/cpu/lpc1768/include
export UNDEF += $(BINDIR)syscalls.o

1
cpu/lpc1768/include/LPC17xx.h
View File

@ -97,7 +97,6 @@ typedef enum IRQn
#include "core_cm3.h" /* Cortex-M3 processor and core peripherals */
#include "system_LPC17xx.h" /* System Header */
/******************************************************************************/

2
cpu/lpc1768/include/cpu-conf.h
View File

@ -13,6 +13,8 @@
#endif
#define KERNEL_CONF_STACKSIZE_IDLE 1000
#define UART0_BUFSIZE (128)
/** @} */
#endif /* CPU_CONF_H */

5
cpu/lpc2387/Makefile
View File

@ -1,7 +1,8 @@
MODULE =cpu
INCLUDES = -I../include -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
DIRS =
include $(RIOTCPU)/$(CPU)/Makefile.include
DIRS = $(RIOTCPU)/arm_common $(RIOTCPU)/lpc_common
ifneq (,$(findstring gpioint,$(USEMODULE)))
DIRS += gpioint
endif

7
cpu/lpc2387/Makefile.include Normal file
View File

@ -0,0 +1,7 @@
INCLUDES += -I$(RIOTCPU)/lpc2387/include
include $(RIOTCPU)/arm_common/Makefile.include
include $(RIOTCPU)/lpc_common/Makefile.include
export USEMODULE += arm_common lpc_common

2
cpu/lpc2387/gpioint/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
MODULE =gpioint
include $(MAKEBASE)/Makefile.base

2
cpu/lpc2387/i2c/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
MODULE =i2c
include $(MAKEBASE)/Makefile.base

2
cpu/lpc2387/mci/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
MODULE =mci
include $(MAKEBASE)/Makefile.base

2
cpu/lpc2387/rtc/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
MODULE =rtc
include $(MAKEBASE)/Makefile.base

3
cpu/lpc_common/Makefile.include Normal file
View File

@ -0,0 +1,3 @@
INCLUDES += -I$(RIOTCPU)/lpc_common/include
export UNDEF += $(BINDIR)lpc_syscalls.o

2
cpu/mc1322x/Makefile
View File

@ -1,6 +1,6 @@
MODULE =cpu
DIRS =
DIRS = $(RIOTCPU)/arm_common
ifneq (,$(findstring mc1322x_adc,$(USEMODULE)))
DIRS += adc
endif

7
cpu/mc1322x/Makefile.include Normal file
View File

@ -0,0 +1,7 @@
INCLUDES += -I$(MAKEBASE)/cpu/mc1322x/include
include $(RIOTCPU)/arm_common/Makefile.include
export UNDEF += $(BINDIR)mc1322x_syscalls.o
export USEMODULE += arm_common

20
cpu/mc1322x/gpio.c
View File

@ -10,19 +10,19 @@
#include "gpio.h"
inline void gpio_pad_dir(volatile uint64_t data)
static inline void gpio_pad_dir(volatile uint64_t data)
{
GPIO->PAD_DIR0 = (data & 0xffffffff);
GPIO->PAD_DIR1 = (data >> 32);
}
inline void gpio_data(volatile uint64_t data)
static inline void gpio_data(volatile uint64_t data)
{
GPIO->DATA0 = (data & 0xffffffff);
GPIO->DATA1 = (data >> 32);
}
inline uint64_t gpio_data_get(volatile uint64_t bits) {
static inline uint64_t gpio_data_get(volatile uint64_t bits) {
uint64_t rdata = 0;
rdata = GPIO->DATA0 & (bits & 0xffffffff);
@ -31,43 +31,43 @@ inline uint64_t gpio_data_get(volatile uint64_t bits) {
return rdata;
}
inline void gpio_pad_pu_en(volatile uint64_t data)
static inline void gpio_pad_pu_en(volatile uint64_t data)
{
GPIO->PAD_PU_EN0 = (data & 0xffffffff);
GPIO->PAD_PU_EN1 = (data >> 32);
}
inline void gpio_data_sel(volatile uint64_t data)
static inline void gpio_data_sel(volatile uint64_t data)
{
GPIO->DATA_SEL0 = (data & 0xffffffff);
GPIO->DATA_SEL1 = (data >> 32);
}
inline void gpio_pad_pu_sel(volatile uint64_t data)
static inline void gpio_pad_pu_sel(volatile uint64_t data)
{
GPIO->PAD_PU_SEL0 = (data & 0xffffffff);
GPIO->PAD_PU_SEL1 = (data >> 32);
}
inline void gpio_data_set(volatile uint64_t data)
static inline void gpio_data_set(volatile uint64_t data)
{
GPIO->DATA_SET0 = (data & 0xffffffff);
GPIO->DATA_SET1 = (data >> 32);
}
inline void gpio_data_reset(volatile uint64_t data)
static inline void gpio_data_reset(volatile uint64_t data)
{
GPIO->DATA_RESET0 = (data & 0xffffffff);
GPIO->DATA_RESET1 = (data >> 32);
}
inline void gpio_pad_dir_set(volatile uint64_t data)
static inline void gpio_pad_dir_set(volatile uint64_t data)
{
GPIO->PAD_DIR_SET0 = (data & 0xffffffff);
GPIO->PAD_DIR_SET1 = (data >> 32);
}
inline void gpio_pad_dir_reset(volatile uint64_t data)
static inline void gpio_pad_dir_reset(volatile uint64_t data)
{
GPIO->PAD_DIR_RESET0 = (data & 0xffffffff);
GPIO->PAD_DIR_RESET1 = (data >> 32);

1
cpu/msp430-common/Makefile
View File

@ -1,6 +1,5 @@
MODULE =msp430_common
INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
DIRS =
all: $(BINDIR)$(MODULE).a

2
cpu/msp430-common/Makefile.include Normal file
View File

@ -0,0 +1,2 @@
INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/

5
cpu/msp430x16x/Makefile
View File

@ -1,7 +1,8 @@
MODULE =cpu
INCLUDES = -I../include -I$(RIOTBASE)/core/include
DIRS =
include $(RIOTCPU)/$(CPU)/Makefile.include
DIRS = $(RIOTCPU)/msp430-common/
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

4
cpu/msp430x16x/Makefile.include Normal file
View File

@ -0,0 +1,4 @@
INCLUDES += -I$(RIOTCPU)/msp430x16x/include/
include $(RIOTCPU)/msp430-common/Makefile.include

4
cpu/native/Makefile
View File

@ -1,7 +1,5 @@
MODULE = cpu
INCLUDES += -I../include -I$(RIOTBASE)/core/include
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
DIRS =
@ -18,7 +16,7 @@ all: $(BINDIR)$(MODULE).a
include $(RIOTBASE)/Makefile.base
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
@$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d

2
cpu/native/Makefile.include Normal file
View File

@ -0,0 +1,2 @@
export INCLUDES += -I$(RIOTCPU)/native/include

4
cpu/native/net/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/include
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
MODULE = nativenet
@ -7,7 +5,7 @@ MODULE = nativenet
include $(MAKEBASE)/Makefile.base
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
@$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d

2
cpu/native/rtc/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
MODULE =rtc
include $(MAKEBASE)/Makefile.base

2
dist/Makefile vendored
View File

@ -35,4 +35,6 @@ export RIOTBASE =$(CURDIR)/../../RIOT
export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
export QUIET := 1
include $(RIOTBASE)/Makefile.include

3
drivers/Makefile
View File

@ -45,6 +45,3 @@ include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

1
drivers/at86rf231/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =at86rf231
DIRS =

3
drivers/cc110x/Makefile
View File

@ -1,7 +1,4 @@
MODULE =cc110x
INCLUDES += -I$(RIOTBASE)/sys/net/include
include $(MAKEBASE)/Makefile.base

1
drivers/cc110x_ng/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
MODULE =cc110x_ng
DIRS =

2
drivers/cc110x_ng/spi/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
MODULE =cc110x_spi
include $(MAKEBASE)/Makefile.base

1
drivers/cc2420/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =cc2420
DIRS =

2
drivers/lm75a/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include -I$(RIOTBOARD)/$(BOARD)/include
MODULE =lm75a
include $(MAKEBASE)/Makefile.base

2
drivers/ltc4150/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/
MODULE =ltc4150
include $(MAKEBASE)/Makefile.base

2
drivers/sht11/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
MODULE =sht11
include $(MAKEBASE)/Makefile.base

2
drivers/srf02/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf02
include $(MAKEBASE)/Makefile.base

2
drivers/srf08/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf08
include $(MAKEBASE)/Makefile.base

21
sys/Makefile
View File

@ -1,5 +1,3 @@
INCLUDES += -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include
MODULE =sys
ifneq (,$(findstring auto_init,$(USEMODULE)))
DIRS += auto_init
@ -10,28 +8,14 @@ endif
ifneq (,$(findstring lib,$(USEMODULE)))
DIRS += lib
endif
ifneq (,$(findstring cmdd,$(USEMODULE)))
DIRS += cmdd
endif
ifneq (,$(findstring mprint,$(USEMODULE)))
DIRS += mprint
endif
ifneq (,$(findstring ping,$(USEMODULE)))
DIRS += ping
endif
ifneq (,$(findstring ps,$(USEMODULE)))
DIRS += ps
endif
ifneq (,$(findstring sync_read,$(USEMODULE)))
DIRS += sync_read
endif
ifneq (,$(findstring sysmon,$(USEMODULE)))
DIRS += sysmon
endif
ifneq (,$(findstring mqueue,$(USEMODULE)))
DIRS += mqueue
endif
ifneq (,$(findstring posix,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/posix/include
DIRS += posix
endif
ifneq (,$(findstring shell,$(USEMODULE)))
@ -55,9 +39,6 @@ endif
ifneq (,$(findstring destiny,$(USEMODULE)))
DIRS += net/transport_layer/destiny
endif
ifneq (,$(findstring net_mm,$(USEMODULE)))
DIRS += net/mm
endif
ifneq (,$(findstring net_help,$(USEMODULE)))
DIRS += net/crosslayer/net_help
endif

20
sys/auto_init/auto_init.c
View File

@ -19,6 +19,26 @@
#include "auto_init.h"
#ifdef MODULE_HWTIMER
#include "hwtimer.h"
#endif
#ifdef MODULE_SHT11
#include "sht11.h"
#endif
#ifdef MODULE_GPIOINT
#include "gpioint.h"
#endif
#ifdef MODULE_CC110X
#include "cc1100-interface.h"
#endif
#ifdef MODULE_LTC4150
#include "ltc4150.h"
#endif
#ifdef MODULE_UART0
#include "board_uart0.h"
#endif

1
sys/bloom/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE = bloom
include $(RIOTBASE)/Makefile.base

1
sys/config/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE =config
include $(RIOTBASE)/Makefile.base

1
sys/hashes/Makefile
View File

@ -1,4 +1,3 @@
INCLUDES = -I../include
MODULE = hashes
include $(RIOTBASE)/Makefile.base

20
sys/include/auto_init.h
View File

@ -22,26 +22,6 @@
#ifndef AUTO_INIT_H
#define AUTO_INIT_H
#ifdef MODULE_HWTIMER
#include "hwtimer.h"
#endif
#ifdef MODULE_SHT11
#include "sht11.h"
#endif
#ifdef MODULE_GPIOINT
#include "gpioint.h"
#endif
#ifdef MODULE_CC110X
#include "cc1100-interface.h"
#endif
#ifdef MODULE_LTC4150
#include "ltc4150.h"
#endif
void auto_init(void);
/** @} */

0
sys/lib/hash_string.h → sys/include/hash_string.h
View File

0
sys/lib/hashtable.h → sys/include/hashtable.h
View File

Some files were not shown because too many files have changed in this diff Show More