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

Add more information to the cbfstool print

Browse Source 
Show what's in a stage or payload. This will let people better understand
what's in a stage or payload.

Change-Id: If6d9a877b4aedd5cece76774e41f0daadb20c008
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-on: http://review.coreboot.org/2176
Tested-by: build bot (Jenkins)
This commit is contained in:
Stefan Reinauer 2013-01-18 15:53:22 -08:00 committed by Ronald G. Minnich
parent 211a5d56db
commit db5b893569
2 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cbfstool/cbfs.h
View File

@ -106,6 +106,8 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr); int cbfs_file_header(unsigned long physaddr);
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size); struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
#endif #endif

68
util/cbfstool/common.c
View File

@ -274,10 +274,10 @@ uint64_t intfiletype(const char *name)
void print_cbfs_directory(const char *filename) void print_cbfs_directory(const char *filename)
{ {
printf printf
("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n" ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
"alignment: %d bytes, architecture: %s\n\n", "alignment: %d bytes, architecture: %s\n\n",
basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize), basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
romsize, ntohl(master_header->offset), align, arch_to_string(arch)); romsize, ntohl(master_header->offset), align, arch_to_string(arch));
printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
uint32_t current = phys_start; uint32_t current = phys_start;
while (current < phys_end) { while (current < phys_end) {
@ -286,7 +286,7 @@ void print_cbfs_directory(const char *filename)
continue; continue;
} }
struct cbfs_file *thisfile = struct cbfs_file *thisfile =
(struct cbfs_file *)phys_to_virt(current); (struct cbfs_file *)phys_to_virt(current);
uint32_t length = ntohl(thisfile->len); uint32_t length = ntohl(thisfile->len);
char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file)); char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
if (strlen(fname) == 0) if (strlen(fname) == 0)
@ -295,6 +295,64 @@ void print_cbfs_directory(const char *filename)
printf("%-30s 0x%-8x %-12s %d\n", fname, printf("%-30s 0x%-8x %-12s %d\n", fname,
current - phys_start + ntohl(master_header->offset), current - phys_start + ntohl(master_header->offset),
strfiletype(ntohl(thisfile->type)), length); strfiletype(ntohl(thisfile->type)), length);
/* note the components of the subheader are in host order ... */
switch (ntohl(thisfile->type)) {
case CBFS_COMPONENT_STAGE:
{
struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
(unsigned long long)stage->entry,
(unsigned long long)stage->load,
stage->len,
stage->memlen);
break;
}
case CBFS_COMPONENT_PAYLOAD:
{
struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
while(payload) {
switch(payload->type) {
case PAYLOAD_SEGMENT_CODE:
case PAYLOAD_SEGMENT_DATA:
dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
ntohl(payload->offset),
(unsigned long long)ntohll(payload->load_addr),
ntohl(payload->len), ntohl(payload->mem_len));
break;
case PAYLOAD_SEGMENT_ENTRY:
dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
break;
case PAYLOAD_SEGMENT_BSS:
dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
break;
case PAYLOAD_SEGMENT_PARAMS:
dprintf(" parameters\n");
break;
default:
dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
payload->type,
payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
ntohl(payload->offset),
(unsigned long long)ntohll(payload->load_addr),
ntohl(payload->len),
ntohl(payload->mem_len));
break;
}
if(payload->type == PAYLOAD_SEGMENT_ENTRY)
payload=NULL;
else
payload++;
}
break;
}
default:
break;
}
current = current =
ALIGN(current + ntohl(thisfile->len) + ALIGN(current + ntohl(thisfile->len) +
ntohl(thisfile->offset), align); ntohl(thisfile->offset), align);