Hi,
On 18 June 2014 11:12, Jeroen Hofstee <jer...@myspectrum.nl> wrote:
> On di, 2014-06-17 at 22:25 -0700, Simon Glass wrote:
>> Hi Jeroen,
>>
>> On 12 June 2014 13:27, Jeroen Hofstee <jer...@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 <s...@chromium.org>
>> > Signed-off-by: Jeroen Hofstee <jer...@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.
OK with me, will await the follow-up patch.
Acked-by: Simon Glass <s...@chromium.org>
Also I built it for everything and saw no regressions.
./tools/buildman/buildman -b try-jer -s
Summary of 2 commits for 1198 boards (32 threads, 1 job per thread)
01: Merge branch 'master' of git://git.denx.de/u-boot-mmc
blackfin: + bf609-ezkit
m68k: + M5249EVB M54418TWR_serial_rmii M5253DEMO TASREG
M5235EVB M54418TWR_nand_mii M54418TWR_nand_rmii_lowfreq
M54418TWR_nand_rmii M54418TWR M5253EVBE M5235EVB_Flash32
M54418TWR_serial_mii M5272C3
powerpc: + neo io dlvision-10g P1022DS_36BIT iocon kilauea
socrates O2DNT2_RAMBOOT rainier NSCU MPC832XEMDS_HOST_33
mcc200_highboot_SDRAM quantum
sh: + rsk7269 rsk7264 rsk7203
nios2: + nios2-generic PCI5441 PK1C20
microblaze: + microblaze-generic
openrisc: + openrisc-generic
arm: + highbank lager_nor integratorcp_cm920t omap4_sdp4430
sama5d3_xplained_mmc mx53loco omap4_panda duovero Cubietruck lager
k2hk_evm koelsch_nor koelsch trats2
02: includes: move openssl headers to include/u-boot
Regards,
Simon
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
