diff mbox

[U-Boot,1/3] x86: efi: payload: Make efi payload build again

Message ID 1472031083-20720-1-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit 3dc51ab0e15180fa761c8072120c591b4693b3c8
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng Aug. 24, 2016, 9:31 a.m. UTC 
Since commit 73c5c39 "Makefile: Drop unnecessary -dtb suffixes",
EFI payload does not build anymore. This fixes the build.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 include/efi.h      | 2 +-
 lib/efi/efi_stub.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Simon Glass Aug. 24, 2016, 12:53 p.m. UTC | #1 
On 24 August 2016 at 03:31, Bin Meng <bmeng.cn@gmail.com> wrote:
> Since commit 73c5c39 "Makefile: Drop unnecessary -dtb suffixes",
> EFI payload does not build anymore. This fixes the build.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  include/efi.h      | 2 +-
>  lib/efi/efi_stub.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/include/efi.h b/include/efi.h
index 1dbc3b7..21921f1 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 8b4bb4e..1814960 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 ");