From: Simon Glass <sjg@chromium.org> Now that the stub code is unified, switch over to it, dropping the individual efi_main() functions. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/efi_stub.h | 3 --- lib/efi_client/stub.c | 6 +++--- lib/efi_client/stub_arm64.c | 6 ------ lib/efi_client/stub_x86.c | 6 ------ 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/include/efi_stub.h b/include/efi_stub.h index 17637a8845d..8dcde1b61d1 100644 --- a/include/efi_stub.h +++ b/include/efi_stub.h @@ -120,9 +120,6 @@ efi_status_t arch_efi_main_init(struct efi_priv *priv, */ void arch_efi_jump_to_payload(struct efi_priv *priv); -efi_status_t EFIAPI efi_main_common(efi_handle_t image, - struct efi_system_table *sys_table); - /* true if we must use the hardware UART directory (EFI not available) */ extern bool use_hw_uart; diff --git a/lib/efi_client/stub.c b/lib/efi_client/stub.c index b51f8160ec7..27366937c18 100644 --- a/lib/efi_client/stub.c +++ b/lib/efi_client/stub.c @@ -128,13 +128,13 @@ static void efi_copy_code(struct efi_priv *priv) } /** - * efi_main_common() - Start an EFI image + * efi_main() - Start an EFI image * * This function is called by our EFI start-up code. It handles running * U-Boot. If it returns, EFI will continue. */ -efi_status_t EFIAPI efi_main_common(efi_handle_t image, - struct efi_system_table *sys_table) +efi_status_t EFIAPI efi_main(efi_handle_t image, + struct efi_system_table *sys_table) { struct efi_priv local_priv, *priv = &local_priv; struct efi_boot_services *boot = sys_table->boottime; diff --git a/lib/efi_client/stub_arm64.c b/lib/efi_client/stub_arm64.c index af78c518422..0e579a17a75 100644 --- a/lib/efi_client/stub_arm64.c +++ b/lib/efi_client/stub_arm64.c @@ -74,9 +74,3 @@ void arch_efi_jump_to_payload(struct efi_priv *priv) ((func_t)priv->jump_addr)((phys_addr_t)priv->info, 0, 0, 0); } - -efi_status_t EFIAPI efi_main(efi_handle_t image, - struct efi_system_table *sys_table) -{ - return efi_main_common(image, sys_table); -} diff --git a/lib/efi_client/stub_x86.c b/lib/efi_client/stub_x86.c index 66349136e44..fac55fa8f32 100644 --- a/lib/efi_client/stub_x86.c +++ b/lib/efi_client/stub_x86.c @@ -220,9 +220,3 @@ void arch_efi_jump_to_payload(struct efi_priv *priv) { jump_to_uboot(priv->x86_cs32, priv->jump_addr, (ulong)priv->info); } - -efi_status_t EFIAPI efi_main(efi_handle_t image, - struct efi_system_table *sys_table) -{ - return efi_main_common(image, sys_table); -} -- 2.43.0