X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso%2FProjects%2FMCUXpresso%2FNonSecure%2Fmain_ns.c;h=834fbe80f3fc9b4217550eacfee5ef67dddc4c81;hb=HEAD;hp=b52fd013962f7ccdeb793b9e9f63d59541ce51a1;hpb=4750b9b58fd10391c35153cc83aaef8f144c5544;p=freertos

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