From 9e10b08a3a4fd666d3e6282db2be2f64f65654e9 Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Sat, 11 May 2019 00:53:34 +0000 Subject: [PATCH] Delete the Release configuration from the NXP project. Also, some cosmetic changes. --- .../Projects/IAR/NonSecure/main_ns.c | 40 +-- .../Projects/IAR/Secure/main_s.c | 84 +++--- .../Projects/Keil/NonSecure/main_ns.c | 40 +-- .../Projects/Keil/Secure/main_s.c | 5 +- .../ReadMe_Instructions.URL | 6 + .../Projects/MCUXpresso/NonSecure/.cproject | 282 ------------------ .../Projects/MCUXpresso/NonSecure/main_ns.c | 36 ++- .../Projects/MCUXpresso/Secure/.cproject | 280 ----------------- .../Projects/MCUXpresso/Secure/main_s.c | 5 +- .../ReadMe_Instructions.URL | 6 + 10 files changed, 128 insertions(+), 656 deletions(-) create mode 100644 FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/ReadMe_Instructions.URL create mode 100644 FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/ReadMe_Instructions.URL diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/main_ns.c index 9ab70df84..a217e902d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/main_ns.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/main_ns.c @@ -43,24 +43,9 @@ static void prvCreateTasks( void ); /*-----------------------------------------------------------*/ -static void prvCreateTasks( void ) -{ - /* Create tasks for the MPU Demo. */ - vStartMPUDemo(); - - /* Create tasks for the TZ Demo. */ - vStartTZDemo(); - -} -/*-----------------------------------------------------------*/ - -/* Stack overflow hook. */ -void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) -{ - /* Force an assert. */ - configASSERT( pcTaskName == 0 ); -} -/*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M23-NuMaker-PFM-M2351-Keil.html + */ /* Non-Secure main. */ int main( void ) @@ -88,6 +73,25 @@ int main( void ) } /*-----------------------------------------------------------*/ +static void prvCreateTasks( void ) +{ + /* Create tasks for the MPU Demo. */ + vStartMPUDemo(); + + /* Create tasks for the TZ Demo. */ + vStartTZDemo(); + +} +/*-----------------------------------------------------------*/ + +/* Stack overflow hook. */ +void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) +{ + /* Force an assert. */ + configASSERT( pcTaskName == 0 ); +} +/*-----------------------------------------------------------*/ + /* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an * implementation of vApplicationGetIdleTaskMemory() to provide the memory that * is used by the Idle task. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/main_s.c b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/main_s.c index 3a996df2c..8bc5f0e5b 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/main_s.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/main_s.c @@ -56,6 +56,50 @@ static void prvSetupHardware( void ); static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ); /*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M23-NuMaker-PFM-M2351-Keil.html + */ + +/* Secure main. */ +int main(void) +{ + /* Unlock protected registers. */ + SYS_UnlockReg(); + + /* Initialize the hardware. */ + prvSetupHardware(); + + /* Print banner. */ + printf( "\n" ); + printf( "+---------------------------------------------+\n" ); + printf( "| Secure is running ... |\n" ); + printf( "+---------------------------------------------+\n" ); + + /* Do not generate Systick interrupt on secure side. */ + SysTick_Config( 1 ); + + /* Set GPIO Port A to non-secure for controlling LEDs from the non-secure + * side . */ + SCU_SET_IONSSET( SCU_IONSSET_PA_Msk ); + + /* Set UART0 to non-secure for debug output from non-secure side. */ + SCU_SET_PNSSET( UART0_Attr ); + + /* Lock protected registers before booting non-secure code. */ + SYS_LockReg(); + + /* Boot the non-secure code. */ + printf( "Entering non-secure world ...\n" ); + prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS ); + + /* Non-secure software does not return, this code is not executed. */ + for( ; ; ) + { + /* Should not reach here. */ + } +} +/*-----------------------------------------------------------*/ + static void prvSetupHardware( void ) { /* Init System Clock. */ @@ -125,43 +169,3 @@ static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ) pxNonSecureResetHandler(); } /*-----------------------------------------------------------*/ - -/* Secure main. */ -int main(void) -{ - /* Unlock protected registers. */ - SYS_UnlockReg(); - - /* Initialize the hardware. */ - prvSetupHardware(); - - /* Print banner. */ - printf( "\n" ); - printf( "+---------------------------------------------+\n" ); - printf( "| Secure is running ... |\n" ); - printf( "+---------------------------------------------+\n" ); - - /* Do not generate Systick interrupt on secure side. */ - SysTick_Config( 1 ); - - /* Set GPIO Port A to non-secure for controlling LEDs from the non-secure - * side . */ - SCU_SET_IONSSET( SCU_IONSSET_PA_Msk ); - - /* Set UART0 to non-secure for debug output from non-secure side. */ - SCU_SET_PNSSET( UART0_Attr ); - - /* Lock protected registers before booting non-secure code. */ - SYS_LockReg(); - - /* Boot the non-secure code. */ - printf( "Entering non-secure world ...\n" ); - prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS ); - - /* Non-secure software does not return, this code is not executed. */ - for( ; ; ) - { - /* Should not reach here. */ - } -} -/*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c index 4e5860128..b6ece032d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c @@ -74,24 +74,9 @@ static void prvCreateTasks( void ); void HardFault_Handler( void ) __attribute__ ( ( naked ) ); /*-----------------------------------------------------------*/ -static void prvCreateTasks( void ) -{ - /* Create tasks for the MPU Demo. */ - vStartMPUDemo(); - - /* Create tasks for the TZ Demo. */ - vStartTZDemo(); - -} -/*-----------------------------------------------------------*/ - -/* Stack overflow hook. */ -void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) -{ - /* Force an assert. */ - configASSERT( pcTaskName == 0 ); -} -/*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M23-NuMaker-PFM-M2351-Keil.html + */ /* Non-Secure main. */ int main( void ) @@ -119,6 +104,25 @@ int main( void ) } /*-----------------------------------------------------------*/ +static void prvCreateTasks( void ) +{ + /* Create tasks for the MPU Demo. */ + vStartMPUDemo(); + + /* Create tasks for the TZ Demo. */ + vStartTZDemo(); + +} +/*-----------------------------------------------------------*/ + +/* Stack overflow hook. */ +void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) +{ + /* Force an assert. */ + configASSERT( pcTaskName == 0 ); +} +/*-----------------------------------------------------------*/ + /* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an * implementation of vApplicationGetIdleTaskMemory() to provide the memory that * is used by the Idle task. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/main_s.c b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/main_s.c index 130844805..1b6bd66cb 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/main_s.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/main_s.c @@ -56,6 +56,10 @@ static void prvSetupHardware( void ); static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ); /*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M23-NuMaker-PFM-M2351-Keil.html + */ + /* Secure main. */ int main(void) { @@ -165,4 +169,3 @@ static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ) pxNonSecureResetHandler(); } /*-----------------------------------------------------------*/ - diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/ReadMe_Instructions.URL b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/ReadMe_Instructions.URL new file mode 100644 index 000000000..a17c85810 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/ReadMe_Instructions.URL @@ -0,0 +1,6 @@ +[InternetShortcut] +URL=https://www.freertos.org/RTOS-Cortex-M23-NuMaker-PFM-M2351-Keil.html +IDList= +HotKey=0 +IconFile=C:\Users\aggarg\AppData\Local\Mozilla\Firefox\Profiles\8rf5luy4.default-1527276413176\shortcutCache\UIdWZDR9mIxBJq2SX0MaOQ==.ico +IconIndex=0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.cproject b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.cproject index d05b1238f..59ab6f528 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.cproject +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.cproject @@ -290,288 +290,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c index fe654cffb..b52fd0139 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c @@ -60,6 +60,26 @@ void SystemInit( void ); void MemManage_Handler( void ) __attribute__ ( ( naked ) ); /*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M33-LPC55S69-MCUXpresso-GCC.html + */ + +/* Non-Secure main. */ +int main( void ) +{ + /* Create tasks. */ + prvCreateTasks(); + + /* Start scheduler. */ + vTaskStartScheduler(); + + /* Should not reach here as the scheduler is already started. */ + for( ; ; ) + { + } +} +/*-----------------------------------------------------------*/ + static void prvCreateTasks( void ) { /* Create tasks for the MPU Demo. */ @@ -85,22 +105,6 @@ void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName } /*-----------------------------------------------------------*/ -/* Non-Secure main. */ -int main( void ) -{ - /* Create tasks. */ - prvCreateTasks(); - - /* Start scheduler. */ - vTaskStartScheduler(); - - /* Should not reach here as the scheduler is already started. */ - for( ; ; ) - { - } -} -/*-----------------------------------------------------------*/ - /* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an * implementation of vApplicationGetIdleTaskMemory() to provide the memory that * is used by the Idle task. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/.cproject b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/.cproject index 2bb94858f..cb21b7cb3 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/.cproject +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/.cproject @@ -288,286 +288,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/main_s.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/main_s.c index 335f527fe..9c3ffbd13 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/main_s.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Secure/main_s.c @@ -64,6 +64,10 @@ static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ); void SystemInitHook( void ); /*-----------------------------------------------------------*/ +/* For instructions on how to build and run this demo, visit the following link: + * https://www.freertos.org/RTOS-Cortex-M33-LPC55S69-MCUXpresso-GCC.html + */ + /* Secure main(). */ int main(void) { @@ -124,4 +128,3 @@ void SystemInitHook( void ) BOARD_InitTrustZone(); } /*-----------------------------------------------------------*/ - diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/ReadMe_Instructions.URL b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/ReadMe_Instructions.URL new file mode 100644 index 000000000..c1d138571 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/ReadMe_Instructions.URL @@ -0,0 +1,6 @@ +[InternetShortcut] +URL=https://www.freertos.org/RTOS-Cortex-M33-LPC55S69-MCUXpresso-GCC.html +IDList= +HotKey=0 +IconFile=C:\Users\aggarg\AppData\Local\Mozilla\Firefox\Profiles\8rf5luy4.default-1527276413176\shortcutCache\sdoFHp5H4YVQFOH+7wqdNg==.ico +IconIndex=0