Merge remote-tracking branch 'upstream/master'

makefile.base → Makefile.base

@@ -1,8 +1,8 @@
-  ASMSRC = $(wildcard *.s)
-  ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
-  SRC = $(wildcard *.c)
-  OBJ = $(SRC:%.c=$(BINDIR)%.o)
-  DEP = $(SRC:%.c=$(BINDIR)%.d)
+ASMSRC = $(wildcard *.s)
+ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
+SRC = $(wildcard *.c)
+OBJ = $(SRC:%.c=$(BINDIR)%.o)
+DEP = $(SRC:%.c=$(BINDIR)%.d)
 
 ifeq ($(CPU),lpc2387)
  INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
@@ -28,6 +28,11 @@ ifeq ($(BOARD),msba2)
  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/

Makefile.include

@@ -0,0 +1,45 @@
+# if you want to publish the board into the sources as an uppercase #define
+BB = $(shell echo $(BOARD)|tr 'a-z' 'A-Z')
+CFLAGS += -DBOARD=$(BB)
+export CFLAGS
+
+# mandatory include! 
+include $(RIOTBASE)/Makefile.modules 
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
+
+# your binaries to link
+BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
+BASELIBS += $(PROJBINDIR)/project.a
+
+PROJBINDIR =$(CURDIR)/bin
+
+## make script for your project. Build RIOT-base here!
+all: $(PROJBINDIR)/$(PROJECT).a
+	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
+	$(MAKE) -C $(RIOTBOARD)
+	$(MAKE) -C $(RIOTBASE)
+	$(LINK) $(LINKFLAGS) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group  -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map
+	$(SIZE) $(PROJBINDIR)/$(PROJECT).elf
+	$(OBJCOPY) -O ihex $(PROJBINDIR)/$(PROJECT).elf $(PROJBINDIR)/$(PROJECT).hex
+
+## 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 
+
+$(PROJBINDIR)/$(PROJECT).o: main.c 
+	$(CC) $(CFLAGS) $(BOARDINCLUDE) $(INCLUDES) -c main.c -o $(PROJBINDIR)/$(PROJECT).o
+
+clean:
+	$(MAKE) -C $(RIOTBOARD) clean
+	$(MAKE) -C $(RIOTBASE) clean
+	rm -f $(PROJBINDIR)/*
+
+flash: all
+	$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
+
+term:
+	$(TERM) $(PORT)
+
+doc:
+	make -BC $(RIOTBASE) doc

makefile.modules → Makefile.modules

@@ -25,6 +25,6 @@ BL=$(USEMODULE:%= $(BINDIR)%.a)
 export BASELIBS = $(shell echo $(BL)|sed 's/[^ ]*hwtimer.a//')
 CFLAGS += $(EXTDEFINES)
 
-include $(RIOTBASE)/makefile.dep
+include $(RIOTBASE)/Makefile.dep
 
 export USEMODULE

core/makefile → core/Makefile

@@ -2,4 +2,4 @@ MODULE =core
 
 INCLUDES = -Iinclude/ -I../sys/include -I../sys/lib -I../sys/drivers/include -I../cpu/$(CPU)/include/ -I../.. -I../drivers/include/
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base

core/include/atomic.h

@@ -9,7 +9,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 

core/include/bitarithm.h

@@ -10,7 +10,7 @@
  * @ingroup	lib
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 

core/include/clist.h

@@ -11,7 +11,7 @@
  * @ingroup	lib
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 

core/include/debug.h

@@ -11,7 +11,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  * @}
  */

core/include/hwtimer.h

@@ -15,7 +15,7 @@
  * @{
  * @file
  *
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Heiko Will
  * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @author Michael Baar

core/include/hwtimer_arch.h

@@ -9,7 +9,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author Heiko Will <hwill@inf.fu-berlin.de>
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
@@ -41,8 +41,7 @@ void hwtimer_arch_disable_interrupt(void);
 void hwtimer_arch_set(unsigned long offset, short timer);
 
 /**
- * Set a kernel timer to raise an interrupt after ::offset kernel timer ticks
- * from now.
+ * Set a kernel timer to raise an interrupt at specified system time.
  */
 void hwtimer_arch_set_absolute(unsigned long value, short timer);
 

core/include/kernel.h

@@ -9,7 +9,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 

core/include/kernel_intern.h

@@ -2,7 +2,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/lpm.h

@@ -11,7 +11,7 @@
  * @file
  * @brief       Power Management Interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision$
  *
  * This interface needs to be implemented for each platform.

core/include/msg.h

@@ -1,5 +1,5 @@
 /**
- *  There are two ways to use the IPC Messaging system of µkleos. The default is synchronous
+ *  There are two ways to use the IPC Messaging system of RIOT. The default is synchronous
  *  messaging. In this manner, messages are either dropped when the receiver is not waiting and the
  *  message was sent non-blocking, or will be delivered immediately when the receiver calls
  *  msg_receive(msg_t* m). To use asynchronous messaging any thread can create its own queue by
@@ -14,7 +14,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/mutex.h

@@ -6,7 +6,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/oneway_malloc.h

@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/queue.h

@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/sched.h

@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/tcb.h

@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/include/thread.h

@@ -9,7 +9,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 

core/kernel_init.c

@@ -68,7 +68,7 @@ static char idle_stack[KERNEL_CONF_STACKSIZE_IDLE];
 void kernel_init(void)
 {
     dINT();
-    printf("kernel_init(): This is ukleos!\n");
+    printf("kernel_init(): This is RIOT!\n");
 
     sched_init();
 

core/sched.c

@@ -1,5 +1,5 @@
 /**
- * The µkleos scheduler implementation
+ * The RIOT scheduler implementation
  *
  * Copyright (C) 2010 Freie Universität Berlin
  *

cpu/arm_common/makefile → cpu/arm_common/Makefile

@@ -1,7 +1,7 @@
 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
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 
 

cpu/arm_common/bootloader.c

@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief       ARM bootloader
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision$

cpu/arm_common/hwtimer_cpu.c

@@ -4,7 +4,7 @@
  * @internal
  * @brief       ARM kernel timer CPU dependent functions implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  *

cpu/arm_common/include/arm_common.h

@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		ARM CPU common declarations
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision$
  *
  * @note		$Id$

cpu/arm_common/syscalls.c

@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		lpc2387
  * @brief		LPC2387 NewLib system calls implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision$
  *

cpu/cc430/makefile → cpu/cc430/Makefile

@@ -6,7 +6,7 @@ DIRS =
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;

cpu/cc430/cc430-gpioint.c

@@ -4,14 +4,14 @@ Copyright 2010, Freie Universität Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.