brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 16:10:24 +09:00
Code Issues Projects Releases Wiki Activity

arm64: zynqmp: Propagate error value from psu_init()

Browse Source 
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 <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2018-01-10 11:48:48 +01:00
parent 7109930a70
commit f32e79f159
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/cpu/armv8/zynqmp/spl.c
View File

@ -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 * This function is overridden by the one in
* board/xilinx/zynqmp/(platform)/psu_init_gpl.c, if it exists. * board/xilinx/zynqmp/(platform)/psu_init_gpl.c, if it exists.
*/ */
return -1;
} }
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT

2
arch/arm/include/asm/arch-zynqmp/sys_proto.h
View File

@ -33,7 +33,7 @@ enum {
int zynq_board_read_rom_ethaddr(unsigned char *ethaddr); int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
unsigned int zynqmp_get_silicon_version(void); unsigned int zynqmp_get_silicon_version(void);
void psu_init(void); int psu_init(void);
void handoff_setup(void); void handoff_setup(void);

5
board/xilinx/zynqmp/zynqmp.c
View File

@ -237,15 +237,16 @@ static char *zynqmp_get_silicon_idcode_name(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
int ret = 0;
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP)
zynqmp_pmufw_version(); zynqmp_pmufw_version();
#endif #endif
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
psu_init(); ret = psu_init();
#endif #endif
return 0; return ret;
} }
#define ZYNQMP_VERSION_SIZE 9 #define ZYNQMP_VERSION_SIZE 9