diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:17 -0400 |
| commit | 3d5ced9e22d32112a20f9dc0f5fb1f22ef088079 (patch) | |
| tree | 2c1e1f34c4dad05dfd08bd3687e6aee634c58500 /disk/part_efi.c | |
| parent | 98068b3be51a77d8b931a2f5097b5c22c57bcea5 (diff) | |
| parent | 41b781ddf1869f5349e05ace888979f3673fe8c6 (diff) | |
Merge tag 'dm-9oct18' of git://git.denx.de/u-boot-dm
Test improvements to tidy up output and drop duplicate tests
Sandbox SPL/TPL support
Various dm-related improvements
Diffstat (limited to 'disk/part_efi.c')
| -rw-r--r-- | disk/part_efi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 519a6376848..d6bb53e6b5d 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); |