Merge tag 'u-boot-imx-20200121' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-zynq / spl.c

diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 6c5415ac8f5360a936f2219e512f2258b8778061..96ba90fb7a760faacd706fbe4e0b24d2e072581d 100644 (file)
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -1,35 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * (C) Copyright 2014 Xilinx, Inc. Michal Simek
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek
  */
 #include <common.h>
 #include <debug_uart.h>
+#include <hang.h>
 #include <spl.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <asm/arch/ps7_init_gpl.h>
 
 void board_init_f(ulong dummy)
 {
        ps7_init();
 
        arch_cpu_init();
-       /*
-        * The debug UART can be used from this point:
-        * debug_uart_init();
-        * printch('x');
-        */
+
+#ifdef CONFIG_DEBUG_UART
+       /* Uart debug for sure */
+       debug_uart_init();
+       puts("Debug uart enabled\n"); /* or printch() */
+#endif
 }
 
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void)
 {
        preloader_console_init();
+#if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA_SUPPORT)
+       arch_early_init_r();
+#endif
        board_init();
 }
 #endif
@@ -68,13 +71,6 @@ u32 spl_boot_device(void)
        return mode;
 }
 
-#ifdef CONFIG_SPL_MMC_SUPPORT
-u32 spl_boot_mode(void)
-{
-       return MMCSD_MODE_FS;
-}
-#endif
-
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
@@ -83,23 +79,6 @@ int spl_start_uboot(void)
 }
 #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)
 {
        ps7_post_config();