diff options
| author | Samuel Holland <samuel@sholland.org> | 2021-11-03 22:55:15 -0500 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-11-04 08:57:19 +0100 |
| commit | 6e19dc84c14b3407dfc02d218244d1b3a9fbca3e (patch) | |
| tree | 16ced77068fe2b5e80b446b7a956c449280b6fe0 | |
| parent | a8f63d18bbb0a3e1456ac833e748d68f0ea1eece (diff) | |
| download | u-boot-6e19dc84c14b3407dfc02d218244d1b3a9fbca3e.zip u-boot-6e19dc84c14b3407dfc02d218244d1b3a9fbca3e.tar.gz u-boot-6e19dc84c14b3407dfc02d218244d1b3a9fbca3e.tar.bz2 | |
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: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index b4ba2a7..3ef1797 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -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) |