| Message ID | a41e36c3d035860213ea01100bb9096f75104ae1.1587372416.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 19d130450544f505589b25afc30508136ab52b71 |
| Headers | show |
| Series | xilinx: Make Xilinx custom distro boot commands more verbose | expand |
po 20. 4. 2020 v 10:47 odes?latel Michal Simek <michal.simek at xilinx.com> napsal: > > Extend description of Xilinx custom boot commands to make clear what runs > and what failed. > > Signed-off-by: Michal Simek <michal.simek at xilinx.com> > --- > > include/configs/xilinx_versal.h | 12 ++++++++---- > include/configs/xilinx_zynqmp.h | 9 ++++++--- > include/configs/zynq-common.h | 12 ++++++++---- > 3 files changed, 22 insertions(+), 11 deletions(-) > > diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h > index dec5001b5fe4..0c259a181f10 100644 > --- a/include/configs/xilinx_versal.h > +++ b/include/configs/xilinx_versal.h > @@ -109,7 +109,8 @@ > #define BOOTENV_DEV_XSPI(devtypeu, devtypel, instance) \ > "bootcmd_xspi0=sf probe 0 0 0 && " \ > "sf read $scriptaddr $script_offset_f $script_size_f && " \ > - "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" > + "echo XSPI: Trying to boot script at ${scriptaddr} && " \ > + "source ${scriptaddr}; echo XSPI: SCRIPT FAILED: continuing...;\0" > > #define BOOTENV_DEV_NAME_XSPI(devtypeu, devtypel, instance) \ > "xspi " > @@ -117,7 +118,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 " > @@ -126,8 +128,10 @@ > > #define BOOTENV_DEV_DFU_USB(devtypeu, devtypel, instance) \ > "bootcmd_dfu_usb=setenv dfu_alt_info boot.scr ram $scriptaddr " \ > - "$script_size_f; dfu 0 ram 0 && source $scriptaddr; " \ > - "echo SCRIPT FAILED: continuing...;\0" > + "$script_size_f; dfu 0 ram 0 && " \ > + "echo DFU: Trying to boot script at ${scriptaddr} && " \ > + "source ${scriptaddr}; " \ > + "echo DFU: SCRIPT FAILED: continuing...;\0" > > #define BOOTENV_DEV_NAME_DFU_USB(devtypeu, devtypel, instance) \ > "dfu_usb " > diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h > index 010738363d13..eddc2b402006 100644 > --- a/include/configs/xilinx_zynqmp.h > +++ b/include/configs/xilinx_zynqmp.h > @@ -160,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 " " > @@ -168,7 +169,8 @@ > #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 " " > @@ -176,7 +178,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 " > diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h > index 4ccc31e37655..a93172b02cd6 100644 > --- a/include/configs/zynq-common.h > +++ b/include/configs/zynq-common.h > @@ -152,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 " > @@ -160,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 " > @@ -168,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 " > @@ -176,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 " > -- > 2.26.0 > Applied. M
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index dec5001b5fe4..0c259a181f10 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -109,7 +109,8 @@ #define BOOTENV_DEV_XSPI(devtypeu, devtypel, instance) \ "bootcmd_xspi0=sf probe 0 0 0 && " \ "sf read $scriptaddr $script_offset_f $script_size_f && " \ - "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + "echo XSPI: Trying to boot script at ${scriptaddr} && " \ + "source ${scriptaddr}; echo XSPI: SCRIPT FAILED: continuing...;\0" #define BOOTENV_DEV_NAME_XSPI(devtypeu, devtypel, instance) \ "xspi " @@ -117,7 +118,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 " @@ -126,8 +128,10 @@ #define BOOTENV_DEV_DFU_USB(devtypeu, devtypel, instance) \ "bootcmd_dfu_usb=setenv dfu_alt_info boot.scr ram $scriptaddr " \ - "$script_size_f; dfu 0 ram 0 && source $scriptaddr; " \ - "echo SCRIPT FAILED: continuing...;\0" + "$script_size_f; dfu 0 ram 0 && " \ + "echo DFU: Trying to boot script at ${scriptaddr} && " \ + "source ${scriptaddr}; " \ + "echo DFU: SCRIPT FAILED: continuing...;\0" #define BOOTENV_DEV_NAME_DFU_USB(devtypeu, devtypel, instance) \ "dfu_usb " diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 010738363d13..eddc2b402006 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -160,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 " " @@ -168,7 +169,8 @@ #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 " " @@ -176,7 +178,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 " diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 4ccc31e37655..a93172b02cd6 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -152,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 " @@ -160,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 " @@ -168,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 " @@ -176,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 "
Extend description of Xilinx custom boot commands to make clear what runs and what failed. Signed-off-by: Michal Simek <michal.simek at xilinx.com> --- include/configs/xilinx_versal.h | 12 ++++++++---- include/configs/xilinx_zynqmp.h | 9 ++++++--- include/configs/zynq-common.h | 12 ++++++++---- 3 files changed, 22 insertions(+), 11 deletions(-)