Fix Build and Links failure in MPU projects. Minor cosmetic changes in some V8M files.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2640 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
index 6faa97b3188ad05c669ab651903dd56dfb96bf19..13e18ab225a7eb8e326f6e6eab0442bf642e79f3 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
@@ -66,20 +66,20 @@ static void prvCreateTasks( void );
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
-       Instructions to Build and Run:\r
-        - The Keil multi-project workspace FreeRTOSDemo.uvmpw contains projects for\r
-          both the secure project, and non secure project.\r
-        - Set the FreeRTOSDemo_s project as Active - Right click on\r
-          "Project: FreeRTOSDemo_s" and select "Set as Active Project".\r
-        - Build the FreeRTOSDemo_s project using "Project --> Build" or by pressing\r
-          F7.\r
-        - Set the FreeRTOSDemo_ns project as Active – Right click on\r
-          "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
-        - Build the FreeRTOSDemo_ns project using "Project --> Build" or by\r
-          pressing "F7".\r
-        - Start Debug Session using "Debug -> Start/Stop Debug Session" or by\r
-          pressing "Ctrl+F5".\r
-*/\r
+ *     Instructions to Build and Run:\r
+ *      - The Keil multi-project workspace FreeRTOSDemo.uvmpw contains projects for\r
+ *        both the secure project, and non secure project.\r
+ *      - Set the FreeRTOSDemo_s project as Active - Right click on\r
+ *        "Project: FreeRTOSDemo_s" and select "Set as Active Project".\r
+ *      - Build the FreeRTOSDemo_s project using "Project --> Build" or by pressing\r
+ *        "F7".\r
+ *      - Set the FreeRTOSDemo_ns project as Active - Right click on\r
+ *        "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
+ *      - Build the FreeRTOSDemo_ns project using "Project --> Build" or by\r
+ *        pressing "F7".\r
+ *      - Start Debug Session using "Debug -> Start/Stop Debug Session" or by\r
+ *        pressing "Ctrl+F5".\r
+ */\r
 \r
 /* Non-Secure main. */\r
 int main( void )\r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/ReadMe.txt b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/ReadMe.txt
index 42ab96b7c19233cbb246cf6dc8aad6c6111acad8..d2d6653e8b77115adb55251dca3cb0b2f65ed520 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/ReadMe.txt
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/ReadMe.txt
@@ -2,7 +2,7 @@ Instructions to Build and Run:
  - The Keil multi-project workspace FreeRTOSDemo.uvmpw contains projects for both the secure project, and non secure project.\r
  - Set the FreeRTOSDemo_s project as Active - Right click on "Project: FreeRTOSDemo_s" and select "Set as Active Project".\r
  - Build the FreeRTOSDemo_s project using "Project --> Build" or by pressing F7.\r
- - Set the FreeRTOSDemo_ns project as Active – Right click on "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
+ - Set the FreeRTOSDemo_ns project as Active - Right click on "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
  - Build the FreeRTOSDemo_ns project using "Project --> Build" or by pressing "F7".\r
  - Start Debug Session using "Debug -> Start/Stop Debug Session" or by pressing "Ctrl+F5".\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/main_s.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/main_s.c
index 72b81131c9c6228ca82a8462aad06f3e025ad1f2..98f98ed47edb00155876050b85c34797b90edd0e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/main_s.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/main_s.c
@@ -45,20 +45,20 @@ void BootNonSecure( uint32_t ulNonSecureStartAddress );
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
-       Instructions to Build and Run:\r
-        - The Keil multi-project workspace FreeRTOSDemo.uvmpw contains projects for\r
-          both the secure project, and non secure project.\r
-        - Set the FreeRTOSDemo_s project as Active - Right click on\r
-          "Project: FreeRTOSDemo_s" and select "Set as Active Project".\r
-        - Build the FreeRTOSDemo_s project using "Project --> Build" or by pressing\r
-          F7.\r
-        - Set the FreeRTOSDemo_ns project as Active – Right click on\r
-          "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
-        - Build the FreeRTOSDemo_ns project using "Project --> Build" or by\r
-          pressing "F7".\r
-        - Start Debug Session using "Debug -> Start/Stop Debug Session" or by\r
-          pressing "Ctrl+F5".\r
-*/\r
+ *     Instructions to Build and Run:\r
+ *      - The Keil multi-project workspace FreeRTOSDemo.uvmpw contains projects for\r
+ *        both the secure project, and non secure project.\r
+ *      - Set the FreeRTOSDemo_s project as Active - Right click on\r
+ *        "Project: FreeRTOSDemo_s" and select "Set as Active Project".\r
+ *      - Build the FreeRTOSDemo_s project using "Project --> Build" or by pressing\r
+ *        "F7".\r
+ *      - Set the FreeRTOSDemo_ns project as Active - Right click on\r
+ *        "Project: FreeRTOSDemo_ns" and select "Set as Active Project".\r
+ *      - Build the FreeRTOSDemo_ns project using "Project --> Build" or by\r
+ *        pressing "F7".\r
+ *      - Start Debug Session using "Debug -> Start/Stop Debug Session" or by\r
+ *        pressing "Ctrl+F5".\r
+ */\r
 \r
 /* Secure main() */\r
 int main( void )\r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h
index 55786a5cae67af38af3ca777bf34c9f80ec95a8f..442a67d12dc929774a67b01901d4db752660de0c 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h
@@ -150,7 +150,7 @@ standard names. */
 \r
 /* Normal assert() semantics without relying on the provision of an assert.h\r
 header file. */\r
-#define configASSERT( x ) if( ( x ) == 0UL ) { taskDISABLE_INTERRUPTS(); for( ;; ); }\r
+#define configASSERT( x ) if( ( x ) == 0UL ) { portDISABLE_INTERRUPTS(); for( ;; ); }\r
 \r
 /* LED not used at present, so just increment a variable to keep a count of the\r
 number of times the LED would otherwise have been toggled. */\r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h
index 43e01b6f5b887cfbeced84ecea80f922c79202c5..e626ad8045e4d926258ac91c5f0d43a766588e44 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h
@@ -152,7 +152,7 @@ standard names. */
 \r
 /* Normal assert() semantics without relying on the provision of an assert.h\r
 header file. */\r
-#define configASSERT( x ) if( ( x ) == 0UL ) { taskDISABLE_INTERRUPTS(); for( ;; ); }\r
+#define configASSERT( x ) if( ( x ) == 0UL ) { portDISABLE_INTERRUPTS(); for( ;; ); }\r
 \r
 /* LED not used at present, so just increment a variable to keep a count of the\r
 number of times the LED would otherwise have been toggled. */\r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/sections.ld b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/sections.ld
index 5ba471449af7d3b8998862c5d3bba1df78e8b5e7..723631644e9357ba5536820e0db471bc784deb7a 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/sections.ld
+++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/sections.ld
@@ -7,7 +7,7 @@ MEMORY
 \r
 /* Variables used by FreeRTOS-MPU. */\r
 _Privileged_Functions_Region_Size = 32K;\r
-_Privileged_Data_Region_Size = 2048;\r
+_Privileged_Data_Region_Size = 4096;\r
 \r
 __FLASH_segment_start__ = ORIGIN( ROM );\r
 __FLASH_segment_end__ = __FLASH_segment_start__ + LENGTH( ROM );\r

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.sct b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.sct
index ee30fbd5023f3940556cfe7284300ae68de16c2e..6e20179f60afdc1be64410ff278ac40fa35bf142 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.sct
+++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.sct
@@ -15,7 +15,7 @@ LR_IROM1 0x00000000  {    ; load region size_region
   RW_IRAM1 0x20000000  {  ; RW data\r
    *( privileged_data )\r
   }\r
-  RW_IRAM2 0x20000800 {  ; RW data\r
+  RW_IRAM2 0x20001000 {  ; RW data\r
    .ANY (+RW +ZI)\r
   }\r
 }\r

diff --git a/FreeRTOS/Source/portable/ARMv8M/ReadMe.txt b/FreeRTOS/Source/portable/ARMv8M/ReadMe.txt
index 4ac3bad555e180a5be0ae26b533935914a905409..c7ae0dd47370abcbf175c14bc021d1ce83374584 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/ReadMe.txt
+++ b/FreeRTOS/Source/portable/ARMv8M/ReadMe.txt
@@ -6,5 +6,5 @@ FreeRTOS release.
 If your Cortex-M33 application uses TrustZone then use the files from the\r
 FreeRTOS/Source/portable/[compiler]/ARM_CM33 directories.\r
 \r
-If you Cortex-M33 application is not going to use TrustZone then use the files\r
-from the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r
+If you Cortex-M33 application does not use TrustZone then use the files from\r
+the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r

diff --git a/FreeRTOS/Source/portable/ARMv8M/copy_files.py b/FreeRTOS/Source/portable/ARMv8M/copy_files.py
index 07e0682650a598ccacf314c3c7ac902124e51863..6a932859a224cb1d6509e07ece8d4acca2aa3405 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/copy_files.py
+++ b/FreeRTOS/Source/portable/ARMv8M/copy_files.py
@@ -53,7 +53,7 @@ _NONSECURE_FILE_PATHS_ = [
 def copy_files_in_dir(src_abs_path, dst_abs_path):\r
     for src_file in os.listdir(src_abs_path):\r
         src_file_abs_path = os.path.join(src_abs_path, src_file)\r
-        if os.path.isfile(src_file_abs_path):\r
+        if os.path.isfile(src_file_abs_path) and src_file != 'ReadMe.txt':\r
             if not os.path.exists(dst_abs_path):\r
                 os.makedirs(dst_abs_path)\r
             print('Copying {}...'.format(os.path.basename(src_file_abs_path)))\r

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/ReadMe.txt b/FreeRTOS/Source/portable/ARMv8M/non_secure/ReadMe.txt
index 4ac3bad555e180a5be0ae26b533935914a905409..91ad81f8d6eef4e5dd19f97be4d779b033052095 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/ReadMe.txt
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/ReadMe.txt
@@ -6,5 +6,6 @@ FreeRTOS release.
 If your Cortex-M33 application uses TrustZone then use the files from the\r
 FreeRTOS/Source/portable/[compiler]/ARM_CM33 directories.\r
 \r
-If you Cortex-M33 application is not going to use TrustZone then use the files\r
-from the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r
+If you Cortex-M33 application does not use TrustZone then use the files from\r
+the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r
+\r

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
index 9d92290500c4da48b1ab892139194a30c68163cb..57c5e23bb90fb24d115b17847a71c732162123ac 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
@@ -64,7 +64,7 @@
  *             configRUN_FREERTOS_SECURE_ONLY = 0 and configENABLE_TRUSTZONE = 0\r
  */\r
 #if( ( configRUN_FREERTOS_SECURE_ONLY == 1 ) && ( configENABLE_TRUSTZONE == 1 ) )\r
-       #error Trust Zone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
+       #error TrustZone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/ARMv8M/secure/ReadMe.txt b/FreeRTOS/Source/portable/ARMv8M/secure/ReadMe.txt
index 4ac3bad555e180a5be0ae26b533935914a905409..c7ae0dd47370abcbf175c14bc021d1ce83374584 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/secure/ReadMe.txt
+++ b/FreeRTOS/Source/portable/ARMv8M/secure/ReadMe.txt
@@ -6,5 +6,5 @@ FreeRTOS release.
 If your Cortex-M33 application uses TrustZone then use the files from the\r
 FreeRTOS/Source/portable/[compiler]/ARM_CM33 directories.\r
 \r
-If you Cortex-M33 application is not going to use TrustZone then use the files\r
-from the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r
+If you Cortex-M33 application does not use TrustZone then use the files from\r
+the FreeRTOS/Source/portable/[compiler]/ARM_CM33_NTZ directories.\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/port.c
index 9d92290500c4da48b1ab892139194a30c68163cb..57c5e23bb90fb24d115b17847a71c732162123ac 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/port.c
@@ -64,7 +64,7 @@
  *             configRUN_FREERTOS_SECURE_ONLY = 0 and configENABLE_TRUSTZONE = 0\r
  */\r
 #if( ( configRUN_FREERTOS_SECURE_ONLY == 1 ) && ( configENABLE_TRUSTZONE == 1 ) )\r
-       #error Trust Zone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
+       #error TrustZone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/port.c
index 9d92290500c4da48b1ab892139194a30c68163cb..57c5e23bb90fb24d115b17847a71c732162123ac 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/port.c
@@ -64,7 +64,7 @@
  *             configRUN_FREERTOS_SECURE_ONLY = 0 and configENABLE_TRUSTZONE = 0\r
  */\r
 #if( ( configRUN_FREERTOS_SECURE_ONLY == 1 ) && ( configENABLE_TRUSTZONE == 1 ) )\r
-       #error Trust Zone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
+       #error TrustZone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM33/non_secure/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM33/non_secure/portmacro.h
index a5242006e890d715ec62727fed153a6833cbf8f0..5042570709dd70abfea133b9b0c779a1254d0e7c 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM33/non_secure/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM33/non_secure/portmacro.h
@@ -53,6 +53,7 @@ extern "C" {
 #ifndef configENABLE_TRUSTZONE\r
        #error configENABLE_TRUSTZONE must be defined in FreeRTOSConfig.h.  Set configENABLE_TRUSTZONE to 1 to enable TrustZone or 0 to disable TrustZone.\r
 #endif /* configENABLE_TRUSTZONE */\r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 /**\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/port.c
index 9d92290500c4da48b1ab892139194a30c68163cb..57c5e23bb90fb24d115b17847a71c732162123ac 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/port.c
@@ -64,7 +64,7 @@
  *             configRUN_FREERTOS_SECURE_ONLY = 0 and configENABLE_TRUSTZONE = 0\r
  */\r
 #if( ( configRUN_FREERTOS_SECURE_ONLY == 1 ) && ( configENABLE_TRUSTZONE == 1 ) )\r
-       #error Trust Zone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
+       #error TrustZone needs to be disabled in order to run FreeRTOS on the Secure Side.\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/portmacro.h
index a5242006e890d715ec62727fed153a6833cbf8f0..5042570709dd70abfea133b9b0c779a1254d0e7c 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM33_NTZ/non_secure/portmacro.h
@@ -53,6 +53,7 @@ extern "C" {
 #ifndef configENABLE_TRUSTZONE\r
        #error configENABLE_TRUSTZONE must be defined in FreeRTOSConfig.h.  Set configENABLE_TRUSTZONE to 1 to enable TrustZone or 0 to disable TrustZone.\r
 #endif /* configENABLE_TRUSTZONE */\r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 /**\r