Fix errors noticed after enabling CONFIG_EFI_PARTITION for the OMAP3 EVM board:
part_efi.c: In function 'print_part_efi': part_efi.c:133:5: warning: passing argument 3 of 'is_gpt_valid' from incompatible pointer type part_efi.c:95:12: note: expected 'struct gpt_header *' but arg ument is of type 'struct gpt_header **' part_efi.c: In function 'get_partition_info_efi': part_efi.c:173:4: warning: passing argument 3 of 'is_gpt_valid ' from incompatible pointer type part_efi.c:95:12: note: expected 'struct gpt_header *' but arg ument is of type 'struct gpt_header **' part_efi.c: In function 'alloc_read_gpt_entries': part_efi.c:384:18: error: 'CONFIG_SYS_CACHELINE_SIZE' undeclare d (first use in this function)
Signed-off-by: Sanjeev Premi premi@ti.com Cc: Tom Rini tom.rini@gmail.com Cc: Anton staaf robotboy@chromium.org ---
Changes since v1: * Use ARCH_DMA_MINALIGN instead of CONFIG_SYS_CACHELINE_SIZE in disk/part_efi.c.
It is based on definition of ARCH_DMA_MINALIGN introduced in 44d6cbb6a77665caa14be2a561c4148446b3ba7e:
arm: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
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 e7f2714..b6cda57 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -130,7 +130,7 @@ void print_part_efi(block_dev_desc_t * dev_desc) } /* This function validates AND fills in the GPT header and PTE */ if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, - &(gpt_head), &gpt_pte) != 1) { + gpt_head, &gpt_pte) != 1) { printf("%s: *** ERROR: Invalid GPT ***\n", __func__); return; } @@ -169,7 +169,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
/* This function validates AND fills in the GPT header and PTE */ if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, - &(gpt_head), &gpt_pte) != 1) { + gpt_head, &gpt_pte) != 1) { printf("%s: *** ERROR: Invalid GPT ***\n", __func__); return -1; } @@ -380,7 +380,7 @@ static gpt_entry *alloc_read_gpt_entries(block_dev_desc_t * dev_desc,
/* Allocate memory for PTE, remember to FREE */ if (count != 0) { - pte = memalign(CONFIG_SYS_CACHELINE_SIZE, count); + pte = memalign(ARCH_DMA_MINALIGN, count); }
if (count == 0 || pte == NULL) {