Added command line board files generation tool. Regenerated all board files automatically.

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

4 files changed, 176 insertions, 17 deletions

diff --git a/os/hal/boards/OLIMEX_STM32_H407/board.c b/os/hal/boards/OLIMEX_STM32_H407/board.c
index ac6985656..1796841ac 100644
--- a/os/hal/boards/OLIMEX_STM32_H407/board.c
+++ b/os/hal/boards/OLIMEX_STM32_H407/board.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -20,14 +20,76 @@
  */

 

 #include "hal.h"

+#include "stm32_gpio.h"

+

+/*===========================================================================*/

+/* Driver local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported variables.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local variables and types.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief   Type of STM32 GPIO port setup.

+ */

+typedef struct {

+  uint32_t              moder;

+  uint32_t              otyper;

+  uint32_t              ospeedr;

+  uint32_t              pupdr;

+  uint32_t              odr;

+  uint32_t              afrl;

+  uint32_t              afrh;

+} gpio_setup_t;

+

+/**

+ * @brief   Type of STM32 GPIO initialization data.

+ */

+typedef struct {

+#if STM32_HAS_GPIOA || defined(__DOXYGEN__)

+  gpio_setup_t          PAData;

+#endif

+#if STM32_HAS_GPIOB || defined(__DOXYGEN__)

+  gpio_setup_t          PBData;

+#endif

+#if STM32_HAS_GPIOC || defined(__DOXYGEN__)

+  gpio_setup_t          PCData;

+#endif

+#if STM32_HAS_GPIOD || defined(__DOXYGEN__)

+  gpio_setup_t          PDData;

+#endif

+#if STM32_HAS_GPIOE || defined(__DOXYGEN__)

+  gpio_setup_t          PEData;

+#endif

+#if STM32_HAS_GPIOF || defined(__DOXYGEN__)

+  gpio_setup_t          PFData;

+#endif

+#if STM32_HAS_GPIOG || defined(__DOXYGEN__)

+  gpio_setup_t          PGData;

+#endif

+#if STM32_HAS_GPIOH || defined(__DOXYGEN__)

+  gpio_setup_t          PHData;

+#endif

+#if STM32_HAS_GPIOI || defined(__DOXYGEN__)

+  gpio_setup_t          PIData;

+#endif

+#if STM32_HAS_GPIOJ || defined(__DOXYGEN__)

+  gpio_setup_t          PJData;

+#endif

+#if STM32_HAS_GPIOK || defined(__DOXYGEN__)

+  gpio_setup_t          PKData;

+#endif

+} gpio_config_t;

 

-#if HAL_USE_PAL || defined(__DOXYGEN__)

 /**

- * @brief   PAL setup.

- * @details Digital I/O ports static configuration as defined in @p board.h.

- *          This variable is used by the HAL when initializing the PAL driver.

+ * @brief   STM32 GPIO static initialization data.

  */

-const PALConfig pal_default_config = {

+static const gpio_config_t gpio_default_config = {

 #if STM32_HAS_GPIOA

   {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,

    VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},

@@ -73,15 +135,81 @@ const PALConfig pal_default_config = {
    VAL_GPIOK_ODR,   VAL_GPIOK_AFRL,   VAL_GPIOK_AFRH}

 #endif

 };

+

+/*===========================================================================*/

+/* Driver local functions.                                                   */

+/*===========================================================================*/

+

+static void gpio_init(stm32_gpio_t *gpiop, const gpio_setup_t *config) {

+

+  gpiop->OTYPER  = config->otyper;

+  gpiop->OSPEEDR = config->ospeedr;

+  gpiop->PUPDR   = config->pupdr;

+  gpiop->ODR     = config->odr;

+  gpiop->AFRL    = config->afrl;

+  gpiop->AFRH    = config->afrh;

+  gpiop->MODER   = config->moder;

+}

+

+static void stm32_gpio_init(void) {

+

+  /* Enabling GPIO-related clocks, the mask comes from the

+     registry header file.*/

+  rccResetAHB1(STM32_GPIO_EN_MASK);

+  rccEnableAHB1(STM32_GPIO_EN_MASK, true);

+

+  /* Initializing all the defined GPIO ports.*/

+#if STM32_HAS_GPIOA

+  gpio_init(GPIOA, &gpio_default_config.PAData);

+#endif

+#if STM32_HAS_GPIOB

+  gpio_init(GPIOB, &gpio_default_config.PBData);

+#endif

+#if STM32_HAS_GPIOC

+  gpio_init(GPIOC, &gpio_default_config.PCData);

+#endif

+#if STM32_HAS_GPIOD

+  gpio_init(GPIOD, &gpio_default_config.PDData);

+#endif

+#if STM32_HAS_GPIOE

+  gpio_init(GPIOE, &gpio_default_config.PEData);

+#endif

+#if STM32_HAS_GPIOF

+  gpio_init(GPIOF, &gpio_default_config.PFData);

+#endif

+#if STM32_HAS_GPIOG

+  gpio_init(GPIOG, &gpio_default_config.PGData);

+#endif

+#if STM32_HAS_GPIOH

+  gpio_init(GPIOH, &gpio_default_config.PHData);

+#endif

+#if STM32_HAS_GPIOI

+  gpio_init(GPIOI, &gpio_default_config.PIData);

+#endif

+#if STM32_HAS_GPIOJ

+  gpio_init(GPIOJ, &gpio_default_config.PJData);

 #endif

+#if STM32_HAS_GPIOK

+  gpio_init(GPIOK, &gpio_default_config.PKData);

+#endif

+}

+

+/*===========================================================================*/

+/* Driver interrupt handlers.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported functions.                                                */

+/*===========================================================================*/

 

 /**

  * @brief   Early initialization code.

- * @details This initialization must be performed just after stack setup

- *          and before any other initialization.

+ * @details GPIO ports and system clocks are initialized before everything

+ *          else.

  */

 void __early_init(void) {

 

+  stm32_gpio_init();

   stm32_clock_init();

 }

 

@@ -134,4 +262,5 @@ bool mmc_lld_is_write_protected(MMCDriver *mmcp) {
  * @todo    Add your board-specific code, if any.

  */

 void boardInit(void) {

+

 }

diff --git a/os/hal/boards/OLIMEX_STM32_H407/board.h b/os/hal/boards/OLIMEX_STM32_H407/board.h
index 0d14f5815..63637149a 100644
--- a/os/hal/boards/OLIMEX_STM32_H407/board.h
+++ b/os/hal/boards/OLIMEX_STM32_H407/board.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -22,6 +22,10 @@
 #ifndef BOARD_H

 #define BOARD_H

 

+/*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

 /*

  * Setup for Olimex STM32-H407 board.

  */

@@ -232,7 +236,6 @@
 #define LINE_JTAG_TMS               PAL_LINE(GPIOA, 13U)

 #define LINE_JTAG_TCK               PAL_LINE(GPIOA, 14U)

 #define LINE_JTAG_TDI               PAL_LINE(GPIOA, 15U)

-

 #define LINE_USB_FS_BUSON           PAL_LINE(GPIOB, 0U)

 #define LINE_USB_HS_FAULT           PAL_LINE(GPIOB, 1U)

 #define LINE_BOOT1                  PAL_LINE(GPIOB, 2U)

@@ -245,7 +248,6 @@
 #define LINE_OTG_HS_VBUS            PAL_LINE(GPIOB, 13U)

 #define LINE_OTG_HS_DM              PAL_LINE(GPIOB, 14U)

 #define LINE_OTG_HS_DP              PAL_LINE(GPIOB, 15U)

-

 #define LINE_ETH_RMII_MDC           PAL_LINE(GPIOC, 1U)

 #define LINE_SPI2_MISO              PAL_LINE(GPIOC, 2U)

 #define LINE_SPI2_MOSI              PAL_LINE(GPIOC, 3U)

@@ -261,20 +263,30 @@
 #define LINE_LED                    PAL_LINE(GPIOC, 13U)

 #define LINE_OSC32_IN               PAL_LINE(GPIOC, 14U)

 #define LINE_OSC32_OUT              PAL_LINE(GPIOC, 15U)

-

 #define LINE_SD_CMD                 PAL_LINE(GPIOD, 2U)

-

-

 #define LINE_USB_FS_FAULT           PAL_LINE(GPIOF, 11U)

-

 #define LINE_SPI2_CS                PAL_LINE(GPIOG, 10U)

 #define LINE_ETH_RMII_TXEN          PAL_LINE(GPIOG, 11U)

 #define LINE_ETH_RMII_TXD0          PAL_LINE(GPIOG, 13U)

 #define LINE_ETH_RMII_TXD1          PAL_LINE(GPIOG, 14U)

-

 #define LINE_OSC_IN                 PAL_LINE(GPIOH, 0U)

 #define LINE_OSC_OUT                PAL_LINE(GPIOH, 1U)

 

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver macros.                                                            */

+/*===========================================================================*/

 

 /*

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

@@ -1351,6 +1363,9 @@
                                      PIN_AFIO_AF(GPIOI_PIN14, 0U) |         \

                                      PIN_AFIO_AF(GPIOI_PIN15, 0U))

 

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

 

 #if !defined(_FROM_ASM_)

 #ifdef __cplusplus

diff --git a/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg
index dfbd0f50b..5acb4785a 100644
--- a/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg
+++ b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg
@@ -5,7 +5,7 @@
   <configuration_settings>

     <templates_path>resources/gencfg/processors/boards/stm32f4xx/templates</templates_path>

     <output_path>..</output_path>

-    <hal_version>3.0.x</hal_version>

+    <hal_version>5.0.x</hal_version>

   </configuration_settings>

     <board_name>Olimex STM32-H407</board_name>

     <board_id>OLIMEX_STM32_H407</board_id>

diff --git a/os/hal/boards/OLIMEX_STM32_H407/cfg/board.fmpp b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.fmpp
new file mode 100644
index 000000000..41754c141
--- /dev/null
+++ b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.fmpp
@@ -0,0 +1,15 @@
+sourceRoot: ../../../../../tools/ftl/processors/boards/stm32f4xx/templates
+outputRoot: ..
+dataRoot: .
+
+freemarkerLinks: {
+    lib: ../../../../../tools/ftl/libs
+}
+
+data : {
+  doc1:xml (
+    board.chcfg
+    {
+    }
+  )
+}