"Das U-Boot" Source Tree
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>
authored by
Simon Glass
and committed by
Tom Rini
39a9b033
dab3bbc2
+9
-9
+9
-9
boot/vbe_common.c
+9
-9
boot/vbe_common.c
···
202
202
phase = IS_ENABLED(CONFIG_TPL_BUILD) ? IH_PHASE_NONE :
203
203
IS_ENABLED(CONFIG_VPL_BUILD) ? IH_PHASE_SPL : IH_PHASE_U_BOOT;
204
204
205
-
/*
206
-
* Load the image from the FIT. We ignore any load-address information
207
-
* so in practice this simply locates the image in the external-data
208
-
* region and returns its address and size. Since we only loaded the FIT
209
-
* itself, only a part of the image will be present, at best.
210
-
*/
211
-
fit_uname = NULL;
212
-
fit_uname_config = NULL;
213
205
log_debug("loading FIT\n");
214
206
215
207
if (xpl_phase() == PHASE_SPL && !IS_ENABLED(CONFIG_SANDBOX)) {
···
220
212
log_debug("doing SPL from %s blksz %lx log2blksz %x area_offset %lx + fdt_size %lx\n",
221
213
blk->name, desc->blksz, desc->log2blksz, area_offset, ALIGN(size, 4));
222
214
ret = spl_load_simple_fit(image, &info, area_offset, buf);
223
-
log_debug("spl_load_abrec_fit() ret=%d\n", ret);
215
+
log_debug("spl_load_simple_fit() ret=%d\n", ret);
224
216
225
217
return ret;
226
218
}
227
219
220
+
/*
221
+
* Load the image from the FIT. We ignore any load-address information
222
+
* so in practice this simply locates the image in the external-data
223
+
* region and returns its address and size. Since we only loaded the FIT
224
+
* itself, only a part of the image will be present, at best.
225
+
*/
226
+
fit_uname = NULL;
227
+
fit_uname_config = NULL;
228
228
ret = fit_image_load(&images, addr, &fit_uname, &fit_uname_config,
229
229
IH_ARCH_DEFAULT, image_ph(phase, IH_TYPE_FIRMWARE),
230
230
BOOTSTAGE_ID_FIT_SPL_START, FIT_LOAD_IGNORED,