Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ihex: add support for CS:IP/EIP records

Browse source 
ihex firmwares can include a jump address for starting execution.  Add a
-j option which will cause this to be written into the generated file as a
record with address zero and data consisting of the address to jump to,
allowing drivers to make use of this information.

This format is chosen because it most closely follows the original ihex
format, though it may make more sense to write a record with length zero
and the address stored as the address.  The records are not omitted by
default since our ihex format does not include record type information and
so including additional records may lead to confusion.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mark Brown 2010-10-26 14:22:28 -07:00 committed by Linus Torvalds
parent b6777c40c7
commit 2473238eac
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
firmware/ihex2fw.c
View file

@ -55,6 +55,7 @@ static int output_records(int outfd);
static int sort_records = 0; static int sort_records = 0;
static int wide_records = 0; static int wide_records = 0;
static int include_jump = 0;
static int usage(void) static int usage(void)
{ {
@ -63,6 +64,7 @@ static int usage(void)
fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n"); fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
fprintf(stderr, " -w: wide records (16-bit length)\n"); fprintf(stderr, " -w: wide records (16-bit length)\n");
fprintf(stderr, " -s: sort records by address\n"); fprintf(stderr, " -s: sort records by address\n");
fprintf(stderr, " -j: include records for CS:IP/EIP address\n");
return 1; return 1;
} }
@ -73,7 +75,7 @@ int main(int argc, char **argv)
uint8_t *data; uint8_t *data;
int opt; int opt;
while ((opt = getopt(argc, argv, "ws")) != -1) { while ((opt = getopt(argc, argv, "wsj")) != -1) {
switch (opt) { switch (opt) {
case 'w': case 'w':
wide_records = 1; wide_records = 1;
@ -81,7 +83,9 @@ int main(int argc, char **argv)
case 's': case 's':
sort_records = 1; sort_records = 1;
break; break;
default: case 'j':
include_jump = 1;
break;
return usage(); return usage();
} }
} }
@ -128,6 +132,7 @@ static int process_ihex(uint8_t *data, ssize_t size)
{ {
struct ihex_binrec *record; struct ihex_binrec *record;
uint32_t offset = 0; uint32_t offset = 0;
uint32_t data32;
uint8_t type, crc = 0, crcbyte = 0; uint8_t type, crc = 0, crcbyte = 0;
int i, j; int i, j;
int line = 1; int line = 1;
@ -223,8 +228,14 @@ static int process_ihex(uint8_t *data, ssize_t size)
return -EINVAL; return -EINVAL;
} }
memcpy(&data32, &record->data[0], sizeof(data32));
data32 = htonl(data32);
memcpy(&record->data[0], &data32, sizeof(data32));
/* These records contain the CS/IP or EIP where execution /* These records contain the CS/IP or EIP where execution
* starts. Don't really know what to do with them. */ * starts. If requested output this as a record. */
if (include_jump)
file_record(record);
goto next_record; goto next_record;
default: default: