arm64: versal-net: spi: Update boot sequence dynamically

Currently xspi0 is used for all spi boot modes, it means it will use "sf
probe 0 0 0" for all spi's irrespective of which node it is wired.

Get boot sequence from dev_seq() and update boot command for xspi
dynamically.

As a result bootcmd for spi is updated as below when two instances of spi
are present in DT node.
bootcmd_xspi0=devnum_xspi=0; run xspi_boot
bootcmd_xspi1=devnum_xspi=1; run xspi_boot

xspi_boot=sf probe $devnum_xspi:0 0 0 && sf read $scriptaddr
$script_offset_f $script_size_f && echo XSPI: Trying to boot script at
${scriptaddr} && source ${scriptaddr}; echo XSPI: SCRIPT FAILED:
continuing...;

Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
Link: https://lore.kernel.org/r/20230614093058.30438-1-ashok.reddy.soma@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c
index a68b608b82cb5490349f293b799f997e997cc68e..f0d2224b332e89a85837119182c444c97e068f6d 100644 (file)
--- a/board/xilinx/versal-net/board.c
+++ b/board/xilinx/versal-net/board.c
@@ -227,15 +227,33 @@ int board_late_init(void)
                break;
        case QSPI_MODE_24BIT:
                puts("QSPI_MODE_24\n");
-               mode = "xspi0";
+               if (uclass_get_device_by_name(UCLASS_SPI,
+                                             "spi@f1030000", &dev)) {
+                       puts("Boot from QSPI but without QSPI enabled!\n");
+                       return -1;
+               }
+               mode = "xspi";
+               bootseq = dev_seq(dev);
                break;
        case QSPI_MODE_32BIT:
                puts("QSPI_MODE_32\n");
-               mode = "xspi0";
+               if (uclass_get_device_by_name(UCLASS_SPI,
+                                             "spi@f1030000", &dev)) {
+                       puts("Boot from QSPI but without QSPI enabled!\n");
+                       return -1;
+               }
+               mode = "xspi";
+               bootseq = dev_seq(dev);
                break;
        case OSPI_MODE:
                puts("OSPI_MODE\n");
-               mode = "xspi0";
+               if (uclass_get_device_by_name(UCLASS_SPI,
+                                             "spi@f1010000", &dev)) {
+                       puts("Boot from OSPI but without OSPI enabled!\n");
+                       return -1;
+               }
+               mode = "xspi";
+               bootseq = dev_seq(dev);
                break;
        case EMMC_MODE:
                puts("EMMC_MODE\n");

diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 424ead038e3285071835084f4f4ced588b4d052c..613cce46f904c3095783f0d3af6bf5e6376dacc9 100644 (file)
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -76,20 +76,24 @@
 # define BOOT_TARGET_DEVICES_DHCP(func)
 #endif
 
-#if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL_NET)
-# define BOOT_TARGET_DEVICES_XSPI(func)        func(XSPI, xspi, 0)
+#if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL)
+# define BOOT_TARGET_DEVICES_XSPI(func)        func(XSPI, xspi, 0) func(XSPI, xspi, 1)
+# define BOOTENV_DEV_SHARED_XSPI \
+       "xspi_boot=sf probe $devnum_xspi:0 0 0 && " \
+       "sf read $scriptaddr $script_offset_f $script_size_f && " \
+       "echo XSPI: Trying to boot script at ${scriptaddr} && " \
+       "source ${scriptaddr}; echo XSPI: SCRIPT FAILED: continuing...;\0"
 #else
 # define BOOT_TARGET_DEVICES_XSPI(func)
+# define BOOTENV_DEV_SHARED_XSPI
 #endif
 
 #define BOOTENV_DEV_XSPI(devtypeu, devtypel, instance) \
-       "bootcmd_xspi0=sf probe 0 0 0 && " \
-       "sf read $scriptaddr $script_offset_f $script_size_f && " \
-       "echo XSPI: Trying to boot script at ${scriptaddr} && " \
-       "source ${scriptaddr}; echo XSPI: SCRIPT FAILED: continuing...;\0"
+       "bootcmd_" #devtypel #instance "=" \
+       "devnum_xspi=" #instance "; run " #devtypel "_boot\0" \
 
 #define BOOTENV_DEV_NAME_XSPI(devtypeu, devtypel, instance) \
-       "xspi0 "
+       ""
 
 #define BOOT_TARGET_DEVICES_JTAG(func) func(JTAG, jtag, na)
 
@@ -127,6 +131,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV \
+       BOOTENV_DEV_SHARED_XSPI \
        DFU_ALT_INFO
 #endif