From: Jonathan Gray <jsg@jsg.id.au>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Revert "image-fit: switch ENOLINK to ENOENT"
Date: Sat, 17 Sep 2016 13:42:35 +1000 [thread overview]
Message-ID: <20160917034235.GA45345@largo.jsg.id.au> (raw)
In-Reply-To: <20160916212143.31691-1-paul.burton@imgtec.com>
On Fri, Sep 16, 2016 at 10:21:43PM +0100, Paul Burton wrote:
> Commit bac17b78dace ("image-fit: switch ENOLINK to ENOENT") changed
> fit_get_node_from_config to return -ENOENT when a property doesn't
> exist, but didn't change any of its callers which check return values.
> Notably it didn't change boot_get_ramdisk, which leads to U-Boot failing
> to boot FIT images which don't include ramdisks with the following
> message:
>
> Ramdisk image is corrupt or invalid
>
> The offending commit seems to dislike ENOLINK due to it not existing on
> OpenBSD, but I'm not sure why that matters as we define it in
> include/asm-generic/errno.h anyway so simply revert the commit to fix
> FIT image handling.
That header is not used when building native tools.
So reverting it will break the build of u-boot on OpenBSD.
WRAP tools/common/image-fit.c
HOSTCC tools/common/image-fit.o
In file included from tools/common/image-fit.c:1:
/usr/users/jsg/src/u-boot/tools/../common/image-fit.c: In function 'fit_get_node_from_config':
/usr/users/jsg/src/u-boot/tools/../common/image-fit.c:1569: error: 'ENOLINK' undeclared (first use in this function)
/usr/users/jsg/src/u-boot/tools/../common/image-fit.c:1569: error: (Each undeclared identifier is reported only once
/usr/users/jsg/src/u-boot/tools/../common/image-fit.c:1569: error: for each function it appears in.)
>
> This reverts commit bac17b78dace ("image-fit: switch ENOLINK to
> ENOENT").
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Jonathan Gray <jsg@jsg.id.au>
>
> ---
>
> common/image-fit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/image-fit.c b/common/image-fit.c
> index 9ce68f1..f833fe3 100644
> --- a/common/image-fit.c
> +++ b/common/image-fit.c
> @@ -1566,7 +1566,7 @@ int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name,
> noffset = fit_conf_get_prop_node(fit_hdr, cfg_noffset, prop_name);
> if (noffset < 0) {
> debug("* %s: no '%s' in config\n", prop_name, prop_name);
> - return -ENOENT;
> + return -ENOLINK;
> }
>
> return noffset;
> --
> 2.9.3
>
next prev parent reply other threads:[~2016-09-17 3:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 21:21 [U-Boot] [PATCH] Revert "image-fit: switch ENOLINK to ENOENT" Paul Burton
2016-09-17 3:42 ` Jonathan Gray [this message]
2016-09-18 13:14 ` Marek Vasut
2016-09-18 22:33 ` Jonathan Gray
2016-09-18 23:59 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160917034235.GA45345@largo.jsg.id.au \
--to=jsg@jsg.id.au \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox