sw_apps: zynqmp_fsbl: Fixed setting of secondary boot device

ThirdParty/bsp/freertos10_xilinx/data/freertos10_xilinx.tcl

@@ -814,8 +814,15 @@ proc generate {os_handle} {
 		puts $config_file "#define portGET_RUN_TIME_COUNTER_VALUE()\n"
 	}
 
+	set val [common::get_property CONFIG.use_port_optimized_task_selection $os_handle]
+	if {$val == "false"} {
+		xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "0"
+	} else {
+		xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "1"
+	}
+
 	puts $config_file "#define configUSE_TICKLESS_IDLE	0"
-	puts $config_file "#define configTASK_RETURN_ADDRESS    NULL"
+	puts $config_file "#define configTASK_RETURN_ADDRESS    prvTaskExitError"
 	puts $config_file "#define INCLUDE_vTaskPrioritySet             1"
 	puts $config_file "#define INCLUDE_uxTaskPriorityGet            1"
 	puts $config_file "#define INCLUDE_vTaskDelete                  1"
@@ -826,6 +833,7 @@ proc generate {os_handle} {
 	puts $config_file "#define INCLUDE_eTaskGetState                1"
 	puts $config_file "#define INCLUDE_xTimerPendFunctionCall       1"
 	puts $config_file "#define INCLUDE_pcTaskGetTaskName            1"
+	puts $config_file "#define INCLUDE_xTaskGetHandle               1"
 	set flag_mb64 ""
 	if {$proctype == "microblaze"} {
 		set sw_proc_handle [hsi::get_sw_processor]
@@ -1016,12 +1024,6 @@ proc generate {os_handle} {
 		set max_api_call_interrupt_priority [common::get_property CONFIG.max_api_call_interrupt_priority $os_handle]
 		xput_define $config_file "configMAX_API_CALL_INTERRUPT_PRIORITY"   "($max_api_call_interrupt_priority)"
 
-		set val [common::get_property CONFIG.use_port_optimized_task_selection $os_handle]
-		if {$val == "false"} {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "0"
-		} else {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "1"
-		}
 	}
 	# end of if $proctype == "psu_cortexr5"
 
@@ -1195,12 +1197,6 @@ proc generate {os_handle} {
 		puts $config_file "#define portSET_INTERRUPT_MASK_FROM_ISR()	uxPortSetInterruptMask()"
 		puts $config_file "#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)	vPortClearInterruptMask(x)"
 
-		set val [common::get_property CONFIG.use_port_optimized_task_selection $os_handle]
-		if {$val == "false"} {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "0"
-		} else {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "1"
-		}
 	}
 	# end of if $proctype == "psu_cortexa53"
 
@@ -1325,13 +1321,6 @@ proc generate {os_handle} {
 		set max_api_call_interrupt_priority [common::get_property CONFIG.max_api_call_interrupt_priority $os_handle]
 		xput_define $config_file "configMAX_API_CALL_INTERRUPT_PRIORITY"   "($max_api_call_interrupt_priority)"
 
-		set val [common::get_property CONFIG.use_port_optimized_task_selection $os_handle]
-		if {$val == "false"} {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "0"
-		} else {
-			xput_define $config_file "configUSE_PORT_OPTIMISED_TASK_SELECTION"  "1"
-		}
-
 		puts $config_file "#define configINTERRUPT_CONTROLLER_BASE_ADDRESS         ( XPAR_PS7_SCUGIC_0_DIST_BASEADDR )"
 		puts $config_file "#define configINTERRUPT_CONTROLLER_CPU_INTERFACE_OFFSET ( -0xf00 )"
 		puts $config_file "#define configUNIQUE_INTERRUPT_PRIORITIES                32"

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CA53/port.c

@@ -149,6 +149,11 @@ point is zero. */
 #define portMAX_8_BIT_VALUE							( ( uint8_t ) 0xff )
 #define portBIT_0_SET								( ( uint8_t ) 0x01 )
 
+/* Let the user override the pre-loading of the initial LR with the address of
+prvTaskExitError() in case is messes up unwinding of the stack in the
+debugger. */
+#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
+
 /*-----------------------------------------------------------*/
 
 /*
@@ -157,6 +162,10 @@ point is zero. */
  */
 extern void vPortRestoreTaskContext( void );
 
+/*
+ * Used to catch tasks that attempt to return from their implementing function.
+ */
+static void prvTaskExitError( void );
 /*-----------------------------------------------------------*/
 
 /* A variable is used to keep track of the critical section nesting.  This
@@ -287,7 +296,7 @@ StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t px
 	pxTopOfStack--;
 	*pxTopOfStack = ( StackType_t ) 0x00;	/* XZR - has no effect, used so there are an even number of registers. */
 	pxTopOfStack--;
-	*pxTopOfStack = ( StackType_t ) 0x00;	/* R30 - procedure call link register. */
+	*pxTopOfStack = ( StackType_t ) portTASK_RETURN_ADDRESS;	/* R30 - procedure call link register. */
 	pxTopOfStack--;
 
 	*pxTopOfStack = portINITIAL_PSTATE;
@@ -708,6 +717,19 @@ uint32_t mask;
 }
 /*-----------------------------------------------------------*/
 
+static void prvTaskExitError( void )
+{
+	/* A function that implements a task must not exit or attempt to return to
+	its caller as there is nothing to return to.  If a task wants to exit it
+	should instead call vTaskDelete( NULL ) */
+	xil_printf("Warning: return statement has been called from task %s, deleting it\n",pcTaskGetName(NULL));
+	if (uxTaskGetNumberOfTasks() == 2)
+	{
+		xil_printf("Warning: Kernel does not have any task to manage other than idle task\n");
+	}
+	vTaskDelete( NULL );
+}
+/*-----------------------------------------------------------*/
 #if( configASSERT_DEFINED == 1 )
 
 	void vPortValidateInterruptPriority( void )

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CA53/portASM.S

@@ -54,6 +54,14 @@
 	.global vPortRestoreTaskContext
 
 
+.macro exception_return
+	ERET
+#if defined (versal)
+	DSB NSH
+	ISB
+#endif
+.endm
+
 .macro portSAVE_CONTEXT
 
 	/* Switch to use the EL0 stack pointer. */
@@ -231,7 +239,7 @@
 	/* Switch to use the ELx stack pointer.  _RB_ Might not be required. */
 	MSR 	SPSEL, #1
 
-	ERET
+	exception_return
 
 	.endm
 
@@ -436,7 +444,7 @@ Exit_IRQ_No_Context_Switch:
 	LDP		X2, X3, [SP], #0x10
 	LDP		X0, X1, [SP], #0x10
 
-	ERET
+	exception_return
 
 
 

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CA53/port_asm_vectors.S

@@ -69,6 +69,13 @@
 .globl SErrorInterrupt
 .globl SynchronousInterrupt
 
+.macro exception_return
+	eret
+#if defined (versal)
+	dsb nsh
+	isb
+#endif
+.endm
 
 .org 0
 
@@ -86,7 +93,10 @@ _vector_table:
         /* HW reset vector.  */
         ldr     x16, =_boot
         br      x16
-
+#if defined (versal)
+	dsb nsh
+	isb
+#endif
         /* text offset.  */
         .dword  0
         /* image size.  */
@@ -246,7 +256,7 @@ SynchronousInterruptHandler:
 	ldp	X2,X3, [sp], #0x10
 	ldp	X0,X1, [sp], #0x10
 
-	eret
+	exception_return
 
 IRQInterruptHandler:
 	stp	X0,X1, [sp,#-0x10]!
@@ -275,7 +285,7 @@ IRQInterruptHandler:
 	ldp	X2,X3, [sp], #0x10
 	ldp	X0,X1, [sp], #0x10
 
-	eret
+	exception_return
 
 FIQInterruptHandler:
 
@@ -305,7 +315,7 @@ FIQInterruptHandler:
 	ldp	X2,X3, [sp], #0x10
 	ldp	X0,X1, [sp], #0x10
 
-	eret
+	exception_return
 
 SErrorInterruptHandler:
 
@@ -335,6 +345,6 @@ SErrorInterruptHandler:
 	ldp	X2,X3, [sp], #0x10
 	ldp	X0,X1, [sp], #0x10
 
-	eret
+	exception_return
 
 .end

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CA53/portmacro.h

@@ -94,11 +94,25 @@ extern uint64_t ullPortYieldRequired;			\
 }
 
 #define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )
+#if defined(versal)
+#if EL1_NONSECURE
+#define portYIELD() 						\
+	__asm volatile ( "SVC 0" ::: "memory" );	\
+	__asm volatile ( "DSB NSH" );			\
+	__asm volatile ( "ISB" );
+#else
+#define portYIELD() 							\
+	__asm volatile ( "SMC 0" ::: "memory" );		\
+	__asm volatile ( "DSB NSH" );				\
+	__asm volatile ( "ISB" );
+#endif
+#else
 #if EL1_NONSECURE
 	#define portYIELD() __asm volatile ( "SVC 0" ::: "memory" )
 #else
 	#define portYIELD() __asm volatile ( "SMC 0" ::: "memory" )
 #endif
+#endif
 /*-----------------------------------------------------------
  * Critical section control
  *----------------------------------------------------------*/

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CA9/port.c

@@ -144,11 +144,7 @@ the CPU itself before modifying certain hardware registers. */
 /* Let the user override the pre-loading of the initial LR with the address of
 prvTaskExitError() in case it messes up unwinding of the stack in the
 debugger. */
-#ifdef configTASK_RETURN_ADDRESS
-	#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
-#else
-	#define portTASK_RETURN_ADDRESS	prvTaskExitError
-#endif
+#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
 
 /* The space on the stack required to hold the FPU registers.  This is 32 64-bit
 registers, plus a 32-bit status register. */
@@ -341,9 +337,12 @@ static void prvTaskExitError( void )
 
 	Artificially force an assert() to be triggered if configASSERT() is
 	defined, then stop here so application writers can catch the error. */
-	configASSERT( ulPortInterruptNesting == ~0UL );
-	portDISABLE_INTERRUPTS();
-	for( ;; );
+	xil_printf("Warning: return statement has been called from task %s, deleting it\n",pcTaskGetName(NULL));
+	if (uxTaskGetNumberOfTasks() == 2)
+	{
+		xil_printf("Warning: Kernel does not have any task to manage other than idle task\n");
+	}
+	vTaskDelete( NULL );
 }
 /*-----------------------------------------------------------*/
 

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/ARM_CR5/port.c

@@ -145,11 +145,7 @@ the CPU itself before modifying certain hardware registers. */
 /* Let the user override the pre-loading of the initial LR with the address of
 prvTaskExitError() in case is messes up unwinding of the stack in the
 debugger. */
-#ifdef configTASK_RETURN_ADDRESS
-	#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
-#else
-	#define portTASK_RETURN_ADDRESS	prvTaskExitError
-#endif
+#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
 
 /* The space on the stack required to hold the FPU registers.
  * vfpv3-d16 has 16 64 bit registers or 32 32 bit registers. plus
@@ -323,9 +319,12 @@ static void prvTaskExitError( void )
 
 	Artificially force an assert() to be triggered if configASSERT() is
 	defined, then stop here so application writers can catch the error. */
-	configASSERT( ulPortInterruptNesting == ~0UL );
-	portDISABLE_INTERRUPTS();
-	for( ;; );
+	xil_printf("Warning: return statement has been called from task %s, deleting it\n",pcTaskGetName(NULL));
+	if (uxTaskGetNumberOfTasks() == 2)
+	{
+		xil_printf("Warning: Kernel does not have any task to manage other than idle task\n");
+	}
+	vTaskDelete( NULL );
 }
 /*-----------------------------------------------------------*/
 

ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/MicroBlazeV9/port.c

@@ -62,11 +62,7 @@ created. */
 /* Let the user override the pre-loading of the initial R15 (sub routine
 return address) with the address of prvTaskExitError() in case is messes
 up unwinding of the stack in the debugger. */
-#ifdef configTASK_RETURN_ADDRESS
-	#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
-#else
-	#define portTASK_RETURN_ADDRESS	prvTaskExitError
-#endif
+#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
 
 /*
  * Global counter used for calculation of run time statistics of tasks.
@@ -330,9 +326,13 @@ static void prvTaskExitError( void )
 
 	Artificially force an assert() to be triggered if configASSERT() is
 	defined, then stop here so application writers can catch the error. */
-	configASSERT( uxCriticalNesting == ~0UL );
-	portDISABLE_INTERRUPTS();
-	for( ;; );
+	xil_printf("Warning: return statement has been called from task %s, deleting it\n",pcTaskGetName(NULL));
+	if (uxTaskGetNumberOfTasks() == 2)
+	{
+		xil_printf("Warning: Kernel does not have any task to manage other than idle task\n");
+	}
+	vTaskDelete( NULL );
+
 }
 /*-----------------------------------------------------------*/