diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-14 13:28:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-14 13:28:03 -0400 |
| commit | 9d0dc69235e8327dba5536761c768d40c4e514e5 (patch) | |
| tree | 3530f43c7f2a1d1ed5480aee804b60d71cc6dd2d /disk | |
| parent | 606fddd76c7a045c09d544357806b0b4de4845c7 (diff) | |
| parent | 58bc69d20aaf2e32e93e977d708fe6a1af0ad6d1 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-06-14
A few minor fixes for the release:
- Compile fixes
- HI20 relocations for RISC-V
- Fix bootefi without load path
- Fix Runtime Services with certain compilers
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_efi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 5c1039f013..2945892a24 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -23,6 +23,11 @@ DECLARE_GLOBAL_DATA_PTR; +/* + * GUID for basic data partions. + */ +static const efi_guid_t partition_basic_data_guid = PARTITION_BASIC_DATA_GUID; + #ifdef CONFIG_HAVE_BLOCK_DEVICE /** * efi_crc32() - EFI version of crc32 function @@ -502,12 +507,12 @@ int gpt_fill_pte(struct blk_desc *dev_desc, } else { /* default partition type GUID */ memcpy(bin_type_guid, - &PARTITION_BASIC_DATA_GUID, 16); + &partition_basic_data_guid, 16); } #else /* partition type GUID */ memcpy(gpt_e[i].partition_type_guid.b, - &PARTITION_BASIC_DATA_GUID, 16); + &partition_basic_data_guid, 16); #endif #if CONFIG_IS_ENABLED(PARTITION_UUIDS) |