mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 21:51:31 +00:00
Add a way to skip relocation
When running U-Boot as an EFI application we cannot relocate since we do not have relocation information. U-Boot has already been relocated to a suitable address. Add a global_data flag to control skipping relocation. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
7bea527160
commit
f05ad9ba4c
2 changed files with 10 additions and 0 deletions
|
@ -654,6 +654,8 @@ static int setup_dram_config(void)
|
||||||
|
|
||||||
static int reloc_fdt(void)
|
static int reloc_fdt(void)
|
||||||
{
|
{
|
||||||
|
if (gd->flags & GD_FLG_SKIP_RELOC)
|
||||||
|
return 0;
|
||||||
if (gd->new_fdt) {
|
if (gd->new_fdt) {
|
||||||
memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size);
|
memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size);
|
||||||
gd->fdt_blob = gd->new_fdt;
|
gd->fdt_blob = gd->new_fdt;
|
||||||
|
@ -664,6 +666,11 @@ static int reloc_fdt(void)
|
||||||
|
|
||||||
static int setup_reloc(void)
|
static int setup_reloc(void)
|
||||||
{
|
{
|
||||||
|
if (gd->flags & GD_FLG_SKIP_RELOC) {
|
||||||
|
debug("Skipping relocation due to flag\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_TEXT_BASE
|
#ifdef CONFIG_SYS_TEXT_BASE
|
||||||
gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
|
gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
|
||||||
#ifdef CONFIG_M68K
|
#ifdef CONFIG_M68K
|
||||||
|
@ -689,6 +696,8 @@ static int setup_reloc(void)
|
||||||
|
|
||||||
static int jump_to_copy(void)
|
static int jump_to_copy(void)
|
||||||
{
|
{
|
||||||
|
if (gd->flags & GD_FLG_SKIP_RELOC)
|
||||||
|
return 0;
|
||||||
/*
|
/*
|
||||||
* x86 is special, but in a nice way. It uses a trampoline which
|
* x86 is special, but in a nice way. It uses a trampoline which
|
||||||
* enables the dcache if possible.
|
* enables the dcache if possible.
|
||||||
|
|
|
@ -117,5 +117,6 @@ typedef struct global_data {
|
||||||
#define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */
|
#define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */
|
||||||
#define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */
|
#define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */
|
||||||
#define GD_FLG_SPL_INIT 0x00400 /* spl_init() has been called */
|
#define GD_FLG_SPL_INIT 0x00400 /* spl_init() has been called */
|
||||||
|
#define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */
|
||||||
|
|
||||||
#endif /* __ASM_GENERIC_GBL_DATA_H */
|
#endif /* __ASM_GENERIC_GBL_DATA_H */
|
||||||
|
|
Loading…
Add table
Reference in a new issue