command: Remove the cmd_tbl_t typedef

[J-u-boot.git] / board / xilinx / zynqmp / zynqmp.c

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 5e1d2116bc32f42458d5d30ad522ba96891de70c..7a8c745f9beff99f55c784c923de90dbd51ddce1 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -5,6 +5,12 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <command.h>
+#include <cpu_func.h>
+#include <debug_uart.h>
+#include <env.h>
+#include <init.h>
+#include <net.h>

 #include <sata.h>
 #include <ahci.h>
 #include <scsi.h>
 #include <sata.h>
 #include <ahci.h>
 #include <scsi.h>


@@ -14,19 +20,20 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/psu_init_gpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/psu_init_gpl.h>

+#include <asm/cache.h>

 #include <asm/io.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <zynqmppl.h>
 #include <asm/io.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <zynqmppl.h>

+#include <zynqmp_firmware.h>

 #include <g_dnl.h>
 #include <g_dnl.h>

+#include "../common/board.h"

 
 

-DECLARE_GLOBAL_DATA_PTR;
+#include "pm_cfg_obj.h"

 
 

-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT)
-static struct udevice *watchdog_dev;
-#endif
+DECLARE_GLOBAL_DATA_PTR;

 
 #if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \
     !defined(CONFIG_SPL_BUILD)
 
 #if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \
     !defined(CONFIG_SPL_BUILD)


@@ -170,6 +177,18 @@ static const struct {
                .id = 0x62,
                .name = "29dr",
        },
                .id = 0x62,
                .name = "29dr",
        },

+       {
+               .id = 0x66,
+               .name = "39dr",
+       },
+       {
+               .id = 0x7b,
+               .name = "48dr",
+       },
+       {
+               .id = 0x7e,
+               .name = "49dr",
+       },

 };
 #endif
 
 };
 #endif
 


@@ -304,34 +323,54 @@ static char *zynqmp_get_silicon_idcode_name(void)
 
 int board_early_init_f(void)
 {
 
 int board_early_init_f(void)
 {

-       int ret = 0;
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP)
-       u32 pm_api_version;
+#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
+       int ret;

 
 

-       pm_api_version = zynqmp_pmufw_version();
-       printf("PMUFW:\tv%d.%d\n",
-              pm_api_version >> ZYNQMP_PM_VERSION_MAJOR_SHIFT,
-              pm_api_version & ZYNQMP_PM_VERSION_MINOR_MASK);
+       ret = psu_init();
+       if (ret)
+               return ret;

 
 

-       if (pm_api_version < ZYNQMP_PM_VERSION)
-               panic("PMUFW version error. Expected: v%d.%d\n",
-                     ZYNQMP_PM_VERSION_MAJOR, ZYNQMP_PM_VERSION_MINOR);
+       /* Delay is required for clocks to be propagated */
+       udelay(1000000);

 #endif
 
 #endif
 

-#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
-       ret = psu_init();
+#ifdef CONFIG_DEBUG_UART
+       /* Uart debug for sure */
+       debug_uart_init();
+       puts("Debug uart enabled\n"); /* or printch() */

 #endif
 
 #endif
 

-#if defined(CONFIG_WDT) && !defined(CONFIG_SPL_BUILD)
-       /* bss is not cleared at time when watchdog_reset() is called */
-       watchdog_dev = NULL;
-#endif
+       return 0;
+}

 
 

-       return ret;
+static int multi_boot(void)
+{
+       u32 multiboot;
+
+       multiboot = readl(&csu_base->multi_boot);
+
+       printf("Multiboot:\t%x\n", multiboot);
+
+       return 0;

 }
 
 int board_init(void)
 {
 }
 
 int board_init(void)
 {

+#if defined(CONFIG_ZYNQMP_FIRMWARE)
+       struct udevice *dev;
+
+       uclass_get_device_by_name(UCLASS_FIRMWARE, "zynqmp-power", &dev);
+       if (!dev)
+               panic("PMU Firmware device not found - Enable it");
+#endif
+
+#if defined(CONFIG_SPL_BUILD)
+       /* Check *at build time* if the filename is an non-empty string */
+       if (sizeof(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE) > 1)
+               zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj,
+                                               zynqmp_pm_cfg_obj_size);
+#endif
+

        printf("EL Level:\tEL%d\n", current_el());
 
 #if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \
        printf("EL Level:\tEL%d\n", current_el());
 
 #if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \


@@ -345,44 +384,12 @@ int board_init(void)
        }
 #endif
 
        }
 #endif
 

-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT)
-       if (uclass_get_device_by_seq(UCLASS_WDT, 0, &watchdog_dev)) {
-               debug("Watchdog: Not found by seq!\n");
-               if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
-                       puts("Watchdog: Not found!\n");
-                       return 0;
-               }
-       }
-
-       wdt_start(watchdog_dev, 0, 0);
-       puts("Watchdog: Started\n");
-#endif
+       if (current_el() == 3)
+               multi_boot();

 
        return 0;
 }
 
 
        return 0;
 }
 

-#ifdef 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
-

 int board_early_init_r(void)
 {
        u32 val;
 int board_early_init_r(void)
 {
        u32 val;


@@ -409,7 +416,7 @@ int board_early_init_r(void)
 }
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
 }
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,

-                        char * const argv[])
+                        char *const argv[])

 {
        int ret = 0;
 
 {
        int ret = 0;
 


@@ -487,18 +494,20 @@ static const struct {
        {}
 };
 
        {}
 };
 

-static u32 reset_reason(void)
+static int reset_reason(void)

 {
 {

-       u32 ret;
-       int i;
+       u32 reg;
+       int i, ret;

        const char *reason = NULL;
 
        const char *reason = NULL;
 

-       ret = readl(&crlapb_base->reset_reason);
+       ret = zynqmp_mmio_read((ulong)&crlapb_base->reset_reason, &reg);
+       if (ret)
+               return -EINVAL;

 
        puts("Reset reason:\t");
 
        for (i = 0; i < ARRAY_SIZE(reset_reasons); i++) {
 
        puts("Reset reason:\t");
 
        for (i = 0; i < ARRAY_SIZE(reset_reasons); i++) {

-               if (ret & reset_reasons[i].bit) {
+               if (reg & reset_reasons[i].bit) {

                        reason = reset_reasons[i].name;
                        printf("%s ", reset_reasons[i].name);
                        break;
                        reason = reset_reasons[i].name;
                        printf("%s ", reset_reasons[i].name);
                        break;


@@ -509,7 +518,9 @@ static u32 reset_reason(void)
 
        env_set("reset_reason", reason);
 
 
        env_set("reset_reason", reason);
 

-       writel(~0, &crlapb_base->reset_reason);
+       ret = zynqmp_mmio_write((ulong)&crlapb_base->reset_reason, ~0, ~0);
+       if (ret)
+               return -EINVAL;

 
        return ret;
 }
 
        return ret;
 }


@@ -544,9 +555,26 @@ static int set_fdtfile(void)
        return 0;
 }
 
        return 0;
 }
 

-int board_late_init(void)
+static u8 zynqmp_get_bootmode(void)

 {
 {

+       u8 bootmode;

        u32 reg = 0;
        u32 reg = 0;

+       int ret;
+
+       ret = zynqmp_mmio_read((ulong)&crlapb_base->boot_mode, &reg);
+       if (ret)
+               return -EINVAL;
+
+       if (reg >> BOOT_MODE_ALT_SHIFT)
+               reg >>= BOOT_MODE_ALT_SHIFT;
+
+       bootmode = reg & BOOT_MODES_MASK;
+
+       return bootmode;
+}
+
+int board_late_init(void)
+{

        u8 bootmode;
        struct udevice *dev;
        int bootseq = -1;
        u8 bootmode;
        struct udevice *dev;
        int bootseq = -1;


@@ -570,14 +598,7 @@ int board_late_init(void)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       ret = zynqmp_mmio_read((ulong)&crlapb_base->boot_mode, &reg);
-       if (ret)
-               return -EINVAL;
-
-       if (reg >> BOOT_MODE_ALT_SHIFT)
-               reg >>= BOOT_MODE_ALT_SHIFT;
-
-       bootmode = reg & BOOT_MODES_MASK;
+       bootmode = zynqmp_get_bootmode();

 
        puts("Bootmode: ");
        switch (bootmode) {
 
        puts("Bootmode: ");
        switch (bootmode) {


@@ -588,7 +609,7 @@ int board_late_init(void)
                break;
        case JTAG_MODE:
                puts("JTAG_MODE\n");
                break;
        case JTAG_MODE:
                puts("JTAG_MODE\n");

-               mode = "pxe dhcp";
+               mode = "jtag pxe dhcp";

                env_set("modeboot", "jtagboot");
                break;
        case QSPI_MODE_24BIT:
                env_set("modeboot", "jtagboot");
                break;
        case QSPI_MODE_24BIT:


@@ -599,8 +620,17 @@ int board_late_init(void)
                break;
        case EMMC_MODE:
                puts("EMMC_MODE\n");
                break;
        case EMMC_MODE:
                puts("EMMC_MODE\n");

-               mode = "mmc0";
-               env_set("modeboot", "emmcboot");
+               if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@ff160000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
+                                             "sdhci@ff160000", &dev)) {
+                       puts("Boot from EMMC but without SD0 enabled!\n");
+                       return -1;
+               }
+               debug("mmc0 device found at %p, seq %d\n", dev, dev->seq);
+
+               mode = "mmc";
+               bootseq = dev->seq;

                break;
        case SD_MODE:
                puts("SD_MODE\n");
                break;
        case SD_MODE:
                puts("SD_MODE\n");


@@ -675,7 +705,7 @@ int board_late_init(void)
 
        reset_reason();
 
 
        reset_reason();
 

-       return 0;
+       return board_late_init_xilinx();

 }
 #endif
 
 }
 #endif