bootstd: Add some more debugging in the bootdev uclass

Add some more output to make it easier to see what is going wrong when
a bootdev hunter fails.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 1c16ca1b8d75462ed3ec37275f703b7c2a094726..fa52bc3a9c4e8aebb93c27c83190cb1a835708c0 100644 (file)
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -537,6 +537,8 @@ static int default_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
        int ret;
 
        ret = bootdev_get_sibling_blk(dev, &blk);
+       log_debug("sibling_blk ret=%d, blk=%s\n", ret,
+                 ret ? "(none)" : blk->name);
        /*
         * If there is no media, indicate that no more partitions should be
         * checked
@@ -662,7 +664,8 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp)
                                ret = bootdev_hunt_prio(iter->cur_prio,
                                                        iter->flags &
                                                        BOOTFLOWIF_SHOW);
-                               log_debug("- hunt ret %d\n", ret);
+                               log_debug("- bootdev_hunt_prio() ret %d\n",
+                                         ret);
                                if (ret)
                                        return log_msg_ret("hun", ret);
                        }
@@ -698,6 +701,7 @@ int bootdev_setup_iter(struct bootflow_iter *iter, const char *label,
        /* hunt for any pre-scan devices */
        if (iter->flags & BOOTFLOWIF_HUNT) {
                ret = bootdev_hunt_prio(BOOTDEVP_1_PRE_SCAN, show);
+               log_debug("- bootdev_hunt_prio() ret %d\n", ret);
                if (ret)
                        return log_msg_ret("pre", ret);
        }
@@ -768,6 +772,7 @@ static int bootdev_hunt_drv(struct bootdev_hunter *info, uint seq, bool show)
                log_debug("Hunting with: %s\n", name);
                if (info->hunt) {
                        ret = info->hunt(info, show);
+                       log_debug("  - hunt result %d\n", ret);
                        if (ret)
                                return ret;
                }
@@ -833,9 +838,11 @@ int bootdev_hunt_prio(enum bootdev_prio_t prio, bool show)
                if (prio != info->prio)
                        continue;
                ret = bootdev_hunt_drv(info, i, show);
+               log_debug("bootdev_hunt_drv() return %d\n", ret);
                if (ret && ret != -ENOENT)
                        result = ret;
        }
+       log_debug("exit %d\n", result);
 
        return result;
 }