mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 10:30:50 +09:00
arm: zynq: Move ps7_* to separate file
Extract ps7_* from spl code to prepare for extension. And also return value. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
parent
a3b36c8424
commit
f0b619ec29
@ -15,4 +15,4 @@ obj-y += slcr.o
|
|||||||
obj-y += clk.o
|
obj-y += clk.o
|
||||||
obj-y += lowlevel_init.o
|
obj-y += lowlevel_init.o
|
||||||
AFLAGS_lowlevel_init.o := -mfpu=neon
|
AFLAGS_lowlevel_init.o := -mfpu=neon
|
||||||
obj-$(CONFIG_SPL_BUILD) += spl.o
|
obj-$(CONFIG_SPL_BUILD) += spl.o ps7_spl_init.o
|
||||||
|
14
arch/arm/mach-zynq/include/mach/ps7_init_gpl.h
Normal file
14
arch/arm/mach-zynq/include/mach/ps7_init_gpl.h
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
/*
|
||||||
|
* (c) Copyright 2010-2017 Xilinx, Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _ASM_ARCH_PS7_INIT_GPL_H
|
||||||
|
#define _ASM_ARCH_PS7_INIT_GPL_H
|
||||||
|
|
||||||
|
/* Called by spl.c */
|
||||||
|
int ps7_init(void);
|
||||||
|
int ps7_post_config(void);
|
||||||
|
|
||||||
|
#endif /* _ASM_ARCH_PS7_INIT_GPL_H */
|
@ -20,8 +20,4 @@ extern unsigned int zynq_get_silicon_version(void);
|
|||||||
|
|
||||||
int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
|
int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
|
||||||
|
|
||||||
/* Driver extern functions */
|
|
||||||
extern void ps7_init(void);
|
|
||||||
int ps7_post_config(void);
|
|
||||||
|
|
||||||
#endif /* _SYS_PROTO_H_ */
|
#endif /* _SYS_PROTO_H_ */
|
||||||
|
27
arch/arm/mach-zynq/ps7_spl_init.c
Normal file
27
arch/arm/mach-zynq/ps7_spl_init.c
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* (c) Copyright 2010-2017 Xilinx, Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <asm/io.h>
|
||||||
|
#include <asm/spl.h>
|
||||||
|
#include <asm/arch/ps7_init_gpl.h>
|
||||||
|
|
||||||
|
__weak int ps7_init(void)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* This function is overridden by the one in
|
||||||
|
* board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
|
||||||
|
*/
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
__weak int ps7_post_config(void)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* This function is overridden by the one in
|
||||||
|
* board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
|
||||||
|
*/
|
||||||
|
return 0;
|
||||||
|
}
|
@ -11,6 +11,7 @@
|
|||||||
#include <asm/spl.h>
|
#include <asm/spl.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
|
#include <asm/arch/ps7_init_gpl.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
@ -83,23 +84,6 @@ int spl_start_uboot(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__weak void ps7_init(void)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* This function is overridden by the one in
|
|
||||||
* board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
__weak int ps7_post_config(void)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* This function is overridden by the one in
|
|
||||||
* board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
|
|
||||||
*/
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void spl_board_prepare_for_boot(void)
|
void spl_board_prepare_for_boot(void)
|
||||||
{
|
{
|
||||||
ps7_post_config();
|
ps7_post_config();
|
||||||
|
Loading…
Reference in New Issue
Block a user