simplify include structure for boards

* do not overwrite CFLAGS in boards Makefile

Makefile.base

@@ -24,7 +24,7 @@ export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
 .PHONY: clean
 
 include $(RIOTCPU)/Makefile.base
-include $(RIOTBOARD)/Makefile.base
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
 $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
 	@$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)

Makefile.include

@@ -50,7 +50,7 @@ endif
 ## make script for your project. Build RIOT-base here!
 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)	
@@ -84,7 +84,7 @@ $(BINDIR)/%.o: %.c $(PROJDEPS)
 	$(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 $(BINDIR)

boards/avsextrem/Makefile

@@ -1,37 +1,13 @@
-SRC = $(wildcard *.c)
-OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
-export ARCH = avsextrem_base.a
+MODULE =$(BOARD)_base
 
-DEP = $(SRC:%.c=$(BINDIR)%.d)
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
-INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
-INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
-INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
-INCLUDES += -I$(RIOTBASE)/drivers/cc110x
+DIRS = drivers $(RIOTBOARD)/msba2-common
 
-all: $(BINDIR)$(ARCH)
-	"$(MAKE)" -C ../msba2-common
-	"$(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 ../msba2-common clean
-	"$(MAKE)" -C drivers clean
-	rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
-	@if [ -d $(BINDIR) ] ; \
-	then rm -rf $(BINDIR) ; \
-	fi
+include $(RIOTBASE)/Makefile.base
 
+clean::
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

boards/avsextrem/Makefile.include

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

boards/avsextrem/board_init.c

@@ -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

boards/avsextrem/drivers/Makefile

@@ -1,23 +1,5 @@
-SRC = $(wildcard *.c)
-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

boards/avsextrem/drivers/avsextrem-cc1100.c

@@ -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

boards/avsextrem/drivers/avsextrem-smb380.c

@@ -977,15 +977,14 @@ 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 */
     SMB380_ssp_write(SMB380_ANY_MOTION_THRES, threshold, SMB380_WRITE_REGISTER);
     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;

boards/avsextrem/drivers/avsextrem-ssp0.c

@@ -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;
 }

boards/chronos/Makefile

@@ -1,34 +1,13 @@
-export ARCH = chronos_base.a
+MODULE =$(BOARD)_base
 
-SRC = $(wildcard *.c)
-OBJ = $(SRC:%.c=$(BINDIR)%.o)
-DEP = $(SRC:%.c=$(BINDIR)%.d)
+include $(RIOTBOARD)/$(BOARD)/Makefile.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)/core/include
-INCLUDES += -I$(RIOTCPU)/msp430-common/include/
-INCLUDES += -I$(RIOTCPU)/cc430/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)
+include $(RIOTBASE)/Makefile.base
 
-# 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)
-	-rm -rf $(BINDIR)
+clean::
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

boards/chronos/Makefile.include

@@ -1,5 +1,4 @@
-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)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include -I$(RIOTCPU)/cc430/include -I$(RIOTCPU)/msp430-common/include
 
 ## the cpu to build for
 export CPU = cc430

boards/mbed_lpc1768/Makefile

@@ -1,27 +1,5 @@
-SRC = $(wildcard *.c)
-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
+include $(RIOTBOARD)/$(BOARD)/Makefile.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

boards/mbed_lpc1768/Makefile.include

@@ -5,7 +5,7 @@ export CPU = lpc1768
 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 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

boards/msb-430-common/Makefile

@@ -1,32 +1,13 @@
-SRC = $(wildcard *.c)
-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/
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
-.PHONY: $(BINDIR)$(ARCH)
+DIRS = drivers
 
-all: $(BINDIR)$(ARCH) 
-	$(MAKE) -C drivers
+all: $(BINDIR)$(MODULE).a
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
-$(BINDIR)$(ARCH): $(OBJ)
-	echo $(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
-	$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
+include $(RIOTBASE)/Makefile.base
 
-# 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 ;

boards/msb-430-common/drivers/Makefile

@@ -1,23 +1,5 @@
-SRC = $(wildcard *.c)
-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