diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-17 10:38:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-17 10:38:28 -0400 |
| commit | 13aa090b87a0fbdfe690011669b9fdb96bb1ccc7 (patch) | |
| tree | 69af16bc8ecc4b6e8106a750e31e51d7ec078828 /common/board_f.c | |
| parent | aa817dfcaf158dda71358d02181bf52c30dbe4c6 (diff) | |
| parent | b8956425d525c3c25fd218f252f89a5e44df6a9f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- bootstd: Add a bootmeth for ChromiumOS on x86
- x86: Use qemu-x86_64 to boot EFI installers
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/common/board_f.c b/common/board_f.c index 334d04af197..e5969ec9a27 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -729,8 +729,7 @@ static int fix_fdt(void) #endif /* ARM calls relocate_code from its crt0.S */ -#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ - !CONFIG_IS_ENABLED(X86_64) +#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) static int jump_to_copy(void) { @@ -752,7 +751,11 @@ static int jump_to_copy(void) * (CPU cache) */ arch_setup_gd(gd->new_gd); - board_init_f_r_trampoline(gd->start_addr_sp); +# if CONFIG_IS_ENABLED(X86_64) + board_init_f_r_trampoline64(gd->new_gd, gd->start_addr_sp); +# else + board_init_f_r_trampoline(gd->start_addr_sp); +# endif #else relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr); #endif @@ -967,8 +970,7 @@ static const init_fnc_t init_sequence_f[] = { * watchdog device is not serviced is as small as possible. */ cyclic_unregister_all, -#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ - !CONFIG_IS_ENABLED(X86_64) +#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) jump_to_copy, #endif NULL, |