xilinx: Define only mmc devnum not partition
authorMichal Simek <michal.simek@amd.com>
Tue, 9 Aug 2022 14:32:54 +0000 (16:32 +0200)
committerMichal Simek <michal.simek@amd.com>
Tue, 13 Sep 2022 09:32:48 +0000 (11:32 +0200)
The commit 53b406369e9d ("DFU: Check the number of arguments and argument
string strictly") added strict control over string that 0:1 partition
definition is not valid anymore that's why use only device number without
partition ID. Device is specified by 2nd parameter and partition by 3rd.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/840eca944f4f2abeeb63b5d724f9ba5fe9a9213b.1660055571.git.michal.simek@amd.com
board/xilinx/zynq/board.c
board/xilinx/zynqmp/zynqmp.c

index 3ab63fa..c96433b 100644 (file)
@@ -176,7 +176,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
        switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
        case ZYNQ_BM_SD:
                snprintf(buf, DFU_ALT_BUF_LEN,
-                        "mmc 0:1=boot.bin fat 0 1;"
+                        "mmc 0=boot.bin fat 0 1;"
                         "%s fat 0 1", CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
                break;
        case ZYNQ_BM_QSPI:
index 29a6e36..21bcc26 100644 (file)
@@ -661,13 +661,13 @@ void set_dfu_alt_info(char *interface, char *devstr)
                bootseq = mmc_get_env_dev();
                if (!multiboot)
                        snprintf(buf, DFU_ALT_BUF_LEN,
-                                "mmc %d:1=boot.bin fat %d 1;"
+                                "mmc %d=boot.bin fat %d 1;"
                                 "%s fat %d 1",
                                 bootseq, bootseq,
                                 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, bootseq);
                else
                        snprintf(buf, DFU_ALT_BUF_LEN,
-                                "mmc %d:1=boot%04d.bin fat %d 1;"
+                                "mmc %d=boot%04d.bin fat %d 1;"
                                 "%s fat %d 1",
                                 bootseq, multiboot, bootseq,
                                 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, bootseq);