sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various fixes to cbfstool.

Browse Source 
- 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>
This commit is contained in:
Stefan Reinauer
2011-10-21 14:24:57 -07:00
committed by Stefan Reinauer
parent 3c976791b0
commit a1e4824f73
8 changed files with 110 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/cbfstool/cbfs-mkpayload.c
View File

@@ -152,9 +152,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
(unsigned long long)htonl(phdr[i].p_paddr);
(uint64_t)htonll(phdr[i].p_paddr);
segs[segments].mem_len =
(unsigned int)htonl(phdr[i].p_memsz);
(uint32_t)htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -162,8 +162,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_DATA;
segs[segments].load_addr = (unsigned int)htonl(phdr[i].p_paddr);
segs[segments].mem_len = (unsigned int)htonl(phdr[i].p_memsz);
segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -190,7 +190,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
segs[segments++].load_addr = (unsigned long long)htonl(ehdr->e_entry);
segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
*output = sptr;