RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 10:52:44 +01:00
Code Releases Activity

fix and clean up some board Makefiles

Browse Source 
enables building wsn430-v1_3b and wsn430-v1_4
fixes some but not all chronos building issues
This commit is contained in:
Ludwig Ortmann 2013-11-14 21:43:59 +01:00
parent e6eb9e500c
commit f7a1edeb2c
7 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
boards/chronos/Makefile
View File

@ -1,21 +1,22 @@
SRC = $(wildcard *.c) export ARCH = chronos_base.a
BINDIR = bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d) DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -Iinclude -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/drivers/include 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)/sys/drivers/cc110x_ng/include
INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTBASE)/core/include
INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ INCLUDES += -I$(RIOTCPU)/msp430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/ INCLUDES += -I$(RIOTCPU)/cc430/include/
#INCLUDES += -I/usr/msp430/include/
all: $(BINDIR)chronos_base.a all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers $(MAKE) -C drivers
$(BINDIR)chronos_base.a: $(OBJ) $(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)chronos_base.a $(OBJ) mkdir -p $(BINDIR)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files # pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d) -include $(OBJ:.o=.d)
@ -28,8 +29,6 @@ $(BINDIR)%.o: %.c
# remove compilation products # remove compilation products
clean: clean:
rm -f $(BINDIR)chronos_base.a $(OBJ) $(DEP)
$(MAKE) -C drivers clean $(MAKE) -C drivers clean
rm -f $(OBJ) $(DEP)
rm -f $(BINDIR)$(ARCH)

3
boards/chronos/Makefile.include
View File

@ -1,3 +1,6 @@
export INCLUDES += -I$(RIOTBOARD)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include/
export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTCPU)/cc430/include/
## the cpu to build for ## the cpu to build for
export CPU = cc430 export CPU = cc430
export MCU = cc430f6137 export MCU = cc430f6137

3
boards/msb-430/Makefile
View File

@ -32,6 +32,3 @@ clean:
@if [ -d $(BINDIR) ] ; \ @if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \ then rmdir $(BINDIR) ; \
fi fi

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

@ -4,4 +4,4 @@ ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
endif endif
endif endif
USEMODULE += msp430_common USEMODULE += msp430_common

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

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

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

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

2
cpu/cc430/Makefile
View File

@ -1,6 +1,6 @@
MODULE =cpu MODULE =cpu
INCLUDES += -Iinclude -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../.. INCLUDES += -Iinclude -Idrivers/include -I../msp430-common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
DIRS = DIRS =