| Message ID | 20210719112135.v2.1.Idb1d70f42e92c6b612467611501246064bcddeef@changeid |
|---|---|
| State | Accepted |
| Commit | 558e699d156ebe7f0b51e05a2e38f35fbaa78b0f |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm64: Update memcpy_{from, to}io() helpers | expand |
On Mon, Jul 19, 2021 at 11:21:50AM +0200, Patrick Delaunay wrote: > Align reset_cpu function with the next prototypes in > sysreset.h or in cpu_func.h to solve compilation issue: > > void reset_cpu(void); > > This patch solves the prototype conflict when cpu_func.h is > included. > > Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-mediatek/mt8183/init.c b/arch/arm/mach-mediatek/mt8183/init.c index 877f387102..7496029705 100644 --- a/arch/arm/mach-mediatek/mt8183/init.c +++ b/arch/arm/mach-mediatek/mt8183/init.c @@ -48,7 +48,7 @@ int mtk_soc_early_init(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { psci_system_reset(); } diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index fb0cf09138..a50a052df7 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -374,7 +374,7 @@ void detail_board_ddr_info(void) /* * Board specific reset that is system reset. */ -void reset_cpu(ulong addr) +void reset_cpu(void) { /* TODO */ } diff --git a/board/hoperun/hihope-rzg2/hihope-rzg2.c b/board/hoperun/hihope-rzg2/hihope-rzg2.c index c1bfdcbc1d..c1db387b27 100644 --- a/board/hoperun/hihope-rzg2/hihope-rzg2.c +++ b/board/hoperun/hihope-rzg2/hihope-rzg2.c @@ -65,7 +65,7 @@ int board_init(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { unsigned long midr, cputype; diff --git a/board/silinux/ek874/ek874.c b/board/silinux/ek874/ek874.c index 5a219cd98d..1e948489f3 100644 --- a/board/silinux/ek874/ek874.c +++ b/board/silinux/ek874/ek874.c @@ -24,7 +24,7 @@ int board_init(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { writel(RST_CA53_CODE, RST_CA53RESCNT); }
Align reset_cpu function with the next prototypes in sysreset.h or in cpu_func.h to solve compilation issue: void reset_cpu(void); This patch solves the prototype conflict when cpu_func.h is included. Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> --- Changes in v2: - NEW: solve conflicts when cpu_func.h is included arch/arm/mach-mediatek/mt8183/init.c | 2 +- board/congatec/cgtqmx8/cgtqmx8.c | 2 +- board/hoperun/hihope-rzg2/hihope-rzg2.c | 2 +- board/silinux/ek874/ek874.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)