V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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 <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2016-08-25 01:47:17 -07:00
parent 4cc00f0611
commit 3dc51ab0e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/efi.h
View File

@ -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

6
lib/efi/efi_stub.c
View File

@ -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 ");