diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2018-10-18 20:37:05 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-11-20 19:14:22 -0700 |
| commit | 410d9b644639799259cddba9cbff96c2db038a6b (patch) | |
| tree | 1f5446ea9787b86c08d47ec07f9cea39cfb19f69 | |
| parent | 5197dafc42eb926525a12fc5aa38d2a05f22d177 (diff) | |
fdt: Fix uncompress_blob() for U-Boot proper
When U-Boot proper is compiled with CONFIG_MULTI_DTB_FIT and tries
to call uncompress_blob(), it fails with -ENOTSUPP. This is because
the full implementation of this function which includes compression
is available only in SPL. In U-Boot proper or if the compression is
not enabled, the blob is not compressed and thus can be passed to
locate_dtb_in_fit() in fdtdec_setup() without any changes. Pass the
blob without any changes if compression is not enabled instead of
failing.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | lib/fdtdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index a420ba1885..d28f2cbb1c 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1198,7 +1198,8 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) # else static int uncompress_blob(const void *src, ulong sz_src, void **dstp) { - return -ENOTSUPP; + *dstp = (void *)src; + return 0; } # endif #endif |