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

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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 2d53237..a93172b 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -41,18 +41,15 @@
 # define CONFIG_BOOTP_MAY_FAIL
 #endif
 
-/* QSPI */
-
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_SYS_FLASH_BASE         0xE2000000
-# define CONFIG_SYS_FLASH_SIZE         (16 * 1024 * 1024)
 # define CONFIG_SYS_MAX_FLASH_BANKS    1
 # define CONFIG_SYS_MAX_FLASH_SECT     512
 # define CONFIG_SYS_FLASH_ERASE_TOUT   1000
 # define CONFIG_SYS_FLASH_WRITE_TOUT   5000
 # define CONFIG_FLASH_SHOW_PROGRESS    10
 # undef CONFIG_SYS_FLASH_EMPTY_INFO
+# define CONFIG_SYS_FLASH_QUIET_TEST
 #endif
 
 #ifdef CONFIG_NAND_ZYNQ
@@ -155,7 +152,8 @@
 #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \
        "bootcmd_qspi=sf probe 0 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) \
        "qspi "
@@ -163,7 +161,8 @@
 #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
        "bootcmd_nand=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) \
        "nand "
@@ -171,7 +170,8 @@
 #define BOOTENV_DEV_NOR(devtypeu, devtypel, instance) \
        "script_offset_nor=0xE2FC0000\0"        \
        "bootcmd_nor=cp.b ${script_offset_nor} ${scriptaddr} ${script_size_f} && " \
-                    "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0"
+                    "echo NOR: Trying to boot script at ${scriptaddr} && " \
+                    "source ${scriptaddr}; echo NOR: SCRIPT FAILED: continuing...;\0"
 
 #define BOOTENV_DEV_NAME_NOR(devtypeu, devtypel, instance) \
        "nor "
@@ -179,7 +179,8 @@
 #define BOOT_TARGET_DEVICES_JTAG(func)  func(JTAG, jtag, na)
 
 #define BOOTENV_DEV_JTAG(devtypeu, devtypel, instance) \
-       "bootcmd_jtag=source $scriptaddr; echo SCRIPT FAILED: continuing...;\0"
+       "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 "
@@ -201,7 +202,6 @@
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0x20000000\0"         \
-       "initrd_high=0x20000000\0"      \
        "scriptaddr=0x20000\0"  \
        "script_size_f=0x40000\0"       \
        "fdt_addr_r=0x1f00000\0"        \