commit 9f316c246baafa15c542a5aea81a94f26e3d6507

[freertos] / FreeRTOS / Demo / CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso / Projects / MCUXpresso / NonSecure / main_ns.c

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 b52fd013962f7ccdeb793b9e9f63d59541ce51a1..834fbe80f3fc9b4217550eacfee5ef67dddc4c81 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS Kernel V10.2.0\r
- * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ * FreeRTOS Kernel V10.3.0\r
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
  * this software and associated documentation files (the "Software"), to deal in\r
@@ -73,7 +73,10 @@ int main( void )
        /* Start scheduler. */\r
        vTaskStartScheduler();\r
 \r
-       /* Should not reach here as the scheduler is already started. */\r
+       /* Will not get here if the scheduler starts successfully.  If you do end up\r
+       here then there wasn't enough heap memory available to start either the idle\r
+       task or the timer/daemon task.  https://www.freertos.org/a00111.html */\r
+\r
        for( ; ; )\r
        {\r
        }\r
@@ -170,6 +173,7 @@ void MemManage_Handler( void )
                " ldr r1, handler_address_const                                         \n"\r
                " bx r1                                                                                         \n"\r
                "                                                                                                       \n"\r
+               " .align 4                                                                                      \n"\r
                " handler_address_const: .word vHandleMemoryFault       \n"\r
        );\r
 }\r