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

android: get dev_desc by rockchip_get_bootdev() 

Get dev_desc by call rockchip_get_bootdev() but not
default mmc 0.

Change-Id: I78c6760eb6410a14a9f767db2f90902ec97f432f
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
This commit is contained in:
Jason Zhu 2018-07-04 11:18:11 +08:00 committed by Kever Yang
parent 65413a00f9
commit d34064effa
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/android_bootloader.c
View File

@ -211,7 +211,6 @@ static int android_bootloader_boot_bootloader(void)
static int android_bootloader_get_fdt(const char *part_name,
const char *load_file_name)
{
const char *dev_iface = "mmc";
struct blk_desc *dev_desc;
disk_partition_t boot_part_info;
char *fdt_addr = NULL;
@ -222,12 +221,11 @@ static int android_bootloader_get_fdt(const char *part_name,
loff_t len_read;
unsigned long addr = 0;
int part_num = -1;
int dev_num = 0;
int ret;
dev_desc = blk_get_dev(dev_iface, dev_num);
dev_desc = rockchip_get_bootdev();
if (!dev_desc) {
printf("Could not find %s %d\n", dev_iface, dev_num);
printf("%s: dev_desc is NULL!\n", __func__);
return -1;
}
@ -251,7 +249,7 @@ static int android_bootloader_get_fdt(const char *part_name,
#endif
snprintf(dev_part, ARRAY_SIZE(dev_part), ":%x", part_num);
if (fs_set_blk_dev(dev_iface, dev_part, FS_TYPE_EXT))
if (fs_set_blk_dev_with_part(dev_desc, part_num))
return -1;
fdt_addr = env_get("fdt_addr_r");
@ -620,14 +618,12 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
int android_avb_boot_flow(char *slot_suffix, unsigned long kernel_address)
{
const char *dev_iface = "mmc";
int dev_num = 0;
struct blk_desc *dev_desc;
disk_partition_t boot_part_info;
int ret;
dev_desc = blk_get_dev(dev_iface, dev_num);
dev_desc = rockchip_get_bootdev();
if (!dev_desc) {
printf("Could not find %s %d\n", dev_iface, dev_num);
printf("%s: dev_desc is NULL!\n", __func__);
return -1;
}
/* Load the kernel from the desired "boot" partition. */
@ -646,14 +642,12 @@ int android_avb_boot_flow(char *slot_suffix, unsigned long kernel_address)
int android_boot_flow(unsigned long kernel_address)
{
const char *dev_iface = "mmc";
int dev_num = 0;
struct blk_desc *dev_desc;
disk_partition_t boot_part_info;
int ret;
dev_desc = blk_get_dev(dev_iface, dev_num);
dev_desc = rockchip_get_bootdev();
if (!dev_desc) {
printf("Could not find %s %d\n", dev_iface, dev_num);
printf("%s: dev_desc is NULL!\n", __func__);
return -1;
}
/* Load the kernel from the desired "boot" partition. */