]> git.baikalelectronics.ru Git - uboot.git/commit
efi.h: Do not use config options
authorAlexander Graf <agraf@suse.de>
Fri, 22 Jun 2018 08:38:26 +0000 (01:38 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Sun, 24 Jun 2018 00:56:04 +0000 (08:56 +0800)
commit1f1f6feeaeb11be36036ad365606df813a4e3dd3
treed8cd6f3d989a01bd3968264ad93d2a51eb556f57
parent4639ffa2f986360601337a414f62f500b41a5535
efi.h: Do not use config options

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>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: added some comments to describe the __x86_64__ check]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
include/efi.h
lib/efi/Makefile