From f32e79f1595e4565d3b9af44a7f80efd7f017133 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 10 Jan 2018 11:48:48 +0100 Subject: arm64: zynqmp: Propagate error value from psu_init() psu_init() returns int which wasn't declared and checked. The patch is fixing function declarations and code to handle return values properly. Signed-off-by: Michal Simek --- arch/arm/cpu/armv8/zynqmp/spl.c | 3 ++- arch/arm/include/asm/arch-zynqmp/sys_proto.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/cpu/armv8/zynqmp/spl.c index e51e2b6156..41ca74a2be 100644 --- a/arch/arm/cpu/armv8/zynqmp/spl.c +++ b/arch/arm/cpu/armv8/zynqmp/spl.c @@ -129,12 +129,13 @@ u32 spl_boot_mode(const u32 boot_device) } } -__weak void psu_init(void) +__weak int psu_init(void) { /* * This function is overridden by the one in * board/xilinx/zynqmp/(platform)/psu_init_gpl.c, if it exists. */ + return -1; } #ifdef CONFIG_SPL_OS_BOOT diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h index ad28568633..4dfabba80a 100644 --- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h +++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h @@ -33,7 +33,7 @@ enum { int zynq_board_read_rom_ethaddr(unsigned char *ethaddr); unsigned int zynqmp_get_silicon_version(void); -void psu_init(void); +int psu_init(void); void handoff_setup(void); -- cgit v1.2.3