colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image: Remove unused NEEDS_MANUAL_RELOC code bits

Browse Source 
The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut
2023-09-06 23:29:59 +02:00
committed by Tom Rini
parent 92b1f7abb6
commit ba377a6c2c
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boot/image.c
View File

@@ -571,7 +571,7 @@ const char *genimg_get_cat_name(enum ih_category category, uint id)
entry = get_table_entry(table_info[category].table, id); entry = get_table_entry(table_info[category].table, id);
if (!entry) if (!entry)
return unknown_msg(category); return unknown_msg(category);
return manual_reloc(entry->lname); return entry->lname;
} }
/** /**
@@ -591,7 +591,7 @@ const char *genimg_get_cat_short_name(enum ih_category category, uint id)
entry = get_table_entry(table_info[category].table, id); entry = get_table_entry(table_info[category].table, id);
if (!entry) if (!entry)
return unknown_msg(category); return unknown_msg(category);
return manual_reloc(entry->sname); return entry->sname;
} }
int genimg_get_cat_count(enum ih_category category) int genimg_get_cat_count(enum ih_category category)
@@ -641,7 +641,7 @@ char *get_table_entry_name(const table_entry_t *table, char *msg, int id)
table = get_table_entry(table, id); table = get_table_entry(table, id);
if (!table) if (!table)
return msg; return msg;
return manual_reloc(table->lname); return table->lname;
} }
const char *genimg_get_os_name(uint8_t os) const char *genimg_get_os_name(uint8_t os)
@@ -676,7 +676,7 @@ static const char *genimg_get_short_name(const table_entry_t *table, int val)
table = get_table_entry(table, val); table = get_table_entry(table, val);
if (!table) if (!table)
return "unknown"; return "unknown";
return manual_reloc(table->sname); return table->sname;
} }
const char *genimg_get_type_short_name(uint8_t type) const char *genimg_get_type_short_name(uint8_t type)
@@ -719,7 +719,7 @@ int get_table_entry_id(const table_entry_t *table,
const table_entry_t *t; const table_entry_t *t;
for (t = table; t->id >= 0; ++t) { for (t = table; t->id >= 0; ++t) {
if (t->sname && !strcasecmp(manual_reloc(t->sname), name)) if (t->sname && !strcasecmp(t->sname, name))
return t->id; return t->id;
} }
debug("Invalid %s Type: %s\n", table_name, name); debug("Invalid %s Type: %s\n", table_name, name);

14
include/relocate.h
View File

@@ -39,18 +39,4 @@ int clear_bss(void);
*/ */
int do_elf_reloc_fixups(void); int do_elf_reloc_fixups(void);
/**
* manual_reloc() - Manually relocate a pointer if needed
*
* This is a nop in almost all cases, except for the systems with a broken gcc
* which need to manually relocate some things.
*
* @ptr: Pointer to relocate
* Return: new pointer value
*/
static inline void *manual_reloc(void *ptr)
{
return ptr;
}
#endif /* _RELOCATE_H_ */ #endif /* _RELOCATE_H_ */