cbfstool: Use cbfs_image API for "add-*" (add-payload, add-stage, ...) commands.
add-payload, add-stage, and add-flat-binary are now all using cbfs_image API. To test: cbfstool coreboot.rom add-stage -f FILE -n fallback/romstage -b 0xXXXX cbfstool coreboot.rom add-payload -f FILE -n fallback/pyload And compare with old cbfstool. Verified to boot on ARM(snow) and X86(qemu-i386). Change-Id: If65cb495c476ef6f9d90c778531f0c3caf178281 Signed-off-by: Hung-Te Lin <hungte@chromium.org> Reviewed-on: http://review.coreboot.org/2220 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Stefan Reinauer
parent
5f3eb26d85
commit
c13e4bf3e1
@@ -27,15 +27,14 @@
|
||||
#include "cbfs.h"
|
||||
#include "elf.h"
|
||||
|
||||
int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
comp_algo algo)
|
||||
int parse_elf_to_payload(const struct buffer *input,
|
||||
struct buffer *output, comp_algo algo)
|
||||
{
|
||||
Elf32_Phdr *phdr;
|
||||
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
|
||||
Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input->data;
|
||||
Elf32_Shdr *shdr;
|
||||
char *header;
|
||||
char *strtab;
|
||||
unsigned char *sptr;
|
||||
int headers;
|
||||
int segments = 1;
|
||||
int isize = 0, osize = 0;
|
||||
@@ -43,12 +42,14 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
struct cbfs_payload_segment *segs;
|
||||
int i;
|
||||
|
||||
if(!iself(input)){
|
||||
if(!iself((unsigned char *)input->data)){
|
||||
ERROR("The payload file is not in ELF format!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
|
||||
// The tool may work in architecture-independent way.
|
||||
if (arch != CBFS_ARCHITECTURE_UNKNOWN &&
|
||||
!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
|
||||
!((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
|
||||
ERROR("The payload file has the wrong architecture\n");
|
||||
return -1;
|
||||
@@ -58,6 +59,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
if (!compress)
|
||||
return -1;
|
||||
|
||||
DEBUG("start: parse_elf_to_payload\n");
|
||||
headers = ehdr->e_phnum;
|
||||
header = (char *)ehdr;
|
||||
|
||||
@@ -104,15 +106,14 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
}
|
||||
|
||||
/* Allocate a block of memory to store the data in */
|
||||
if (buffer_create(output, (segments * sizeof(*segs)) + isize,
|
||||
input->name) != 0)
|
||||
return -1;
|
||||
memset(output->data, 0, output->size);
|
||||
|
||||
sptr =
|
||||
calloc((segments * sizeof(struct cbfs_payload_segment)) + isize, 1);
|
||||
doffset = (segments * sizeof(struct cbfs_payload_segment));
|
||||
|
||||
if (sptr == NULL)
|
||||
goto err;
|
||||
|
||||
segs = (struct cbfs_payload_segment *)sptr;
|
||||
segs = (struct cbfs_payload_segment *)output->data;
|
||||
segments = 0;
|
||||
|
||||
for (i = 0; i < ehdr->e_shnum; i++) {
|
||||
@@ -132,7 +133,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
segs[segments].len = (unsigned int)shdr[i].sh_size;
|
||||
segs[segments].offset = doffset;
|
||||
|
||||
memcpy((unsigned long *)(sptr + doffset),
|
||||
memcpy((unsigned long *)(output->data + doffset),
|
||||
&header[shdr[i].sh_offset], shdr[i].sh_size);
|
||||
|
||||
doffset += segs[segments].len;
|
||||
@@ -172,7 +173,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
|
||||
int len;
|
||||
compress((char *)&header[phdr[i].p_offset],
|
||||
phdr[i].p_filesz, (char *)(sptr + doffset), &len);
|
||||
phdr[i].p_filesz, output->data + doffset, &len);
|
||||
segs[segments].len = htonl(len);
|
||||
|
||||
/* If the compressed section is larger, then use the
|
||||
@@ -182,7 +183,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
segs[segments].compression = 0;
|
||||
segs[segments].len = htonl(phdr[i].p_filesz);
|
||||
|
||||
memcpy((char *)(sptr + doffset),
|
||||
memcpy(output->data + doffset,
|
||||
&header[phdr[i].p_offset], phdr[i].p_filesz);
|
||||
}
|
||||
|
||||
@@ -193,24 +194,19 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
|
||||
}
|
||||
|
||||
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
|
||||
segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
|
||||
segs[segments++].load_addr = htonll(ehdr->e_entry);
|
||||
|
||||
*output = sptr;
|
||||
|
||||
return (segments * sizeof(struct cbfs_payload_segment)) + osize;
|
||||
|
||||
err:
|
||||
return -1;
|
||||
output->size = (segments * sizeof(struct cbfs_payload_segment)) + osize;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_flat_binary_to_payload(unsigned char *input, unsigned char **output,
|
||||
int32_t input_size,
|
||||
int parse_flat_binary_to_payload(const struct buffer *input,
|
||||
struct buffer *output,
|
||||
uint32_t loadaddress,
|
||||
uint32_t entrypoint,
|
||||
comp_algo algo)
|
||||
{
|
||||
comp_func_ptr compress;
|
||||
unsigned char *payload;
|
||||
struct cbfs_payload_segment *segs;
|
||||
int doffset, len = 0;
|
||||
|
||||
@@ -219,39 +215,35 @@ int parse_flat_binary_to_payload(unsigned char *input, unsigned char **output,
|
||||
return -1;
|
||||
|
||||
DEBUG("start: parse_flat_binary_to_payload\n");
|
||||
|
||||
/* FIXME compressed file size might be bigger than original file and
|
||||
* causing buffer overflow. */
|
||||
payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + input_size, 1);
|
||||
if (payload == NULL) {
|
||||
ERROR("Could not allocate memory.\n");
|
||||
if (buffer_create(output, (2 * sizeof(*segs) + input->size),
|
||||
input->name) != 0)
|
||||
return -1;
|
||||
}
|
||||
memset(output->data, 0, output->size);
|
||||
|
||||
segs = (struct cbfs_payload_segment *)payload;
|
||||
segs = (struct cbfs_payload_segment *)output->data;
|
||||
doffset = (2 * sizeof(*segs));
|
||||
|
||||
/* Prepare code segment */
|
||||
segs[0].type = PAYLOAD_SEGMENT_CODE;
|
||||
segs[0].load_addr = htonll(loadaddress);
|
||||
segs[0].mem_len = htonl(input_size);
|
||||
segs[0].mem_len = htonl(input->size);
|
||||
segs[0].offset = htonl(doffset);
|
||||
|
||||
compress((char*)input, input_size, (char*)payload + doffset, &len);
|
||||
compress(input->data, input->size, output->data + doffset, &len);
|
||||
segs[0].compression = htonl(algo);
|
||||
segs[0].len = htonl(len);
|
||||
|
||||
if ((unsigned int)len >= input_size) {
|
||||
if ((unsigned int)len >= input->size) {
|
||||
WARN("Compressing data would make it bigger - disabled.\n");
|
||||
segs[0].compression = 0;
|
||||
segs[0].len = htonl(input_size);
|
||||
memcpy(payload + doffset, input, input_size);
|
||||
segs[0].len = htonl(input->size);
|
||||
memcpy(output->data + doffset, input->data, input->size);
|
||||
}
|
||||
|
||||
/* prepare entry point segment */
|
||||
segs[1].type = PAYLOAD_SEGMENT_ENTRY;
|
||||
segs[1].load_addr = htonll(entrypoint);
|
||||
*output = payload;
|
||||
output->size = doffset + ntohl(segs[0].len);
|
||||
|
||||
return doffset + ntohl(segs[0].len);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user