Revert "Merge patch series "vbe: Series part E""
This reverts commit 1fdf53ace13f745fe8ad4d2d4e79eed98088d555, reversing
changes made to e5aef1bbf11412eebd4c242b46adff5301353c30.
I had missed that this caused too much size growth on rcar3_salvator-x.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index ac84625..3160f57 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -190,7 +190,7 @@
/**
* load_simple_fit(): load the image described in a certain FIT node
* @info: points to information about the device to load data from
- * @fit_offset: the offset of the FIT image on the device
+ * @sector: the start sector of the FIT image on the device
* @ctx: points to the FIT context structure
* @node: offset of the DT node describing the image to load (relative
* to @fit)
@@ -243,14 +243,11 @@
if (!fit_image_get_data_position(fit, node, &offset)) {
external_data = true;
} else if (!fit_image_get_data_offset(fit, node, &offset)) {
- log_debug("read offset %x = offset from fit %lx\n",
- offset, (ulong)offset + ctx->ext_data_offset);
offset += ctx->ext_data_offset;
external_data = true;
}
if (external_data) {
- ulong read_offset;
void *src_ptr;
/* External data */
@@ -273,10 +270,6 @@
overhead = get_aligned_image_overhead(info, offset);
size = get_aligned_image_size(info, length, offset);
- read_offset = fit_offset + get_aligned_image_offset(info,
- offset);
- log_debug("reading from offset %x / %lx size %lx to %p: ",
- offset, read_offset, size, src_ptr);
if (info->read(info,
fit_offset +
@@ -343,7 +336,6 @@
else
image_info->entry_point = FDT_ERROR;
}
- log_debug("- done loading\n");
upl_add_image(fit, node, load_addr, length);
@@ -870,7 +862,7 @@
{
struct bootm_headers images;
const char *fit_uname_config = NULL;
- ulong fdt_hack;
+ uintptr_t fdt_hack;
const char *uname;
ulong fw_data = 0, dt_data = 0, img_data = 0;
ulong fw_len = 0, dt_len = 0, img_len = 0;