Skip to contentSkip to conversation

fis: make fis list more like RedBoot's output

PATCH Superseded H Hartley Sweeten 2 participants 3 messages May 12, 2010 – Feb 2, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fis: make fis list more like RedBoot's output

The output of 'fis list' does not fit cleanly on an 80 column terminal. This modifies the output to fit and more closely resemble the output from RedBoot.

---

package/fis/fis-003-list_output.patch new file +21 -0
new file mode 100644
index 0000000..1d3ea24
@@ -0,0 +1,21 @@
+--- fis.orig/fis.c	2010-05-12 10:22:10.000000000 -0700
++++ fis/fis.c	2010-05-12 10:19:24.000000000 -0700
+@@ -142,8 +142,8 @@
+ 
+ static void dump_desc(FILE* f, const struct fis_image_desc* d)
+ {
+-  fprintf(f,"%16s: flash: 0x%08x mem:0x%08x size:0x%08x checksum:0x%08x\n",
+-             d->name, d->flash_base, d->mem_base, d->size, d->file_cksum);
++  fprintf(f,"%-16s  0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
++             d->name, d->flash_base, d->mem_base, d->size, d->entry_point, d->file_cksum);
+   for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) {
+     if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip"
+       uint32_t offset = d->skips[i+1];
+@@ -400,6 +400,7 @@
+   CHECK(fd=open(device,O_RDONLY),-1);
+   dir_t dir;
+   load_dir(fd,offset,&size,swap_endianness,&dir);
++  fprintf(stdout,"Name              FLASH addr  Mem addr    Length      Entry point Checksum\n");
+   FOR_EACH_DIR_ENTRY(dir,i) {
+     dump_desc(stdout,get(i));
+   }
#1 lore raw

PATCH v2 1/1 fis: make fis list more like RedBoot's output

The output of 'fis list' does not fit cleanly on an 80 column terminal. This modifies the output to fit and more closely resemble the output from RedBoot.

---

Sorry, the first patch was based on a change in my tree. Here is the patch based on the Buildroot git tree.

package/fis/fis-003-list_output.patch new file +21 -0
new file mode 100644
index 0000000..6c1e4eb
@@ -0,0 +1,21 @@
+--- fis.orig/fis.c	2010-05-12 10:22:10.000000000 -0700
++++ fis/fis.c	2010-05-12 10:19:24.000000000 -0700
+@@ -142,8 +142,8 @@
+ 
+ static void dump_desc(FILE* f, const struct fis_image_desc* d)
+ {
+-  fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n",
+-             d->name, d->flash_base, d->mem_base, d->size, d->file_cksum);
++  fprintf(f,"%-16s  0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
++             d->name, d->flash_base, d->mem_base, d->size, d->entry_point, d->file_cksum);
+   for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) {
+     if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip"
+       uint32_t offset = d->skips[i+1];
+@@ -400,6 +400,7 @@
+   CHECK(fd=open(device,O_RDONLY),-1);
+   dir_t dir;
+   load_dir(fd,offset,&size,swap_endianness,&dir);
++  fprintf(stdout,"Name              FLASH addr  Mem addr    Length      Entry point Checksum\n");
+   FOR_EACH_DIR_ENTRY(dir,i) {
+     dump_desc(stdout,get(i));
+   }
#2 lore raw

PATCH v2 1/1 fis: make fis list more like RedBoot's output

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"H" == H Hartley Sweeten <[email protected]> writes:

H> The output of 'fis list' does not fit cleanly on an 80 column H> terminal. This modifies the output to fit and more closely H> resemble the output from RedBoot.

H> Signed-off-by: H Hartley Sweeten <[email protected]>

Sorry for the very slow response - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard