Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / board / xilinx / zynq / board.c

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index e4f86d1..2164eac 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -5,84 +5,79 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <dm/uclass.h>
+#include <env.h>
 #include <fdtdec.h>
 #include <fpga.h>
+#include <malloc.h>
 #include <mmc.h>
+#include <watchdog.h>
 #include <wdt.h>
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT)
-static struct udevice *watchdog_dev;
-#endif
-
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_BOARD_EARLY_INIT_F)
-int board_early_init_f(void)
-{
-# if defined(CONFIG_WDT)
-       /* bss is not cleared at time when watchdog_reset() is called */
-       watchdog_dev = NULL;
-# endif
-
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT)
-       if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
-               puts("Watchdog: Not found!\n");
-       } else {
-               wdt_start(watchdog_dev, 0, 0);
-               puts("Watchdog: Started\n");
-       }
-# endif
-
        return 0;
 }
 
 int board_late_init(void)
 {
+       int env_targets_len = 0;
+       const char *mode;
+       char *new_targets;
+       char *env_targets;
+
        switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
        case ZYNQ_BM_QSPI:
+               mode = "qspi";
                env_set("modeboot", "qspiboot");
                break;
        case ZYNQ_BM_NAND:
+               mode = "nand";
                env_set("modeboot", "nandboot");
                break;
        case ZYNQ_BM_NOR:
+               mode = "nor";
                env_set("modeboot", "norboot");
                break;
        case ZYNQ_BM_SD:
+               mode = "mmc0";
                env_set("modeboot", "sdboot");
                break;
        case ZYNQ_BM_JTAG:
+               mode = "jtag pxe dhcp";
                env_set("modeboot", "jtagboot");
                break;
        default:
+               mode = "";
                env_set("modeboot", "");
                break;
        }
 
-       return 0;
-}
+       /*
+        * One terminating char + one byte for space between mode
+        * and default boot_targets
+        */
+       env_targets = env_get("boot_targets");
+       if (env_targets)
+               env_targets_len = strlen(env_targets);
 
-int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
-{
-#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \
-    defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET)
-       if (eeprom_read(CONFIG_ZYNQ_GEM_EEPROM_ADDR,
-                       CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET,
-                       ethaddr, 6))
-               printf("I2C EEPROM MAC address read failed\n");
-#endif
+       new_targets = calloc(1, strlen(mode) + env_targets_len + 2);
+       if (!new_targets)
+               return -ENOMEM;
 
-       return 0;
+       sprintf(new_targets, "%s %s", mode,
+               env_targets ? env_targets : "");
+
+       env_set("boot_targets", new_targets);
+
+       return board_late_init_xilinx();
 }
 
 #if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
@@ -93,7 +88,7 @@ int dram_init_banksize(void)
 
 int dram_init(void)
 {
-       if (fdtdec_setup_memory_size() != 0)
+       if (fdtdec_setup_mem_size_base() != 0)
                return -EINVAL;
 
        zynq_ddrc_init();
@@ -111,25 +106,3 @@ int dram_init(void)
        return 0;
 }
 #endif
-
-#if defined(CONFIG_WATCHDOG)
-/* Called by macro WATCHDOG_RESET */
-void watchdog_reset(void)
-{
-# if !defined(CONFIG_SPL_BUILD)
-       static ulong next_reset;
-       ulong now;
-
-       if (!watchdog_dev)
-               return;
-
-       now = timer_get_us();
-
-       /* Do not reset the watchdog too often */
-       if (now > next_reset) {
-               wdt_reset(watchdog_dev);
-               next_reset = now + 1000;
-       }
-# endif
-}
-#endif