Werner Zeh has submitted this change and it was merged. ( https://review.coreboot.org/27116 )
Change subject: cbfstool: Use endian.h and functions from commonlib ......................................................................
cbfstool: Use endian.h and functions from commonlib
The endian conversion function be32toh() is defined in src/include/endian.h, however this file is not used for cbfstool compilation. Currently the one provided by the host is used and if the host does not provide this endian.h file, the build will fail. However, we do have endian conversion functions in commonlib/endian.h which is available for cbfstool compilation.
Switch from be32toh() to read_be32() in order to avoid relying on a host provided include file. We use functions from commonlib/endian.h already in cbfstool.
Change-Id: I106274cf9c69e1849f848920d96a61188f895b36 Signed-off-by: Werner Zeh werner.zeh@siemens.com Reviewed-on: https://review.coreboot.org/27116 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Patrick Georgi pgeorgi@google.com --- M util/cbfstool/cbfs-mkpayload.c 1 file changed, 2 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Nico Huber: Looks good to me, approved
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index 6dc1634..e26c530 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <commonlib/endian.h>
#include "elfparsing.h" #include "common.h" @@ -426,7 +427,7 @@ DEBUG("start: parse_fit_to_payload\n");
fdt_h = buffer_get(input); - if (be32toh(fdt_h->magic) != FDT_HEADER_MAGIC) { + if (read_be32(&fdt_h->magic) != FDT_HEADER_MAGIC) { INFO("Not a FIT payload.\n"); return -1; }