]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
xilinx: zynqmp: Do not setup boot_targets if driver is not enabled
authorVenkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
Mon, 4 Sep 2023 03:20:35 +0000 (08:50 +0530)
committerMichal Simek <michal.simek@amd.com>
Thu, 21 Sep 2023 11:20:11 +0000 (13:20 +0200)
SOC can boot in the device which is not accessible from APU and running
this is detected as error which ends up in stopping boot process.
Boot mode detection and logic around is present to setup priority on boot
devices that SOC boot device is likely also used for booting OS.
Change logic to detect this case with showing message about it but don't fail
in boot process and don't prioritize boot device in this case.

Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20230904032035.11926-4-venkatesh.abbarapu@amd.com
board/xilinx/zynqmp/zynqmp.c

index 309f24a5f43d627714982317abe91f5aa39a7c44..0b6d4e57078bdf261cde451d9b31023a82733346 100644 (file)
@@ -391,7 +391,7 @@ int board_late_init(void)
        int bootseq = -1;
        int bootseq_len = 0;
        int env_targets_len = 0;
-       const char *mode;
+       const char *mode = NULL;
        char *new_targets;
        char *env_targets;
        int ret, multiboot;
@@ -442,8 +442,8 @@ int board_late_init(void)
                                              "mmc@ff160000", &dev) &&
                    uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@ff160000", &dev)) {
-                       puts("Boot from EMMC but without SD0 enabled!\n");
-                       return -1;
+                       debug("SD0 driver for SD0 device is not present\n");
+                       break;
                }
                debug("mmc0 device found at %p, seq %d\n", dev, dev_seq(dev));
 
@@ -457,8 +457,8 @@ int board_late_init(void)
                                              "mmc@ff160000", &dev) &&
                    uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@ff160000", &dev)) {
-                       puts("Boot from SD0 but without SD0 enabled!\n");
-                       return -1;
+                       debug("SD0 driver for SD0 device is not present\n");
+                       break;
                }
                debug("mmc0 device found at %p, seq %d\n", dev, dev_seq(dev));
 
@@ -475,8 +475,8 @@ int board_late_init(void)
                                              "mmc@ff170000", &dev) &&
                    uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@ff170000", &dev)) {
-                       puts("Boot from SD1 but without SD1 enabled!\n");
-                       return -1;
+                       debug("SD1 driver for SD1 device is not present\n");
+                       break;
                }
                debug("mmc1 device found at %p, seq %d\n", dev, dev_seq(dev));
 
@@ -490,39 +490,40 @@ int board_late_init(void)
                env_set("modeboot", "nandboot");
                break;
        default:
-               mode = "";
                printf("Invalid Boot Mode:0x%x\n", bootmode);
                break;
        }
 
-       if (bootseq >= 0) {
-               bootseq_len = snprintf(NULL, 0, "%i", bootseq);
-               debug("Bootseq len: %x\n", bootseq_len);
-               env_set_hex("bootseq", bootseq);
-       }
+       if (mode) {
+               if (bootseq >= 0) {
+                       bootseq_len = snprintf(NULL, 0, "%i", bootseq);
+                       debug("Bootseq len: %x\n", bootseq_len);
+                       env_set_hex("bootseq", bootseq);
+               }
 
-       /*
-        * One terminating char + one byte for space between mode
-        * and default boot_targets
-        */
-       env_targets = env_get("boot_targets");
-       if (env_targets)
-               env_targets_len = strlen(env_targets);
-
-       new_targets = calloc(1, strlen(mode) + env_targets_len + 2 +
-                            bootseq_len);
-       if (!new_targets)
-               return -ENOMEM;
-
-       if (bootseq >= 0)
-               sprintf(new_targets, "%s%x %s", mode, bootseq,
-                       env_targets ? env_targets : "");
-       else
-               sprintf(new_targets, "%s %s", mode,
-                       env_targets ? env_targets : "");
-
-       env_set("boot_targets", new_targets);
-       free(new_targets);
+               /*
+                * One terminating char + one byte for space between mode
+                * and default boot_targets
+                */
+               env_targets = env_get("boot_targets");
+               if (env_targets)
+                       env_targets_len = strlen(env_targets);
+
+               new_targets = calloc(1, strlen(mode) + env_targets_len + 2 +
+                                    bootseq_len);
+               if (!new_targets)
+                       return -ENOMEM;
+
+               if (bootseq >= 0)
+                       sprintf(new_targets, "%s%x %s", mode, bootseq,
+                               env_targets ? env_targets : "");
+               else
+                       sprintf(new_targets, "%s %s", mode,
+                               env_targets ? env_targets : "");
+
+               env_set("boot_targets", new_targets);
+               free(new_targets);
+       }
 
        reset_reason();