arm: Correct cpu_reset function prototype on some platforms
Some platforms were not including <cpu_func.h> which sets the prototype for reset_cpu, and in turn had it set wrong. Correct these cases. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
d9ab69d736
commit
f5131e80fc
5 changed files with 10 additions and 5 deletions
|
@ -7,6 +7,7 @@
|
|||
* Author: Jean-Marie Verdun <verdun@hpe.com>
|
||||
*/
|
||||
|
||||
#include <cpu_func.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#define GXP_CCR 0xc0000000
|
||||
|
@ -16,7 +17,7 @@ void lowlevel_init(void)
|
|||
{
|
||||
}
|
||||
|
||||
void reset_cpu(ulong ignored)
|
||||
void reset_cpu(void)
|
||||
{
|
||||
writel(1, GXP_CCR);
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
* Author: Sam Shih <sam.shih@mediatek.com>
|
||||
*/
|
||||
|
||||
#include <cpu_func.h>
|
||||
#include <init.h>
|
||||
#include <asm/armv8/mmu.h>
|
||||
#include <asm/system.h>
|
||||
|
@ -19,7 +20,7 @@ int dram_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void reset_cpu(ulong addr)
|
||||
void reset_cpu(void)
|
||||
{
|
||||
psci_system_reset();
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
* Author: Sam Shih <sam.shih@mediatek.com>
|
||||
*/
|
||||
|
||||
#include <cpu_func.h>
|
||||
#include <init.h>
|
||||
#include <asm/armv8/mmu.h>
|
||||
#include <asm/system.h>
|
||||
|
@ -19,7 +20,7 @@ int dram_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void reset_cpu(ulong addr)
|
||||
void reset_cpu(void)
|
||||
{
|
||||
psci_system_reset();
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <dm.h>
|
||||
#include <netdev.h>
|
||||
#include <dm/platform_data/serial_pl01x.h>
|
||||
|
@ -86,6 +87,6 @@ int dram_init_banksize(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void reset_cpu(ulong addr)
|
||||
void reset_cpu(void)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <bootstage.h>
|
||||
#include <dm.h>
|
||||
#include <dm/platform_data/serial_mxc.h>
|
||||
|
@ -720,7 +721,7 @@ int board_fit_config_name_match(const char *name)
|
|||
return -1;
|
||||
}
|
||||
|
||||
void reset_cpu(ulong addr)
|
||||
void reset_cpu(void)
|
||||
{
|
||||
puts("Hanging CPU for watchdog reset!\n");
|
||||
hang();
|
||||
|
|
Loading…
Reference in a new issue