projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY
[oweals/u-boot.git]
/
disk
/
part.c
diff --git
a/disk/part.c
b/disk/part.c
index 3ba88c7e817b5dc8b146545ed46586c70e5ce85c..f07a17feb8a0e5e03663d986754e346779efe0ad 100644
(file)
--- a/
disk/part.c
+++ b/
disk/part.c
@@
-78,13
+78,20
@@
block_dev_desc_t *get_dev(char* ifname, int dev)
{
const struct block_drvr *drvr = block_drvr;
block_dev_desc_t* (*reloc_get_dev)(int dev);
{
const struct block_drvr *drvr = block_drvr;
block_dev_desc_t* (*reloc_get_dev)(int dev);
+ char *name;
+ name = drvr->name;
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+ name += gd->reloc_off;
+#endif
while (drvr->name) {
while (drvr->name) {
+ name = drvr->name;
reloc_get_dev = drvr->get_dev;
reloc_get_dev = drvr->get_dev;
-#ifndef CONFIG_RELOC_FIXUP_WORKS
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+ name += gd->reloc_off;
reloc_get_dev += gd->reloc_off;
#endif
reloc_get_dev += gd->reloc_off;
#endif
- if (strncmp(ifname,
drvr->name, strlen(drvr->
name)) == 0)
+ if (strncmp(ifname,
name, strlen(
name)) == 0)
return reloc_get_dev(dev);
drvr++;
}
return reloc_get_dev(dev);
drvr++;
}
@@
-364,6
+371,9
@@
static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
case IF_TYPE_DOC:
puts ("DOC");
break;
case IF_TYPE_DOC:
puts ("DOC");
break;
+ case IF_TYPE_MMC:
+ puts ("MMC");
+ break;
default:
puts ("UNKNOWN");
break;
default:
puts ("UNKNOWN");
break;