diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
| commit | c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb (patch) | |
| tree | 7c00728aa9d0c4cecf2d9203eebc093dbebbc07a /arch/arm/cpu/armv7/zynq/spl.c | |
| parent | 10dc77716f41979e03baf3b847b97dc7279ef30d (diff) | |
| parent | 9f9d41bad16efe0674257b4efe4db1a399f93643 (diff) | |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/zynq/spl.c')
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index fcad762c03..d73e5cbaa7 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -28,6 +28,13 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } +#ifdef CONFIG_SPL_BOARD_INIT +void spl_board_init(void) +{ + board_init(); +} +#endif + u32 spl_boot_device(void) { u32 mode; @@ -67,3 +74,11 @@ int spl_start_uboot(void) return 0; } #endif + +__weak void ps7_init(void) +{ + /* + * This function is overridden by the one in + * board/xilinx/zynq/ps7_init.c, if it exists. + */ +} |