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

image: Create a function to do manual relocation

Browse Source 
Rather than adding an #ifdef and open-coding this calculation, add a
helper function to handle it. Use this in the image code.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-09-25 07:03:18 -06:00 committed by Tom Rini
parent 5d3248a688
commit 2ac00c0505
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/image.c
View File

@ -63,6 +63,7 @@ DECLARE_GLOBAL_DATA_PTR;
#include <image.h> #include <image.h>
#include <lz4.h> #include <lz4.h>
#include <imximage.h> #include <imximage.h>
#include <relocate.h>
#include <linux/lzo.h> #include <linux/lzo.h>
#include <linux/zstd.h> #include <linux/zstd.h>
#include <linux/kconfig.h> #include <linux/kconfig.h>
@ -565,11 +566,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);
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC) return manual_reloc(entry->lname);
return entry->lname;
#else
return entry->lname + gd->reloc_off;
#endif
} }
/** /**
@ -589,11 +586,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);
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC) return manual_reloc(entry->sname);
return entry->sname;
#else
return entry->sname + gd->reloc_off;
#endif
} }
int genimg_get_cat_count(enum ih_category category) int genimg_get_cat_count(enum ih_category category)
@ -643,11 +636,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;
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC) return manual_reloc(table->lname);
return table->lname;
#else
return table->lname + gd->reloc_off;
#endif
} }
const char *genimg_get_os_name(uint8_t os) const char *genimg_get_os_name(uint8_t os)
@ -677,11 +666,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";
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC) return manual_reloc(table->sname);
return table->sname;
#else
return table->sname + gd->reloc_off;
#endif
} }
const char *genimg_get_type_short_name(uint8_t type) const char *genimg_get_type_short_name(uint8_t type)
@ -724,12 +709,8 @@ 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 !defined(USE_HOSTCC) && defined(CONFIG_NEEDS_MANUAL_RELOC) if (t->sname && !strcasecmp(manual_reloc(t->sname), name))
if (t->sname && strcasecmp(t->sname + gd->reloc_off, name) == 0) return t->id;
#else
if (t->sname && strcasecmp(t->sname, name) == 0)
#endif
return (t->id);
} }
debug("Invalid %s Type: %s\n", table_name, name); debug("Invalid %s Type: %s\n", table_name, name);

24
include/relocate.h
View File

@ -7,7 +7,11 @@
#ifndef _RELOCATE_H_ #ifndef _RELOCATE_H_
#define _RELOCATE_H_ #define _RELOCATE_H_
#include <common.h> #ifndef USE_HOSTCC
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
#endif
/** /**
* copy_uboot_to_ram() - Copy U-Boot to its new relocated position * copy_uboot_to_ram() - Copy U-Boot to its new relocated position
@ -35,4 +39,22 @@ 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)
{
#ifndef USE_HOSTCC
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
return ptr + gd->reloc_off;
#endif
return ptr;
}
#endif /* _RELOCATE_H_ */ #endif /* _RELOCATE_H_ */