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

part: rkparm: update part table if device change 

Do not re-use the partition table for 'mmc 1' from the partition
table of 'mmc 0', update the table if the device number changed.

Change-Id: I03b8509749d079ded6a0e0a87929be21732399fb
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2018-05-25 16:27:35 +08:00
parent 48b6ef28ca
commit bad3fe2d02
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
disk/part_rkparm.c
View File

@ -27,6 +27,7 @@ struct rkparm_part {
static LIST_HEAD(parts_head); static LIST_HEAD(parts_head);
static int dev_num = -1;
static int rkparm_param_parse(char *param, struct list_head *parts_head, static int rkparm_param_parse(char *param, struct list_head *parts_head,
struct blk_desc *dev_desc) struct blk_desc *dev_desc)
@ -56,6 +57,7 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
*/ */
env_delete("bootargs", "initrd="); env_delete("bootargs", "initrd=");
INIT_LIST_HEAD(parts_head);
while (next) { while (next) {
/* Skip ':' and ',' */ /* Skip ':' and ',' */
next++; next++;
@ -88,6 +90,8 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
next = strchr(next, ','); next = strchr(next, ',');
} }
dev_num = ((dev_desc->if_type << 8) + dev_desc->devnum);
return 0; return 0;
} }
@ -124,7 +128,8 @@ static void part_print_rkparm(struct blk_desc *dev_desc)
struct rkparm_part *p = NULL; struct rkparm_part *p = NULL;
int i = 0; int i = 0;
if (list_empty(&parts_head)) if (list_empty(&parts_head) ||
(dev_num != ((dev_desc->if_type << 8) + dev_desc->devnum)))
ret = rkparm_init_param(dev_desc, &parts_head); ret = rkparm_init_param(dev_desc, &parts_head);
if (ret) { if (ret) {
@ -156,7 +161,8 @@ static int part_get_info_rkparm(struct blk_desc *dev_desc, int idx,
return -EINVAL; return -EINVAL;
} }
if (list_empty(&parts_head)) if (list_empty(&parts_head) ||
(dev_num != ((dev_desc->if_type << 8) + dev_desc->devnum)))
ret = rkparm_init_param(dev_desc, &parts_head); ret = rkparm_init_param(dev_desc, &parts_head);
if (ret) { if (ret) {
@ -191,7 +197,8 @@ static int part_test_rkparm(struct blk_desc *dev_desc)
{ {
int ret = 0; int ret = 0;
if (list_empty(&parts_head)) if (list_empty(&parts_head) ||
(dev_num != ((dev_desc->if_type << 8) + dev_desc->devnum)))
ret = rkparm_init_param(dev_desc, &parts_head); ret = rkparm_init_param(dev_desc, &parts_head);
if (ret) if (ret)
ret = -1; ret = -1;