concrete board implementation

Fixes #8

Makefile

@@ -16,9 +16,9 @@ include board/$(BOARD)/build.mk
 
 # Transform the configuration into make variables
 includes = \
+	board/$(BOARD) \
 	include \
 	include/platform \
-	include/platform/$(CHIP) \
 	$(dirs) $(out)
 $(eval BOARD_$(BOARD)=y)
 

Makefile.toolchain

@@ -16,7 +16,9 @@ CFLAGS_WARN = -Wall
 CFLAGS_DEBUG= -g3
 CFLAGS_INCLUDE=$(foreach i,$(includes),-I$(i) )
 CFLAGS_DEFINE = \
-	-D __PLATFORM__=$(CHIP) -D __BOARD_HEADER__="$(BOARD).h" \
+	-D __PLATFORM__=$(CHIP) \
+	-D __BOARD__=$(BOARD) \
+	-D'INC_PLAT(x)=<platform/__PLATFORM__/x>' \
 	-DDEBUG
 CPPFLAGS = \
 	$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(EXTRA_CFLAGS)

board/discoveryf4/board.c

@@ -3,16 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include "platform/stm32f4/discoveryf4.h"
+#include <platform/stm32f4/gpio.h>
+#include <platform/stm32f4/usart.h>
 
-/* FIXME: should be generated by build system */
 struct usart_dev console_uart = {
 	.u_num = 4,
 	.baud = 115200,
 	.base = UART4_BASE,
 	.rcc_apbenr = RCC_UART4_APBENR,
 	.rcc_reset = RCC_APB1RSTR_USART4RST,
-	.tx = {                                                                                                   
+	.tx = {
 		.port = GPIOA,
 		.pin = 0,
 		.pupd = GPIO_PUPDR_NONE,

include/platform/stm32f4/discoveryf4.h → board/discoveryf4/board.h

@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef PLATFORM_STM32F4_DISCOVERYF4_H_
-#define PLATFORM_STM32F4_DISCOVERYF4_H_
+#ifndef DISCOVERYF4_BOARD_H_
+#define DISCOVERYF4_BOARD_H_
 
 #include <platform/stm32f4/registers.h>
 #include <platform/stm32f4/gpio.h>
@@ -14,4 +14,4 @@
 
 extern struct usart_dev console_uart;
 
-#endif	/* PLATFORM_STM32F4_DISCOVERYF4_H_ */
+#endif	/* DISCOVERYF4_BOARD_H_ */

kernel/init.c

@@ -5,10 +5,6 @@
 
 #include <platform/debug_uart.h>
 
-/* FIXME: move to platform specific */
-#define INC_PLAT(x)     <platform/__PLATFORM__/x>
-#include INC_PLAT(nvic.h)
-
 #include <debug.h>
 #include <error.h>
 
@@ -48,6 +44,8 @@ void nmi_handler()
 
 extern void (* const g_pfnVectors[])();
 
+#include INC_PLAT(nvic.h)
+
 __ISR_VECTOR
 void (* const g_pfnVectors[])() = {
 	/* Core Level - ARM Cortex-M */

kernel/ktimer.c

@@ -3,8 +3,6 @@
  * found in the LICENSE file.
  */
 
-/* FIXME: move to platform specific */
-#define INC_PLAT(x)	<platform/__PLATFORM__/x>
 #include INC_PLAT(systick.h)
 
 #include <debug.h>

kernel/start.c

@@ -7,8 +7,6 @@
  * __l4_start initializes microcontroller
  */
 
-/* FIXME: move to platform specific */
-#define INC_PLAT(x)	<platform/__PLATFORM__/x>
 #include INC_PLAT(gpio.h)
 #include INC_PLAT(rcc.h)
 

platform/debug_uart.c

@@ -8,8 +8,8 @@
 #include <lib/fifo.h>
 #include <softirq.h>
 
-#define INC_PLAT(x)		<platform/__PLATFORM__/x>
-#include INC_PLAT(__BOARD_HEADER__)
+/* board speficic UART definitions */
+#include "board.h"
 
 static struct dbg_uart_t dbg_uart;
 static uint8_t dbg_uart_tx_buffer[SEND_BUFSIZE];