Commit 94f307ab authored by Tahsin Mutlugun's avatar Tahsin Mutlugun Committed by Mahesh Mahadevan
Browse files

arch: xtensa: rename processor state save and restore calls 



_xtos_pso_savearea and _xtos_core_restore_nw have been renamed to
xthal_pso_savearea and xthal_core_restore_nw in recent Xtensa
toolchains. Rename them in reset_vector.S to prevent linker errors
when building Zephyr with Xtensa toolchain.

Signed-off-by: default avatarTahsin Mutlugun <Tahsin.Mutlugun@analog.com>
parent ee1cbf06

arch/xtensa/core/startup/reset_vector.S

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ _ResetHandler: 
	/* Read PWRSTAT */

	movi	a2, XDM_MISC_PWRSTAT

	/* Save area address - retained for later */

	movi	a3, _xtos_pso_savearea

	movi	a3, xthal_pso_savearea

	/* Signature for compare - retained for later */

	movi	a5, CORE_STATE_SIGNATURE

	 /* PWRSTAT value - retained for later */
@@ -229,7 +229,7 @@ _ResetHandler: 
	 * MEMCTL register was already restored earlier, and as a side

	 * effect, registers a3, a5, a7 are now preloaded with values

	 * that we will use here.

	 * a3 - pointer to save area base address (_xtos_pso_savearea)

	 * a3 - pointer to save area base address (xthal_pso_savearea)

	 * a5 - saved state signature (CORE_STATE_SIGNATURE)

	 * a7 - contents of PWRSTAT register

	 */
@@ -343,11 +343,11 @@ _ResetHandler: 


	/* make shutoff routine return zero */

	movi	a2, 0

	movi	a3, _xtos_pso_savearea

	movi	a3, xthal_pso_savearea

	/* Here, as below for _start, call0 is used as an unlimited-range

	 * jump.

	 */

	call0	_xtos_core_restore_nw

	call0	xthal_core_restore_nw

	/*  (does not return) */

.Lcoldstart:

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE