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

x86: board_f: Update init sequence for 64-bit startup

Browse Source 
Adjust the code so that 64-bit startup works. Since we don't need to do CAR
changes in U-Boot proper anymore (they are done in SPL) we can simplify the
flow and return normally from board_init_f().

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2017-01-16 07:03:49 -07:00 committed by Bin Meng
parent dca9220c35
commit 530f27eab5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/board_f.c
View File

@ -768,7 +768,8 @@ static int setup_reloc(void)
} }
/* ARM calls relocate_code from its crt0.S */ /* ARM calls relocate_code from its crt0.S */
#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
!CONFIG_IS_ENABLED(X86_64)
static int jump_to_copy(void) static int jump_to_copy(void)
{ {
@ -1038,7 +1039,8 @@ static init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_XTENSA) #if defined(CONFIG_XTENSA)
clear_bss, clear_bss,
#endif #endif
#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
!CONFIG_IS_ENABLED(X86_64)
jump_to_copy, jump_to_copy,
#endif #endif
NULL, NULL,
@ -1072,7 +1074,7 @@ void board_init_f(ulong boot_flags)
hang(); hang();
#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
!defined(CONFIG_EFI_APP) !defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64)
/* NOTREACHED - jump_to_copy() does not return */ /* NOTREACHED - jump_to_copy() does not return */
hang(); hang();
#endif #endif
@ -1097,7 +1099,9 @@ void board_init_f(ulong boot_flags)
* all archs will move to this when generic relocation is implemented. * all archs will move to this when generic relocation is implemented.
*/ */
static init_fnc_t init_sequence_f_r[] = { static init_fnc_t init_sequence_f_r[] = {
#if !CONFIG_IS_ENABLED(X86_64)
init_cache_f_r, init_cache_f_r,
#endif
NULL, NULL,
}; };