diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2018-06-28 12:45:30 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-07-25 14:59:44 +0200 |
| commit | 0b386537a51d5ac6e2da022ade49424ecc50ffa1 (patch) | |
| tree | f0c37ee34c1b38bbb956756b1dc20bfbffb2434b /lib/efi_loader | |
| parent | 71c846ab84c81b0ef7786ee5ea02bb05d5ca5bb8 (diff) | |
| download | u-boot-0b386537a51d5ac6e2da022ade49424ecc50ffa1.tar.gz u-boot-0b386537a51d5ac6e2da022ade49424ecc50ffa1.tar.xz u-boot-0b386537a51d5ac6e2da022ade49424ecc50ffa1.zip | |
efi_loader: provide firmware revision
Provide a firmware revision in the system table using the Makefile
variables VERSION and PATCHLEVEL, e.g. 0x20180700 for v2018.07.
Correct the type of the firmware vendor. It is a u16* pointer.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib/efi_loader')
| -rw-r--r-- | lib/efi_loader/Makefile | 3 | ||||
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index d6402c4615..1ffbf52a89 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -6,6 +6,9 @@ # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it +CFLAGS_efi_boottime.o += \ + -DFW_VERSION="0x$(VERSION)" \ + -DFW_PATCHLEVEL="0x$(PATCHLEVEL)" CFLAGS_helloworld.o := $(CFLAGS_EFI) -Os -ffreestanding CFLAGS_REMOVE_helloworld.o := $(CFLAGS_NON_EFI) -Os diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index f6df6df717..c5d45dcc95 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -3110,7 +3110,7 @@ static const struct efi_boot_services efi_boot_services = { .create_event_ex = efi_create_event_ex, }; -static uint16_t __efi_runtime_data firmware_vendor[] = L"Das U-Boot"; +static u16 __efi_runtime_data firmware_vendor[] = L"Das U-Boot"; struct efi_system_table __efi_runtime_data systab = { .hdr = { @@ -3118,7 +3118,8 @@ struct efi_system_table __efi_runtime_data systab = { .revision = EFI_SPECIFICATION_VERSION, .headersize = sizeof(struct efi_system_table), }, - .fw_vendor = (long)firmware_vendor, + .fw_vendor = firmware_vendor, + .fw_revision = FW_VERSION << 16 | FW_PATCHLEVEL << 8, .con_in = (void *)&efi_con_in, .con_out = (void *)&efi_con_out, .std_err = (void *)&efi_con_out, |