On 12.06.18 17:33, Bin Meng wrote:
Hi Alex,
On Tue, Jun 12, 2018 at 5:21 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Jun 12, 2018 at 1:54 PM, Alexander Graf agraf@suse.de wrote:
Currently efi.h determines a few bits of its environment according to config options. This falls apart with the efi stub support which may result in efi.h getting pulled into the stub as well as real U-Boot code. In that case, one may be 32bit while the other one is 64bit.
This patch changes the conditionals to use compiler provided defines instead. That way we always adhere to the build environment we're in and the definitions adjust automatically.
Signed-off-by: Alexander Graf agraf@suse.de
include/efi.h | 17 ++++------------- lib/efi/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com Tested-by: Bin Meng bmeng.cn@gmail.com
Alex, will you take this one via the efi tree, or via the x86 tree since the EFI app/stub changes are dependent on this one?
I included your patch into my EFI app/stub series v2, for review and testing.
I don't mind either way. It probably fits better into your series though which again should probably go via your tree :).
Alex