From 3dc51ab0e15180fa761c8072120c591b4693b3c8 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 25 Aug 2016 01:47:17 -0700 Subject: [PATCH] x86: efi: payload: Make EFI payload build again Since commit 73c5c39 "Makefile: Drop unnecessary -dtb suffixes", EFI payload does not build anymore. This fixes the build. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- include/efi.h | 2 +- lib/efi/efi_stub.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/efi.h b/include/efi.h index 1dbc3b77b4..21921f1d4f 100644 --- a/include/efi.h +++ b/include/efi.h @@ -278,7 +278,7 @@ struct efi_priv { extern char image_base[]; /* Start and end of U-Boot image (for payload) */ -extern char _binary_u_boot_dtb_bin_start[], _binary_u_boot_dtb_bin_end[]; +extern char _binary_u_boot_bin_start[], _binary_u_boot_bin_end[]; /** * efi_get_sys_table() - Get access to the main EFI system table diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 8b4bb4e78f..1814960572 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -354,9 +354,9 @@ efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) /* The EFI UART won't work now, switch to a debug one */ use_uart = true; - memcpy((void *)CONFIG_SYS_TEXT_BASE, _binary_u_boot_dtb_bin_start, - (ulong)_binary_u_boot_dtb_bin_end - - (ulong)_binary_u_boot_dtb_bin_start); + memcpy((void *)CONFIG_SYS_TEXT_BASE, _binary_u_boot_bin_start, + (ulong)_binary_u_boot_bin_end - + (ulong)_binary_u_boot_bin_start); #ifdef DEBUG puts("EFI table at "); -- 2.39.5