diff options
| author | Simon Glass <sjg@chromium.org> | 2018-10-01 12:22:35 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-10-09 04:40:27 -0600 |
| commit | 67b90522640a27dc3c9b6d86d93dc0bf6596e8f8 (patch) | |
| tree | 2daff7be86b556000a8040c253940ff478f09a61 | |
| parent | 109860ff3ec7d3d2ba1363a29a480e2d8551ed21 (diff) | |
| download | u-boot-67b90522640a27dc3c9b6d86d93dc0bf6596e8f8.tar.gz u-boot-67b90522640a27dc3c9b6d86d93dc0bf6596e8f8.tar.bz2 u-boot-67b90522640a27dc3c9b6d86d93dc0bf6596e8f8.zip | |
Rename GPT_HEADER_SIGNATURE to avoid conflict
The current name conflicts with the Chrome OS verified boot library, which
prevents it being built. That library uses a string whereas U-Boot uses a
64-bit hex value. Rename this in U-Boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | disk/part_efi.c | 6 | ||||
| -rw-r--r-- | include/part_efi.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 519a637684..d6bb53e6b5 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -82,11 +82,11 @@ static int validate_gpt_header(gpt_header *gpt_h, lbaint_t lba, uint32_t calc_crc32; /* Check the GPT header signature */ - if (le64_to_cpu(gpt_h->signature) != GPT_HEADER_SIGNATURE) { + if (le64_to_cpu(gpt_h->signature) != GPT_HEADER_SIGNATURE_UBOOT) { printf("%s signature is wrong: 0x%llX != 0x%llX\n", "GUID Partition Table Header", le64_to_cpu(gpt_h->signature), - GPT_HEADER_SIGNATURE); + GPT_HEADER_SIGNATURE_UBOOT); return -1; } @@ -603,7 +603,7 @@ static uint32_t partition_entries_offset(struct blk_desc *dev_desc) int gpt_fill_header(struct blk_desc *dev_desc, gpt_header *gpt_h, char *str_guid, int parts_count) { - gpt_h->signature = cpu_to_le64(GPT_HEADER_SIGNATURE); + gpt_h->signature = cpu_to_le64(GPT_HEADER_SIGNATURE_UBOOT); gpt_h->revision = cpu_to_le32(GPT_HEADER_REVISION_V1); gpt_h->header_size = cpu_to_le32(sizeof(gpt_header)); gpt_h->my_lba = cpu_to_le64(1); diff --git a/include/part_efi.h b/include/part_efi.h index 8525770445..7170b61c95 100644 --- a/include/part_efi.h +++ b/include/part_efi.h @@ -24,7 +24,7 @@ #define EFI_PMBR_OSTYPE_EFI 0xEF #define EFI_PMBR_OSTYPE_EFI_GPT 0xEE -#define GPT_HEADER_SIGNATURE 0x5452415020494645ULL +#define GPT_HEADER_SIGNATURE_UBOOT 0x5452415020494645ULL #define GPT_HEADER_REVISION_V1 0x00010000 #define GPT_PRIMARY_PARTITION_TABLE_LBA 1ULL #define GPT_ENTRY_NUMBERS CONFIG_EFI_PARTITION_ENTRIES_NUMBERS |