From: Jeroen Hofstee <jeroen@myspectrum.nl>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] includes: move openssl headers to include/u-boot
Date: Wed, 18 Jun 2014 20:12:36 +0200 [thread overview]
Message-ID: <1403115156.2600.22.camel@yellow> (raw)
In-Reply-To: <CAPnjgZ0F0UWwY-5d+7_KNd64Ahs5fkuaS3F6F61XciAsfg9f2Q@mail.gmail.com>
On di, 2014-06-17 at 22:25 -0700, Simon Glass wrote:
> Hi Jeroen,
>
> On 12 June 2014 13:27, Jeroen Hofstee <jeroen@myspectrum.nl> wrote:
> > commit 18b06652cd "tools: include u-boot version of sha256.h"
> > unconditionally forced the sha256.h from u-boot to be used
> > for tools instead of the host version. This is fragile though
> > as it will also include the host version. Therefore move it
> > to include/u-boot to join u-boot/md5.h etc which were renamed
> > for the same reason.
> >
> > cc: Simon Glass <sjg@chromium.org>
> > Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
>
> This seems like a much better solution. But I think you should keep
> the sort order - so u-boot/xxx should go after asm/xxx in the
> #includes I think.
I considered it, but e.g. common/image.c contains this before this
patch:
#include <u-boot/md5.h>
#include <sha1.h>
#include <asm/errno.h>
#include <asm/io.h>
While I can rearrange them, I think it should be a separate patch,
since it is not sorted in the first place. Furthermore if possible I
would prefer this commit to go into the current release and hence want
to keep it as short as possible. What I hadn't realized with the
original patch is that we don't replace the header but include them all.
On FreeBSD u-boot/sha256.h is included because the makefile said so,
but the host version of sha256.h is included as well by the source code
and the openssl/* will include similar headers again. And hence fails to
compile in the end.
Likely the same holds for libfdt_env.h, but this likely works for the
time being, since they have the same include guard.
Regards,
Jeroen
next prev parent reply other threads:[~2014-06-18 18:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 20:27 [U-Boot] [PATCH] includes: move openssl headers to include/u-boot Jeroen Hofstee
2014-06-18 5:25 ` Simon Glass
2014-06-18 18:12 ` Jeroen Hofstee [this message]
2014-06-19 1:21 ` Simon Glass
2014-06-19 15:22 ` [U-Boot] " 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=1403115156.2600.22.camel@yellow \
--to=jeroen@myspectrum.nl \
--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