Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[platform/kernel/u-boot.git] / include / configs / xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 684faae..eddc2b4 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -62,7 +62,6 @@
 #if defined(CONFIG_ZYNQMP_USB)
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define CONFIG_USB_CABLE_CHECK
 #define CONFIG_THOR_RESET_OFF
 #define DFU_ALT_INFO_RAM \
        "dfu_ram_info=" \
@@ -95,7 +94,6 @@
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              2048
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_PANIC_HANG
 #define CONFIG_SYS_MAXARGS             64
 
 /* Ethernet driver */
@@ -110,13 +108,11 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS \
        "fdt_high=10000000\0" \
-       "initrd_high=10000000\0" \
        "fdt_addr_r=0x40000000\0" \
        "pxefile_addr_r=0x10000000\0" \
        "kernel_addr_r=0x18000000\0" \
-       "scriptaddr=0x02000000\0" \
+       "scriptaddr=0x20000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
-       "script_offset_f=0x3e80000\0" \
        "script_size_f=0x80000\0" \
 
 #if defined(CONFIG_MMC_SDHCI_ZYNQ)
@@ -164,7 +160,8 @@
 #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \
        "bootcmd_" #devtypel #instance "=sf probe " #instance " 0 0 && " \
                       "sf read $scriptaddr $script_offset_f $script_size_f && " \
-                      "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0"
+                      "echo QSPI: Trying to boot script at ${scriptaddr} && " \
+                      "source ${scriptaddr}; echo QSPI: SCRIPT FAILED: continuing...;\0"
 
 #define BOOTENV_DEV_NAME_QSPI(devtypeu, devtypel, instance) \
        #devtypel #instance " "
@@ -172,12 +169,23 @@
 #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
        "bootcmd_" #devtypel #instance "= nand info && " \
                       "nand read $scriptaddr $script_offset_f $script_size_f && " \
-                      "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0"
+                      "echo NAND: Trying to boot script at ${scriptaddr} && " \
+                      "source ${scriptaddr}; echo NAND: SCRIPT FAILED: continuing...;\0"
 
 #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
        #devtypel #instance " "
 
+#define BOOT_TARGET_DEVICES_JTAG(func) func(JTAG, jtag, na)
+
+#define BOOTENV_DEV_JTAG(devtypeu, devtypel, instance) \
+       "bootcmd_jtag=echo JTAG: Trying to boot script at ${scriptaddr} && " \
+               "source ${scriptaddr}; echo JTAG: SCRIPT FAILED: continuing...;\0"
+
+#define BOOTENV_DEV_NAME_JTAG(devtypeu, devtypel, instance) \
+       "jtag "
+
 #define BOOT_TARGET_DEVICES(func) \
+       BOOT_TARGET_DEVICES_JTAG(func) \
        BOOT_TARGET_DEVICES_MMC(func) \
        BOOT_TARGET_DEVICES_QSPI(func) \
        BOOT_TARGET_DEVICES_NAND(func) \
@@ -218,8 +226,6 @@
 # define CONFIG_SYS_SPI_KERNEL_OFFS    0x80000
 # define CONFIG_SYS_SPI_ARGS_OFFS      0xa0000
 # define CONFIG_SYS_SPI_ARGS_SIZE      0xa0000
-
-# define CONFIG_SYS_SPI_U_BOOT_OFFS    0x170000
 #endif
 
 /* u-boot is like dtb */
@@ -238,7 +244,11 @@
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS        0 /* unused */
 # define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR       0 /* unused */
-# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME       "u-boot.img"
+# if defined(CONFIG_SPL_LOAD_FIT)
+#  define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME      "u-boot.itb"
+# else
+#  define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME      "u-boot.img"
+# endif
 #endif
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)