vbe: Tidy up a few comments

Join the comment block for the fit_image_load() call back to where it
should be. Also fix a debug statement.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/vbe_common.c b/boot/vbe_common.c
index 0d51fe7..009bbcd 100644 (file)
--- a/boot/vbe_common.c
+++ b/boot/vbe_common.c
@@ -202,14 +202,6 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
        phase = IS_ENABLED(CONFIG_TPL_BUILD) ? IH_PHASE_NONE :
                IS_ENABLED(CONFIG_VPL_BUILD) ? IH_PHASE_SPL : IH_PHASE_U_BOOT;
 
-       /*
-        * Load the image from the FIT. We ignore any load-address information
-        * so in practice this simply locates the image in the external-data
-        * region and returns its address and size. Since we only loaded the FIT
-        * itself, only a part of the image will be present, at best.
-        */
-       fit_uname = NULL;
-       fit_uname_config = NULL;
        log_debug("loading FIT\n");
 
        if (xpl_phase() == PHASE_SPL && !IS_ENABLED(CONFIG_SANDBOX)) {
@@ -220,11 +212,19 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
                log_debug("doing SPL from %s blksz %lx log2blksz %x area_offset %lx + fdt_size %lx\n",
                          blk->name, desc->blksz, desc->log2blksz, area_offset, ALIGN(size, 4));
                ret = spl_load_simple_fit(image, &info, area_offset, buf);
-               log_debug("spl_load_abrec_fit() ret=%d\n", ret);
+               log_debug("spl_load_simple_fit() ret=%d\n", ret);
 
                return ret;
        }
 
+       /*
+        * Load the image from the FIT. We ignore any load-address information
+        * so in practice this simply locates the image in the external-data
+        * region and returns its address and size. Since we only loaded the FIT
+        * itself, only a part of the image will be present, at best.
+        */
+       fit_uname = NULL;
+       fit_uname_config = NULL;
        ret = fit_image_load(&images, addr, &fit_uname, &fit_uname_config,
                             IH_ARCH_DEFAULT, image_ph(phase, IH_TYPE_FIRMWARE),
                             BOOTSTAGE_ID_FIT_SPL_START, FIT_LOAD_IGNORED,