ARM: zynq: Do not print message about boot device

[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 e8added155672f0905b3740b7ea6e55e605f7e09..02a7dc9854753dfad2f277c0ad23a87b5b561eb5 100644 (file)
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -1,35 +1,39 @@
+// 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 <generated/dt.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
@@ -41,7 +45,6 @@ u32 spl_boot_device(void)
        switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
 #ifdef CONFIG_SPL_SPI_SUPPORT
        case ZYNQ_BM_QSPI:
-               puts("qspi boot\n");
                mode = BOOT_DEVICE_SPI;
                break;
 #endif
@@ -53,7 +56,6 @@ u32 spl_boot_device(void)
                break;
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case ZYNQ_BM_SD:
-               puts("mmc boot\n");
                mode = BOOT_DEVICE_MMC1;
                break;
 #endif
@@ -68,13 +70,6 @@ u32 spl_boot_device(void)
        return mode;
 }
 
-#ifdef CONFIG_SPL_MMC_SUPPORT
-u32 spl_boot_mode(const u32 boot_device)
-{
-       return MMCSD_MODE_FS;
-}
-#endif
-
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
@@ -83,23 +78,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();
@@ -110,8 +88,11 @@ void spl_board_prepare_for_boot(void)
 int board_fit_config_name_match(const char *name)
 {
        /* Just empty function now - can't decide what to choose */
-       debug("%s: %s\n", __func__, name);
+       debug("%s: Check %s, default %s\n", __func__, name, DEVICE_TREE);
 
-       return 0;
+       if (!strcmp(name, DEVICE_TREE))
+               return 0;
+
+       return -1;
 }
 #endif