ihex: add support for CS:IP/EIP records

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>

ihex: add support for CS:IP/EIP records
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>
Mark Brown · Linus Torvalds · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent b6777c40c7
Showing 1 changed file with 14 additions and 3 deletions Side-by-side Diff
firmware/ihex2fw.c
@@ -55,6 +55,7 @@
  
 static int sort_records = 0;
 static int wide_records = 0;
+static int include_jump = 0;
  
 static int usage(void)
 {
@@ -63,6 +64,7 @@
 	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
 	fprintf(stderr, "       -w: wide records (16-bit length)\n");
 	fprintf(stderr, "       -s: sort records by address\n");
+	fprintf(stderr, "       -j: include records for CS:IP/EIP address\n");
 	return 1;
 }
  
@@ -73,7 +75,7 @@
 	uint8_t *data;
 	int opt;
  
-	while ((opt = getopt(argc, argv, "ws")) != -1) {
+	while ((opt = getopt(argc, argv, "wsj")) != -1) {
 		switch (opt) {
 		case 'w':
 			wide_records = 1;
@@ -81,7 +83,9 @@
 		case 's':
 			sort_records = 1;
 			break;
-		default:
+		case 'j':
+			include_jump = 1;
+			break;
 			return usage();
 		}
 	}
@@ -128,6 +132,7 @@
 {
 	struct ihex_binrec *record;
 	uint32_t offset = 0;
+	uint32_t data32;
 	uint8_t type, crc = 0, crcbyte = 0;
 	int i, j;
 	int line = 1;
  
@@ -223,8 +228,14 @@
 			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
-		 * 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;
  
 	default:
...	...	@@ -55,6 +55,7 @@
55	55
56	56	static int sort_records = 0;
57	57	static int wide_records = 0;
	58	+static int include_jump = 0;
58	59
59	60	static int usage(void)
60	61	{
...	...	@@ -63,6 +64,7 @@
63	64	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
64	65	fprintf(stderr, " -w: wide records (16-bit length)\n");
65	66	fprintf(stderr, " -s: sort records by address\n");
	67	+ fprintf(stderr, " -j: include records for CS:IP/EIP address\n");
66	68	return 1;
67	69	}
68	70
...	...	@@ -73,7 +75,7 @@
73	75	uint8_t *data;
74	76	int opt;
75	77
76		- while ((opt = getopt(argc, argv, "ws")) != -1) {
	78	+ while ((opt = getopt(argc, argv, "wsj")) != -1) {
77	79	switch (opt) {
78	80	case 'w':
79	81	wide_records = 1;
...	...	@@ -81,7 +83,9 @@
81	83	case 's':
82	84	sort_records = 1;
83	85	break;
84		- default:
	86	+ case 'j':
	87	+ include_jump = 1;
	88	+ break;
85	89	return usage();
86	90	}
87	91	}
...	...	@@ -128,6 +132,7 @@
128	132	{
129	133	struct ihex_binrec *record;
130	134	uint32_t offset = 0;
	135	+ uint32_t data32;
131	136	uint8_t type, crc = 0, crcbyte = 0;
132	137	int i, j;
133	138	int line = 1;
134	139
...	...	@@ -223,8 +228,14 @@
223	228	return -EINVAL;
224	229	}
225	230
	231	+ memcpy(&data32, &record->data[0], sizeof(data32));
	232	+ data32 = htonl(data32);
	233	+ memcpy(&record->data[0], &data32, sizeof(data32));
	234	+
226	235	/* These records contain the CS/IP or EIP where execution
227		- * starts. Don't really know what to do with them. */
	236	+ * starts. If requested output this as a record. */
	237	+ if (include_jump)
	238	+ file_record(record);
228	239	goto next_record;
229	240
230	241	default: