common/image.c: Relocate strings in tables.

Without this, u-boot can crash or print garbage if the original link
address no longer points to a valid string.

Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/common/image.c b/common/image.c
index daa68bc2ddeb8f9c4c0dabe0a072f4f18f94ca9f..e22c974f358a4bf611ad2c60e2225f3bf499c0b4 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -518,7 +518,11 @@ static char *get_table_entry_name (table_entry_t *table, char *msg, int id)
 {
        for (; table->id >= 0; ++table) {
                if (table->id == id)
-                       return (table->lname);
+#ifdef USE_HOSTCC
+                       return table->lname;
+#else
+                       return table->lname + gd->reloc_off;
+#endif
        }
        return (msg);
 }
@@ -579,7 +583,7 @@ static int get_table_entry_id (table_entry_t *table,
        fprintf (stderr, "\n");
 #else
        for (t = table; t->id >= 0; ++t) {
-               if (t->sname && strcmp(t->sname, name) == 0)
+               if (t->sname && strcmp(t->sname + gd->reloc_off, name) == 0)
                        return (t->id);
        }
        debug ("Invalid %s Type: %s\n", table_name, name);