Fixed bug #623.

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

4 files changed, 112 insertions, 0 deletions

diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x4.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x4.ld
new file mode 100644
index 000000000..d63d89d8c
--- /dev/null
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x4.ld
@@ -0,0 +1,50 @@
+/*

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

+

+    This file is part of ChibiOS.

+

+    ChibiOS 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 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/>.

+*/

+

+/*

+ * STM32F030x4 memory setup.

+ */

+MEMORY

+{

+    flash : org = 0x08000000, len = 16k

+    ram0  : org = 0x20000000, len = 4k

+    ram1  : org = 0x00000000, len = 0

+    ram2  : org = 0x00000000, len = 0

+    ram3  : org = 0x00000000, len = 0

+    ram4  : org = 0x00000000, len = 0

+    ram5  : org = 0x00000000, len = 0

+    ram6  : org = 0x00000000, len = 0

+    ram7  : org = 0x00000000, len = 0

+}

+

+/* RAM region to be used for Main stack. This stack accommodates the processing

+   of all exceptions and interrupts*/

+REGION_ALIAS("MAIN_STACK_RAM", ram0);

+

+/* RAM region to be used for the process stack. This is the stack used by

+   the main() function.*/

+REGION_ALIAS("PROCESS_STACK_RAM", ram0);

+

+/* RAM region to be used for data segment.*/

+REGION_ALIAS("DATA_RAM", ram0);

+

+/* RAM region to be used for BSS segment.*/

+REGION_ALIAS("BSS_RAM", ram0);

+

+INCLUDE rules.ld

diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x6.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x6.ld
new file mode 100644
index 000000000..328351cdf
--- /dev/null
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x6.ld
@@ -0,0 +1,50 @@
+/*

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

+

+    This file is part of ChibiOS.

+

+    ChibiOS 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 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/>.

+*/

+

+/*

+ * STM32F030x6 memory setup.

+ */

+MEMORY

+{

+    flash : org = 0x08000000, len = 32k

+    ram0  : org = 0x20000000, len = 4k

+    ram1  : org = 0x00000000, len = 0

+    ram2  : org = 0x00000000, len = 0

+    ram3  : org = 0x00000000, len = 0

+    ram4  : org = 0x00000000, len = 0

+    ram5  : org = 0x00000000, len = 0

+    ram6  : org = 0x00000000, len = 0

+    ram7  : org = 0x00000000, len = 0

+}

+

+/* RAM region to be used for Main stack. This stack accommodates the processing

+   of all exceptions and interrupts*/

+REGION_ALIAS("MAIN_STACK_RAM", ram0);

+

+/* RAM region to be used for the process stack. This is the stack used by

+   the main() function.*/

+REGION_ALIAS("PROCESS_STACK_RAM", ram0);

+

+/* RAM region to be used for data segment.*/

+REGION_ALIAS("DATA_RAM", ram0);

+

+/* RAM region to be used for BSS segment.*/

+REGION_ALIAS("BSS_RAM", ram0);

+

+INCLUDE rules.ld

diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
index 6cad2dff0..088d56d59 100644
--- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
@@ -1074,17 +1074,28 @@
 #define STM32_HAS_GPIOA                     TRUE

 #define STM32_HAS_GPIOB                     TRUE

 #define STM32_HAS_GPIOC                     TRUE

+#if defined(STM32F030x8)

 #define STM32_HAS_GPIOD                     TRUE

+#else

+#define STM32_HAS_GPIOD                     FALSE

+#endif

 #define STM32_HAS_GPIOE                     FALSE

 #define STM32_HAS_GPIOF                     TRUE

 #define STM32_HAS_GPIOG                     FALSE

 #define STM32_HAS_GPIOH                     FALSE

 #define STM32_HAS_GPIOI                     FALSE

+#if defined(STM32F030x8)

 #define STM32_GPIO_EN_MASK                  (RCC_AHBENR_GPIOAEN |           \

                                              RCC_AHBENR_GPIOBEN |           \

                                              RCC_AHBENR_GPIOCEN |           \

                                              RCC_AHBENR_GPIODEN |           \

                                              RCC_AHBENR_GPIOFEN)

+#else

+#define STM32_GPIO_EN_MASK                  (RCC_AHBENR_GPIOAEN |           \

+                                             RCC_AHBENR_GPIOBEN |           \

+                                             RCC_AHBENR_GPIOCEN |           \

+                                             RCC_AHBENR_GPIOFEN)

+#endif

 

 /* I2C attributes.*/

 #define STM32_HAS_I2C1                      TRUE

diff --git a/readme.txt b/readme.txt
index 3276cbe47..acf67a2b8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -83,6 +83,7 @@
 - HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.

 - HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support

        for STM32F030xC, STM32F070x6, STM32F070xB devices.

+- HAL: Fixed crash on STM32F030x4/6 devices (bug #623)(backported to 3.0.1).

 - HAL: Fixed duplicated doxygen tag in STM32F4xx hal_lld.h file (bug #621)

        (backported to 3.0.1 and 2.6.9).

 - HAL: Fixed STM32F042 registry error (bug #620)(backported to 3.0.1).