mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 13:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

bootstage: Support relocating boostage data

Browse Source 
Some boards cannot access pre-relocation data after relocation. Reserve
space for this and copy it during preparation for relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-22 05:05:30 -06:00 committed by Tom Rini
parent ff00226e0b
commit 25e7dc6a6a
4 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/board_f.c
View File

@ -491,6 +491,20 @@ static int reserve_fdt(void)
return 0;
}
static int reserve_bootstage(void)
{
#ifdef CONFIG_BOOTSTAGE
int size = bootstage_get_size();
gd->start_addr_sp -= size;
gd->new_bootstage = map_sysmem(gd->start_addr_sp, size);
debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
gd->start_addr_sp);
#endif
return 0;
}
int arch_reserve_stacks(void)
{
return 0;
@ -605,6 +619,24 @@ static int reloc_fdt(void)
return 0;
}
static int reloc_bootstage(void)
{
#ifdef CONFIG_BOOTSTAGE
if (gd->flags & GD_FLG_SKIP_RELOC)
return 0;
if (gd->new_bootstage) {
int size = bootstage_get_size();
debug("Copying bootstage from %p to %p, size %x\n",
gd->bootstage, gd->new_bootstage, size);
memcpy(gd->new_bootstage, gd->bootstage, size);
gd->bootstage = gd->new_bootstage;
}
#endif
return 0;
}
static int setup_reloc(void)
{
if (gd->flags & GD_FLG_SKIP_RELOC) {
@ -828,6 +860,7 @@ static const init_fnc_t init_sequence_f[] = {
setup_machine,
reserve_global_data,
reserve_fdt,
reserve_bootstage,
reserve_arch,
reserve_stacks,
dram_init_banksize,
@ -849,6 +882,7 @@ static const init_fnc_t init_sequence_f[] = {
#endif
INIT_FUNC_WATCHDOG_RESET
reloc_fdt,
reloc_bootstage,
setup_reloc,
#if defined(CONFIG_X86) || defined(CONFIG_ARC)
copy_uboot_to_ram,

5
common/bootstage.c
View File

@ -484,6 +484,11 @@ int bootstage_unstash(void *base, int size)
return 0;
}
int bootstage_get_size(void)
{
return sizeof(struct bootstage_data);
}
int bootstage_init(bool first)
{
struct bootstage_data *data;

1
include/asm-generic/global_data.h
View File

@ -112,6 +112,7 @@ typedef struct global_data {
#endif
#ifdef CONFIG_BOOTSTAGE
struct bootstage_data *bootstage; /* Bootstage information */
struct bootstage_data *new_bootstage; /* Relocated bootstage info */
#endif
} gd_t;
#endif

12
include/bootstage.h
View File

@ -331,6 +331,13 @@ int bootstage_stash(void *base, int size);
*/
int bootstage_unstash(void *base, int size);
/**
* bootstage_get_size() - Get the size of the bootstage data
*
* @return size of boostage data in bytes
*/
int bootstage_get_size(void);
/**
* bootstage_init() - Prepare bootstage for use
*
@ -400,6 +407,11 @@ static inline int bootstage_unstash(void *base, int size)
return 0; /* Pretend to succeed */
}
static inline int bootstage_get_size(void)
{
return 0;
}
static inline int bootstage_init(bool first)
{
return 0;