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>

diff --git a/include/efi_api.h b/include/efi_api.h
index 3a9da32b82cb20d0df138a42ddb0b5453879208d..c98cc34908b6e2afde89e0c374c7aaae8efc17a8 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -303,7 +303,7 @@ struct efi_configuration_table
 
 struct efi_system_table {
        struct efi_table_hdr hdr;
-       unsigned long fw_vendor;   /* physical addr of wchar_t vendor string */
+       u16 *fw_vendor;   /* physical addr of wchar_t vendor string */
        u32 fw_revision;
        efi_handle_t con_in_handle;
        struct efi_simple_input_interface *con_in;

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index d6402c4615faa4e3ae0a8f4e2edfe4c699632790..1ffbf52a898274592f2c87c6cfb712d99ef710af 100644 (file)
--- 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 f6df6df7172c24c9aaa23c352d94cf1bdd6f27f1..c5d45dcc954e08e81f9e058bfbfbfa4d9d4343d6 100644 (file)
--- 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,