From f0fd90cf3d4f1248937ed6893f166d0904c27b49 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Feb 2019 13:28:47 +0100 Subject: [PATCH] arm64: zynqmp: Fix nand/qspi boot command If instance number is passed to func(, , 0) then it has to be reflected by bootcmd_ command. Do it in a more generic way that devtypel and instance numbers are taken from parameters. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 8bb4ee769ea..53f1455112a 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -271,20 +271,20 @@ "xilinx " #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ - "bootcmd_qspi0=sf probe 0 0 0 && " \ + "bootcmd_" #devtypel #instance "=sf probe " #instance " 0 0 && " \ "sf read $scriptaddr $script_offset_f $script_size_f && " \ "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" #define BOOTENV_DEV_NAME_QSPI(devtypeu, devtypel, instance) \ - "qspi " + #devtypel #instance " " #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ - "bootcmd_nand0= nand info && " \ + "bootcmd_" #devtypel #instance "= nand info && " \ "nand read $scriptaddr $script_offset_f $script_size_f && " \ "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ - "nand " + #devtypel #instance " " #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ -- 2.47.3