Fix build failure in STM32 Discovery MPU Projects (FreeRTOS#449)

aggarg · web-flow · commit adbc27f11df7 · 2020-12-12T16:33:00.000-08:00
* Fix build failure in STM32 Discovery MPU Projects

Privileged data region size needs to be increased because heap is now
placed in this region.

Signed-off-by: Gaurav Aggarwal &lt;aggarg@amazon.com&gt;
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h
@@ -19,13 +19,11 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
-
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/app_main.c b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/app_main.c
@@ -19,11 +19,11 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
+
 /* Scheduler includes. */
 #include "FreeRTOS.h"
 #include "task.h"
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/app_main.h b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/app_main.h
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 #ifndef __APP_MAIN_H__
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/mpu_demo.c b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/mpu_demo.c
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 /* FreeRTOS includes. */
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/mpu_demo.h b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Demo/mpu_demo.h
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 #ifndef __MPU_DEMO_H__
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/STM32L475VGTX_FLASH.ld b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/STM32L475VGTX_FLASH.ld
@@ -68,9 +68,9 @@ MEMORY
 }
 
 /* Initial 32K Flash is used to store kernel functions and
- * initial 512 bytes of RAM is used to store kernel data. */
+ * initial 32K RAM is used to store kernel data. */
 __privileged_functions_region_size__  = 32K;
-__privileged_data_region_size__       = 512;
+__privileged_data_region_size__       = 32K;
 
 __FLASH_segment_start__               = ORIGIN( FLASH );
 __FLASH_segment_end__                 = __FLASH_segment_start__ + LENGTH( FLASH );
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/memfault_handler.c b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/memfault_handler.c
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 /**
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/memfault_handler.s b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/memfault_handler.s
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 	EXTERN vHandleMemoryFault
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/stm32l475xx_flash.icf b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/stm32l475xx_flash.icf
@@ -38,16 +38,16 @@ define symbol __reigon_ROM_unprivileged_end__   = __ICFEDIT_region_ROM_end__;
 /* RAM Organization
  *  1. Privileged Data:
  *      Start   : 0x20000000
- *      End     : 0x200003FF
- *      Size    : 1 Kbytes
+ *      End     : 0x20007FFF
+ *      Size    : 32 Kbytes
  *  2. Unprivileged Data:
- *      Start   : 0x20000400
+ *      Start   : 0x20008000
  *      End     : 0x20017FFF
- *      Size    : 95 Kbytes
+ *      Size    : 64 Kbytes
  */
 define symbol __region_RAM_privileged_start__   = __ICFEDIT_region_RAM_start__;
-define symbol __region_RAM_privileged_end__     = 0x200003FF;
-define symbol __region_RAM_unprivileged_start__ = 0x20000400;
+define symbol __region_RAM_privileged_end__     = 0x20007FFF;
+define symbol __region_RAM_unprivileged_start__ = 0x20008000;
 define symbol __region_RAM_unprivileged_end__   = __ICFEDIT_region_RAM_end__;
 define symbol __region_SRAM2_start__            = 0x10000000;
 define symbol __region_SRAM2_end__              = 0x10007FFF;
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.sct b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.sct
@@ -38,7 +38,7 @@ LR_APP 0x08000000 0x100000 ; load region size_region
         *(privileged_data)
     }
 
-    RW_IRAM_UNPRIVILEGED 0x20000400
+    RW_IRAM_UNPRIVILEGED 0x20008000
     {
         .ANY (+RW +ZI)
     }
diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/memfault_handler.c b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/memfault_handler.c
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 #include <stdint.h>
@@ -40,7 +39,7 @@ const uint32_t * __SRAM_segment_end__ = ( uint32_t * ) 0x20018000;
 const uint32_t * __privileged_functions_start__ = ( uint32_t * ) 0x08000000;
 const uint32_t * __privileged_functions_end__ = ( uint32_t * ) 0x08008000;
 const uint32_t * __privileged_data_start__ = ( uint32_t * ) 0x20000000;
-const uint32_t * __privileged_data_end__ = ( uint32_t * ) 0x20000400;
+const uint32_t * __privileged_data_end__ = ( uint32_t * ) 0x20008000;
 
 const uint32_t * __syscalls_flash_start__ = ( uint32_t * ) &( Image$$ER_IROM_FREERTOS_SYSTEM_CALLS$$Base );
 const uint32_t * __syscalls_flash_end__ = ( uint32_t * ) &( Image$$ER_IROM_FREERTOS_SYSTEM_CALLS$$Limit );

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,11 @@`
`19`	`19`	`* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN`
`20`	`20`	`* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
`21`	`21`	`*`
`22`		`- * http://www.FreeRTOS.org`
`23`		`- * http://aws.amazon.com/freertos`
	`22`	`+ * https://www.FreeRTOS.org`
	`23`	`+ * https://github.com/FreeRTOS`
`24`	`24`	`*`
`25`		`- * 1 tab == 4 spaces!`
`26`	`25`	`*/`
`27`	`26`
`28`		`-`
`29`	`27`	`#ifndef FREERTOS_CONFIG_H`
`30`	`28`	`#define FREERTOS_CONFIG_H`
`31`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,9 @@`
`19`	`19`	`* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN`
`20`	`20`	`* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
`21`	`21`	`*`
`22`		`- * http://www.FreeRTOS.org`
`23`		`- * http://aws.amazon.com/freertos`
	`22`	`+ * https://www.FreeRTOS.org`
	`23`	`+ * https://github.com/FreeRTOS`
`24`	`24`	`*`
`25`		`- * 1 tab == 4 spaces!`
`26`	`25`	`*/`
`27`	`26`
`28`	`27`	`#ifndef __APP_MAIN_H__`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ LR_APP 0x08000000 0x100000 ; load region size_region`
`38`	`38`	`*(privileged_data)`
`39`	`39`	`}`
`40`	`40`
`41`		`- RW_IRAM_UNPRIVILEGED 0x20000400`
	`41`	`+ RW_IRAM_UNPRIVILEGED 0x20008000`
`42`	`42`	`{`
`43`	`43`	`.ANY (+RW +ZI)`
`44`	`44`	`}`