From d844d13504de6523f6a5f77cd9ec8604584bdefe Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Dec 2009 13:55:38 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1433
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM3-STM32F103-FATFS-GCC/Makefile |  9 +++--
 demos/ARMCM3-STM32F103-FATFS-GCC/board.c  | 49 ----------------------
 demos/ARMCM3-STM32F103-FATFS-GCC/board.h  | 67 -------------------------------
 3 files changed, 6 insertions(+), 119 deletions(-)
 delete mode 100644 demos/ARMCM3-STM32F103-FATFS-GCC/board.c
 delete mode 100644 demos/ARMCM3-STM32F103-FATFS-GCC/board.h

(limited to 'demos')

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
index 95989b6a2..121d72b9f 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
@@ -57,8 +57,9 @@ LDSCRIPT= ch.ld
 
 # Imported source files
 CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
+include ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.mk
 include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk
+include ${CHIBIOS}/os/hal/hal.mk
 include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk
 include ${CHIBIOS}/os/kernel/kernel.mk
 include ${CHIBIOS}/test/test.mk
@@ -71,10 +72,11 @@ CSRC = ${PORTSRC} \
        ${TESTSRC} \
        ${HALSRC} \
        ${PLATFORMSRC} \
+       ${BOARDSRC} \
        ${FATFSSRC} \
        ${CHIBIOS}/os/various/evtimer.c \
        ${CHIBIOS}/os/various/syscalls.c \
-       board.c main.c
+       main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
@@ -104,7 +106,8 @@ TCPPSRC =
 ASMSRC = $(PORTASM) \
          ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s
 
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+         $(HALINC) $(PLATFORMINC) ${BOARDINC} \
          $(FATFSINC) \
          ${CHIBIOS}/os/various
 
diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/board.c b/demos/ARMCM3-STM32F103-FATFS-GCC/board.c
deleted file mode 100644
index 8c33354ae..000000000
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/board.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Early initialization code.
- * This initialization is performed just after reset before BSS and DATA
- * segments initialization.
- */
-void hwinit0(void) {
-
-  stm32_clock_init();
-}
-
-/*
- * Late initialization code.
- * This initialization is performed after BSS and DATA segments initialization
- * and before invoking the main() function.
- */
-void hwinit1(void) {
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
-
-  /*
-   * ChibiOS/RT initialization.
-   */
-  chSysInit();
-}
diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/board.h b/demos/ARMCM3-STM32F103-FATFS-GCC/board.h
deleted file mode 100644
index 588ea3c5d..000000000
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/board.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Board frequencies.
- */
-#define LSECLK          32768
-#define HSECLK          8000000
-#define HSICLK          8000000
-
-/*
- * IO pins assignments.
- */
-#define GPIOA_BUTTON            0
-#define GPIOA_SPI1NSS           4
-
-#define GPIOB_SPI2NSS           12
-
-#define GPIOC_MMCWP             6
-#define GPIOC_MMCCP             7
-#define GPIOC_CANCNTL           10
-#define GPIOC_DISC              11
-#define GPIOC_LED               12
-
-/*
- * All inputs with pullups unless otherwise specified.
- */
-#define VAL_GPIOACRL            0x88888884      // PA0:FI
-#define VAL_GPIOACRH            0x88888888
-#define VAL_GPIOAODR            0xFFFFFFFF
-
-#define VAL_GPIOBCRL            0x88883888      // PB3:PP
-#define VAL_GPIOBCRH            0x88888888
-#define VAL_GPIOBODR            0xFFFFFFFF
-
-#define VAL_GPIOCCRL            0x44888888      // PC6,PC7:FI
-#define VAL_GPIOCCRH            0x88833888      // PC11,PC12:PP
-#define VAL_GPIOCODR            0xFFFFFFFF
-
-#define VAL_GPIODCRL            0x88888844      // PD0,PD1:FI
-#define VAL_GPIODCRH            0x88888888
-#define VAL_GPIODODR            0xFFFFFFFF
-
-#define VAL_GPIOECRL            0x88888888
-#define VAL_GPIOECRH            0x88888888
-#define VAL_GPIOEODR            0xFFFFFFFF
-
-#endif /* _BOARD_H_ */
-- 
cgit v1.2.3