diff --git a/readme.txt b/readme.txt
index 25ab67dbe..f5e095d6e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -75,6 +75,7 @@
   |  +--STM8S/          - STM8S HAL demos.
   +--tools              - Various tools.
      +--eclipse         - Eclipse enhancements.
+     +--gencfg          - Configurations generator tool.
 
 *****************************************************************************
 *** Releases                                                              ***
diff --git a/tools/gencfg/lib/liblicense.ftl b/tools/gencfg/lib/liblicense.ftl
new file mode 100644
index 000000000..18581ee29
--- /dev/null
+++ b/tools/gencfg/lib/liblicense.ftl
@@ -0,0 +1,58 @@
+[#ftl]
+[#--
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012 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/>.
+  --]
+
+[#--
+  -- Emits the ChibiOS/RT standard license exception text.
+  -- The license exception text is indented by 4 spaces.
+  --]
+[#macro EmitLicenseExceptionAsText]
+
+                                      ---
+
+    A special exception to the GPL can be applied should you wish to distribute
+    a combined work that includes ChibiOS/RT, without being obliged to provide
+    the source code for any proprietary components. See the file exception.txt
+    for full details of how and when the exception can be applied.
+[/#macro]
+
+[#--
+  -- Emits the ChibiOS/RT standard license text.
+  -- The license text is indented by 4 spaces.
+  --]
+[#macro EmitLicenseAsText]
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012 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/>.
+[/#macro]
diff --git a/tools/gencfg/lib/libutils.ftl b/tools/gencfg/lib/libutils.ftl
new file mode 100644
index 000000000..03b0622a3
--- /dev/null
+++ b/tools/gencfg/lib/libutils.ftl
@@ -0,0 +1,109 @@
+[#ftl]
+[#--
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012 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/>.
+  --]
+
+[#--
+  -- Returns the trimmed text "s" making sure it is terminated by a dot.
+  -- The empty string is always returned as an empty string, the dot is not
+  -- added.
+  --]
+[#function WithDot s]
+  [#local s = s?trim /]
+  [#if s == ""]
+    [#return s /]
+  [/#if]
+  [#if s?ends_with(".")]
+    [#return s /]
+  [/#if]
+  [#return s + "." /]
+[/#function]
+
+[#--
+  -- Returns the trimmed text "s" making sure it is not terminated by a dot.
+  --]
+[#function WithoutDot s]
+  [#local s = s?trim /]
+  [#if s?ends_with(".")]
+    [#return s?substring(0, s?length - 2) /]
+  [/#if]
+  [#return s /]
+[/#function]
+
+[#--
+  -- Returns the trimmed text "s" making sure it is terminated by a dot if the
+  -- text is composed of multiple phrases, if the text is composed of a single
+  -- phrase then makes sure it is *not* terminated by a dot.
+  -- A phrase is recognized by the pattern ". " into the text.
+  -- The empty string is always returned as an empty string, the dot is never
+  -- added.
+  --]
+[#function IntelligentDot s]
+  [#local s = s?trim /]
+  [#if s?contains(". ")]
+    [#return WithDot(s) /]
+  [/#if]
+  [#return WithoutDot(s) /]
+[/#function]
+
+[#--
+  -- Formats a text string in a sequence of strings no longer than "len" (first
+  -- line) or "lenn" (subsequent lines).
+  -- White spaces are normalized between words, sequences of white spaces become
+  -- a single space.
+  --]
+[#function StringToText len1 lenn s]
+  [#local words=s?word_list /]
+  [#local line="" /]
+  [#local lines=[] /]
+  [#list words as word]
+    [#if lines?size == 0]
+      [#local len = len1 /]
+    [#else]
+      [#local len = lenn /]
+    [/#if]
+    [#if (line?length + word?length + 1 > len)]
+      [#local lines = lines + [line?trim] /]
+      [#local line = word + " " /]
+    [#else]
+      [#local line = line + word + " " /]
+    [/#if]
+  [/#list]
+  [#if line != ""]
+    [#local lines = lines + [line?trim] /]
+  [/#if]
+  [#return lines /]
+[/#function]
+
+[#--
+  -- Emits a string "s" as a formatted text, the first line is prefixed by the
+  -- "p1" parameter, subsequent lines are prefixed by the "pn" paramenter.
+  -- Emitted lines are no longer than the "len" parameter.
+  -- White spaces are normalized between words.
+  --]
+[#macro FormatStringAsText p1 pn s len]
+  [#local lines = StringToText(len - p1?length, len - pn?length, s) /]
+  [#list lines as line]
+    [#if line_index == 0]
+${p1}${line}
+    [#else]
+${pn}${line}
+    [/#if]
+  [/#list]
+[/#macro]
diff --git a/tools/gencfg/processors/boards/stm32f4xx/datamodel/stm32f4board.xml b/tools/gencfg/processors/boards/stm32f4xx/datamodel/stm32f4board.xml
index 08016b73c..fc54e70b1 100644
--- a/tools/gencfg/processors/boards/stm32f4xx/datamodel/stm32f4board.xml
+++ b/tools/gencfg/processors/boards/stm32f4xx/datamodel/stm32f4board.xml
@@ -3,12 +3,11 @@
 <board
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:noNamespaceSchemaLocation="http://www.chibios.org/xml/schema/boards/stm32f4xx_board.xsd"
-  name="ST STM32F4-Discovery"
+  name="STMicroelectronics STM32F4-Discovery"
   BoardID="ST_STM32F4_DISCOVERY"
   HSEBypass="true"
   HSEFrequency="0"
   LSEFrequency="0">
-  <details>Board definition for STM32F4-Discovery.</details>
   <ports>
     <GPIOA>
       <pin0
diff --git a/tools/gencfg/processors/boards/stm32f4xx/templates/board.c.ftl b/tools/gencfg/processors/boards/stm32f4xx/templates/board.c.ftl
new file mode 100644
index 000000000..c6b4bdf4b
--- /dev/null
+++ b/tools/gencfg/processors/boards/stm32f4xx/templates/board.c.ftl
@@ -0,0 +1,120 @@
+[#ftl]
+[#--
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012 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/>.
+  --]
+[@pp.dropOutputFile /]
+[#import "/@lib/libutils.ftl" as utils /]
+[#import "/@lib/liblicense.ftl" as license /]
+[@pp.changeOutputFile name="board.c" /]
+/*
+[@license.EmitLicenseAsText /]
+*/
+
+#include "ch.h"
+#include "hal.h"
+
+#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.
+ */
+const PALConfig pal_default_config =
+{
+  {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
+   VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},
+  {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
+   VAL_GPIOB_ODR,   VAL_GPIOB_AFRL,   VAL_GPIOB_AFRH},
+  {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
+   VAL_GPIOC_ODR,   VAL_GPIOC_AFRL,   VAL_GPIOC_AFRH},
+  {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
+   VAL_GPIOD_ODR,   VAL_GPIOD_AFRL,   VAL_GPIOD_AFRH},
+  {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
+   VAL_GPIOE_ODR,   VAL_GPIOE_AFRL,   VAL_GPIOE_AFRH},
+  {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
+   VAL_GPIOF_ODR,   VAL_GPIOF_AFRL,   VAL_GPIOF_AFRH},
+  {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
+   VAL_GPIOG_ODR,   VAL_GPIOG_AFRL,   VAL_GPIOG_AFRH},
+  {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
+   VAL_GPIOH_ODR,   VAL_GPIOH_AFRL,   VAL_GPIOH_AFRH},
+  {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
+   VAL_GPIOI_ODR,   VAL_GPIOI_AFRL,   VAL_GPIOI_AFRH}
+};
+#endif
+
+/**
+ * @brief   Early initialization code.
+ * @details This initialization must be performed just after stack setup
+ *          and before any other initialization.
+ */
+void __early_init(void) {
+
+  stm32_clock_init();
+}
+
+#if HAL_USE_SDC || defined(__DOXYGEN__)
+/**
+ * @brief   SDC card detection.
+ * @todo    Fill the implementation.
+ */
+bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
+
+  (void)sdcp;
+  return TRUE;
+}
+
+/*
+ * @brief   SDC card write protection detection.
+ * @todo    Fill the implementation.
+ */
+bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
+
+  (void)sdcp;
+  return FALSE;
+}
+#endif /* HAL_USE_SDC */
+
+#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)
+/**
+ * @brief   MMC_SPI card detection.
+ * @todo    Fill the implementation.
+ */
+bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
+
+  (void)mmcp;
+  return TRUE;
+}
+
+/*
+ * @brief   MMC_SPI card write protection detection.
+ * @todo    Fill the implementation.
+ */
+bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
+
+  (void)mmcp;
+  return FALSE;
+}
+#endif
+
+/**
+ * @brief   Board-specific initialization code.
+ * @todo    Add your board-specific code, if any.
+ */
+void boardInit(void) {
+}
diff --git a/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl b/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl
new file mode 100644
index 000000000..d2ef1802f
--- /dev/null
+++ b/tools/gencfg/processors/boards/stm32f4xx/templates/board.h.ftl
@@ -0,0 +1,46 @@
+[#ftl]
+[#--
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012 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/>.
+  --]
+[@pp.dropOutputFile /]
+[#import "/@lib/libutils.ftl" as utils /]
+[#import "/@lib/liblicense.ftl" as license /]
+[@pp.changeOutputFile name="board.h" /]
+/*
+[@license.EmitLicenseAsText /]
+*/
+
+#ifndef _BOARD_H_
+#define _BOARD_H_
+
+/*
+ * Setup for ${doc1.board.@name[0]} board.
+ */
+
+#if !defined(_FROM_ASM_)
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void boardInit(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _FROM_ASM_ */
+
+#endif /* _BOARD_H_ */
diff --git a/tools/gencfg/processors/boards/stm32f4xx/templates/board.mk.ftl b/tools/gencfg/processors/boards/stm32f4xx/templates/board.mk.ftl
index d221241ed..34804dd67 100644
--- a/tools/gencfg/processors/boards/stm32f4xx/templates/board.mk.ftl
+++ b/tools/gencfg/processors/boards/stm32f4xx/templates/board.mk.ftl
@@ -19,7 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   --]
 [@pp.dropOutputFile /]
-[@pp.changeOutputFile name="boark.mk" /]
+[#import "/@lib/libutils.ftl" as utils /]
+[@pp.changeOutputFile name="board.mk" /]
 # List of all the board related files.
 BOARDSRC = ${'$'}{CHIBIOS}/boards/${doc1.board.@BoardID[0]}/board.c