qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk: efi: do not fix the gpt error at SPL in normal boot 

We handle the error at U-Boot stage instead of SPL stage in normal case,
still need to do this in SPL when there is no U-Boot proper.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I008caaa0d1f95316fc0b87cb55de35d8f8e31b36
This commit is contained in:
Kever Yang 2020-08-28 14:34:18 +08:00
parent 1252bc90e4
commit 95522b57e0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
disk/part_efi.c
View File

@ -341,6 +341,7 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part,
}
#ifdef CONFIG_RKIMG_BOOTLOADER
#if defined(CONFIG_SPL_KERNEL_BOOT) || !defined(CONFIG_SPL_BUILD)
static void gpt_entry_modify(struct blk_desc *dev_desc,
gpt_entry *gpt_pte,
gpt_header *gpt_head)
@ -426,6 +427,7 @@ static int part_efi_repair(struct blk_desc *dev_desc, gpt_entry *gpt_pte,
return 0;
}
#endif
#endif
static int part_test_efi(struct blk_desc *dev_desc)
{
@ -438,6 +440,7 @@ static int part_test_efi(struct blk_desc *dev_desc)
return -1;
}
#ifdef CONFIG_RKIMG_BOOTLOADER
#if defined(CONFIG_SPL_KERNEL_BOOT) || !defined(CONFIG_SPL_BUILD)
gpt_entry *h_gpt_pte = NULL;
gpt_header *h_gpt_head = NULL;
gpt_entry *b_gpt_pte = NULL;
@ -474,6 +477,7 @@ static int part_test_efi(struct blk_desc *dev_desc)
b_gpt_pte = NULL;
free(b_gpt_head);
b_gpt_head = NULL;
#endif
#endif
return ret;
}