| Message ID | 20211104035516.28268-6-samuel@sholland.org |
|---|---|
| State | Accepted, archived |
| Commit | 6e19dc84c14b3407dfc02d218244d1b3a9fbca3e |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | Improved sysreset/watchdog uclass integration | expand |
On 04.11.21 04:55, Samuel Holland wrote: > 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> Thanks, Stefan > --- > > (no changes since v2) > > Changes in v2: > - New patch > > arch/arm/mach-sunxi/board.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c > index b4ba2a72c4..3ef179742c 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) > Viele Grüße, Stefan
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index b4ba2a72c4..3ef179742c 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)