diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-10 20:44:32 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-14 09:50:10 -0600 |
| commit | f0c7d9c74642ccd6c76993b721b0fb87aab685fa (patch) | |
| tree | 316adff8dc055af779a2bd08d64688ae3b24c7d0 /common | |
| parent | 2db937456114d964e814f8cc25131e3b2c641b49 (diff) | |
| download | u-boot-f0c7d9c74642ccd6c76993b721b0fb87aab685fa.tar.gz | |
x86: Switch to using generic global_data setup
There is quite a bit of assembler code that can be removed if we use the
generic global_data setup. Less arch-specific code makes it easier to add
new features and maintain the start-up code.
Drop the unneeded code and adjust the hooks in board_f.c to cope.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index 37b7bf5e36..c959774adf 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -715,6 +715,7 @@ static int jump_to_copy(void) * with the stack in SDRAM and Global Data in temporary memory * (CPU cache) */ + arch_setup_gd(gd->new_gd); board_init_f_r_trampoline(gd->start_addr_sp); #else relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr); @@ -1033,6 +1034,7 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) { gd = gd_ptr; } +#endif /* !CONFIG_X86 */ ulong board_init_f_mem(ulong top) { @@ -1054,4 +1056,3 @@ ulong board_init_f_mem(ulong top) return top; } -#endif /* !CONFIG_X86 */ |