Skip to content
Snippets Groups Projects
Commit 6e19dc84 authored by Samuel Holland's avatar Samuel Holland Committed by Stefan Roese
Browse files

sunxi: Avoid duplicate reset_cpu with SYSRESET enabled


The sysreset uclass unconditionally provides a definition of the
reset_cpu() function. So does the sunxi board code. Fix the build with
SYSRESET enabled by omitting the function from the board code in that
case. The code still needs to be kept around for use in SPL.

Reviewed-by: default avatarHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Reviewed-by: default avatarStefan Roese <sr@denx.de>
parent a8f63d18
No related branches found
No related tags found
No related merge requests found
......@@ -346,6 +346,7 @@ void board_init_f(ulong dummy)
}
#endif
#if !CONFIG_IS_ENABLED(SYSRESET)
void reset_cpu(void)
{
#if defined(CONFIG_SUNXI_GEN_SUN4I) || defined(CONFIG_MACH_SUN8I_R40)
......@@ -376,6 +377,7 @@ void reset_cpu(void)
while (1) { }
#endif
}
#endif
#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) && !defined(CONFIG_ARM64)
void enable_caches(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment