From: Stephen Warren swar...@nvidia.com
Devices are not all identified by a single integer. To support
this, defer the parsing of the device string to the IO backed, so that
it can apply the appropriate rules.
SPI devices are specified as controller:chip_select. SPI/SF support will
be added soon.
MMC devices can also be specified as controller[.hwpart][:partition] in
many commands, although we don't support that syntax in DFU.
Signed-off-by: Stephen Warren swar...@nvidia.com
---
common/cmd_dfu.c | 3 +--
drivers/dfu/dfu.c | 20 ++--
drivers/dfu/dfu_mmc.c | 21 -
drivers/dfu/dfu_nand.c | 2 +-
drivers/dfu/dfu_ram.c | 2 +-
include/dfu.h | 22 +-
6 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 433bddd5d2bd..2633b30e556f 100644
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -24,8 +24,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
int ret, i = 0;
- ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
- NULL, 10));
+ ret = dfu_init_env_entities(interface, devstring);
if (ret)
goto done;
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 1bf66d0613c9..26d3b44e40f5 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -44,7 +44,7 @@ static int dfu_find_alt_num(const char *s)
return ++i;
}
-int dfu_init_env_entities(char *interface, int dev)
+int dfu_init_env_entities(char *interface, char *devstr)
{
const char *str_env;
char *env_bkp;
@@ -57,7 +57,7 @@ int dfu_init_env_entities(char *interface, int dev)
}
env_bkp = strdup(str_env);
- ret = dfu_config_entities(env_bkp, interface, dev);
+ ret = dfu_config_entities(env_bkp, interface, devstr);
if (ret) {
error(DFU entities configuration failed!\n);
return ret;
@@ -389,26 +389,25 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size,
int blk_seq_num)
}
static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt,
- char *interface, int num)
+ char *interface, char *devstr)
{
char *st;
- debug(%s: %s interface: %s num: %d\n, __func__, s, interface, num);
+ debug(%s: %s interface: %s dev: %s\n, __func__, s, interface, devstr);
st = strsep(s, );
strcpy(dfu-name, st);
- dfu-dev_num = num;
dfu-alt = alt;
/* Specific for mmc device */
if (strcmp(interface, mmc) == 0) {
- if (dfu_fill_entity_mmc(dfu, s))
+ if (dfu_fill_entity_mmc(dfu, devstr, s))
return -1;
} else if (strcmp(interface, nand) == 0) {
- if (dfu_fill_entity_nand(dfu, s))
+ if (dfu_fill_entity_nand(dfu, devstr, s))
return -1;
} else if (strcmp(interface, ram) == 0) {
- if (dfu_fill_entity_ram(dfu, s))
+ if (dfu_fill_entity_ram(dfu, devstr, s))
return -1;
} else {
printf(%s: Device %s not (yet) supported!\n,
@@ -434,7 +433,7 @@ void dfu_free_entities(void)
alt_num_cnt = 0;
}
-int dfu_config_entities(char *env, char *interface, int num)
+int dfu_config_entities(char *env, char *interface, char *devstr)
{
struct dfu_entity *dfu;
int i, ret;
@@ -457,7 +456,8 @@ int dfu_config_entities(char *env, char *interface, int num)
for (i = 0; i dfu_alt_num; i++) {
s = strsep(env, ;);
- ret = dfu_fill_entity(dfu[i], s, alt_num_cnt, interface, num);
+ ret = dfu_fill_entity(dfu[i], s, alt_num_cnt, interface,
+ devstr);
if (ret)
return -1;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 322bd8c5d2de..72fa03eedaec 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -27,7 +27,7 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc
*mmc, int part)
if (part == mmc-part_num)
return 0;
- ret = mmc_switch_part(dfu-dev_num, part);
+ ret = mmc_switch_part(dfu-data.mmc.dev_num, part);
if (ret) {
error(Cannot switch to partition %d\n, part);
return ret;
@@ -40,7 +40,7 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc
*mmc, int part)
static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
u64 offset, void *buf, long *len)
{
- struct mmc *mmc = find_mmc_device(dfu-dev_num);
+ struct mmc *mmc = find_mmc_device(dfu-data.mmc.dev_num);
u32 blk_start, blk_count, n = 0;
int ret, part_num_bkp = 0;
@@ -67,15 +67,15 @@ static int mmc_block_op(enum dfu_op op,
