Various fixes to cbfstool.
- add ntohll and htonll (as coreboot parses 64bit fields now)
- use the same byte swapping code across platforms
- detect endianess early
- fix lots of warnings
- Don't override CFLAGS in Makefile
Change-Id: Iaea02ff7a31ab6a95fd47858d0efd9af764a3e5f
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/313
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index cbf0757..df74421 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -26,7 +26,7 @@
#include "cbfs.h"
#include "elf.h"
-#define dprintf
+#define dprintf(x...)
uint32_t getfilesize(const char *filename)
{
@@ -118,7 +118,7 @@
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
{
struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy(nextfile->magic, "LARCHIVE", 8);
+ strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
nextfile->len = htonl(size);
nextfile->type = htonl(0xffffffff);
nextfile->checksum = 0; // FIXME?
@@ -231,6 +231,7 @@
uint32_t length = ntohl(thisfile->len);
// Locate the file name
char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
+
// It's not the file we are looking for..
if (strcmp(fname, payloadname) != 0)
{
@@ -267,7 +268,8 @@
// We'll only dump one file.
return 0;
}
-
+ printf("File %s not found.\n", payloadname);
+ return 1;
}
@@ -332,8 +334,7 @@
thisfile->len =
htonl(location - current -
ntohl(thisfile->offset));
- struct cbfs_file *nextfile =
- cbfs_create_empty_file(location,
+ cbfs_create_empty_file(location,
length -
(location -
current));
@@ -376,7 +377,7 @@
}
memset(newdata, 0xff, *datasize + headersize);
struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy(nextfile->magic, "LARCHIVE", 8);
+ strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
nextfile->len = htonl(*datasize);
nextfile->type = htonl(type);
nextfile->checksum = 0; // FIXME?
@@ -421,8 +422,7 @@
recalculate_rom_geometry(romarea);
- struct cbfs_file *one_empty_file =
- cbfs_create_empty_file((0 - romsize) & 0xffffffff,
+ cbfs_create_empty_file((0 - romsize) & 0xffffffff,
romsize - bootblocksize -
sizeof(struct cbfs_header) -
sizeof(struct cbfs_file) - 16);
@@ -439,7 +439,7 @@
uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
const char *filename, uint32_t alignment)
{
- void *rom = loadrom(romfile);
+ loadrom(romfile);
int filename_size = strlen(filename);
int headersize =