git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1431 35acf78f-673a-0410-8e92-d51de3d6d3f4

7 files changed, 140 insertions, 75 deletions

diff --git a/demos/ARMCM3-STM32F103-GCC/board.c b/boards/OLIMEX_STM32_P103/board.c
index 8c33354ae..8c33354ae 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.c
+++ b/boards/OLIMEX_STM32_P103/board.c
diff --git a/boards/OLIMEX_STM32_P103/board.h b/boards/OLIMEX_STM32_P103/board.h
new file mode 100644
index 000000000..d9577c056
--- /dev/null
+++ b/boards/OLIMEX_STM32_P103/board.h
@@ -0,0 +1,129 @@
+/*

+    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_

+

+/*

+ * Setup for the Olimex STM33-P103 proto board.
+ */

+

+/*

+ * Board identifier.
+ */

+#define OLIMEX_STM32_P103

+

+/*

+ * 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

+

+/*

+ * I/O ports initial setup, this configuration is established soon after reset

+ * in the initialization code.

+ *

+ * The digits have the following meaning:

+ *   0 - Analog input.

+ *   1 - Push Pull output 10MHz.

+ *   2 - Push Pull output 2MHz.

+ *   3 - Push Pull output 50MHz.

+ *   4 - Digital input.

+ *   5 - Open Drain output 10MHz.

+ *   6 - Open Drain output 2MHz.

+ *   7 - Open Drain output 50MHz.

+ *   8 - Digital input with PullUp or PullDown resistor depending on ODR.

+ *   9 - Alternate Push Pull output 10MHz.

+ *   A - Alternate Push Pull output 2MHz.

+ *   B - Alternate Push Pull output 50MHz.

+ *   C - Reserved.

+ *   D - Alternate Open Drain output 10MHz.

+ *   E - Alternate Open Drain output 2MHz.

+ *   F - Alternate Open Drain output 50MHz.

+ * Please refer to the STM32 Reference Manual for details.

+ */

+

+/*

+ * Port A setup.

+ * Everything input with pull-up except:

+ * PA0  - Normal input      (BUTTON).

+ * PA2  - Alternate output  (USART2 TX).

+ * PA3  - Normal input      (USART2 RX).
+ */

+#define VAL_GPIOACRL            0x88884B84      /*  PA7...PA0 */

+#define VAL_GPIOACRH            0x88888888      /* PA15...PA8 */

+#define VAL_GPIOAODR            0xFFFFFFFF

+

+/*

+ * Port B setup.

+ * Everything input with pull-up except:

+ * PB13 - Alternate output  (MMC SPI2 SCK).

+ * PB14 - Normal input      (MMC SPI2 MISO).

+ * PB15 - Alternate output  (MMC SPI2 MOSI).

+ */

+#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */

+#define VAL_GPIOBCRH            0xB4B88888      /* PB15...PB8 */

+#define VAL_GPIOBODR            0xFFFFFFFF

+

+/*

+ * Port C setup.

+ * Everything input with pull-up except:

+ * PC6  - Normal input because there is an external resistor.

+ * PC7  - Normal input because there is an external resistor.

+ * PC11 - Push Pull output (CAN CNTRL).

+ * PC12 - Push Pull output (LED).

+ */

+#define VAL_GPIOCCRL            0x44888888      /*  PC7...PC0 */

+#define VAL_GPIOCCRH            0x88833888      /* PC15...PC8 */

+#define VAL_GPIOCODR            0xFFFFFFFF

+

+/*

+ * Port D setup.

+ * Everything input with pull-up except:

+ * PD0  - Normal input (XTAL).

+ * PD1  - Normal input (XTAL).

+ */

+#define VAL_GPIODCRL            0x88888844      /*  PD7...PD0 */

+#define VAL_GPIODCRH            0x88888888      /* PD15...PD8 */

+#define VAL_GPIODODR            0xFFFFFFFF

+

+/*

+ * Port E setup.

+ * Everything input with pull-up except:

+ */

+#define VAL_GPIOECRL            0x88888888      /*  PE7...PE0 */

+#define VAL_GPIOECRH            0x88888888      /* PE15...PE8 */

+#define VAL_GPIOEODR            0xFFFFFFFF

+

+#endif /* _BOARD_H_ */

diff --git a/boards/OLIMEX_STM32_P103/board.mk b/boards/OLIMEX_STM32_P103/board.mk
new file mode 100644
index 000000000..701970e84
--- /dev/null
+++ b/boards/OLIMEX_STM32_P103/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.

+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.c

+

+# Required include directories

+BOARDINC = ${CHIBIOS}/boards/OLIMEX_STM32_P103

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index 87293f6f8..afd458186 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-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

@@ -70,9 +71,10 @@ CSRC = ${PORTSRC} \
        ${TESTSRC} \

        ${HALSRC} \

        ${PLATFORMSRC} \

+       ${BOARDSRC} \

        ${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.

@@ -102,7 +104,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} \

          ${CHIBIOS}/os/various

 

 #

diff --git a/demos/ARMCM3-STM32F103-GCC/board.h b/demos/ARMCM3-STM32F103-GCC/board.h
deleted file mode 100644
index 588ea3c5d..000000000
--- a/demos/ARMCM3-STM32F103-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_ */

diff --git a/os/hal/platforms/STM32/serial_lld.c b/os/hal/platforms/STM32/serial_lld.c
index 38a06b266..5d2aea67a 100644
--- a/os/hal/platforms/STM32/serial_lld.c
+++ b/os/hal/platforms/STM32/serial_lld.c
@@ -212,17 +212,14 @@ void sd_lld_init(void) {
 

 #if USE_STM32_USART1

   sdObjectInit(&SD1, NULL, notify1);

-  GPIOA->CRH = (GPIOA->CRH & 0xFFFFF00F) | 0x000004B0;

 #endif

 

 #if USE_STM32_USART2

   sdObjectInit(&SD2, NULL, notify2);

-  GPIOA->CRL = (GPIOA->CRL & 0xFFFF00FF) | 0x00004B00;

 #endif

 

 #if USE_STM32_USART3

   sdObjectInit(&SD3, NULL, notify3);

-  GPIOB->CRH = (GPIOB->CRH & 0xFFFF00FF) | 0x00004B00;

 #endif

 }

 

diff --git a/os/hal/platforms/STM32/spi_lld.c b/os/hal/platforms/STM32/spi_lld.c
index 0a3876464..64343c8d7 100644
--- a/os/hal/platforms/STM32/spi_lld.c
+++ b/os/hal/platforms/STM32/spi_lld.c
@@ -192,7 +192,6 @@ void spi_lld_init(void) {
   SPID1.spd_dmarx   = DMA1_Channel2;

   SPID1.spd_dmatx   = DMA1_Channel3;

   SPID1.spd_dmaprio = STM32_SPI1_DMA_PRIORITY << 12;

-  GPIOA->CRL = (GPIOA->CRL & 0x000FFFFF) | 0xB4B00000;

 #endif

 

 #if USE_STM32_SPI2

@@ -204,7 +203,6 @@ void spi_lld_init(void) {
   SPID2.spd_dmarx   = DMA1_Channel4;

   SPID2.spd_dmatx   = DMA1_Channel5;

   SPID2.spd_dmaprio = STM32_SPI2_DMA_PRIORITY << 12;

-  GPIOB->CRH = (GPIOB->CRH & 0x000FFFFF) | 0xB4B00000;

 #endif

 }