diff options
| -rw-r--r-- | common/cmd_mtdparts.c | 9 | ||||
| -rw-r--r-- | drivers/mtd/cfi_mtd.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 5481c885d3..2c2e4e0973 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -838,7 +838,10 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_ struct mtdids *id; const char *mtd_id; unsigned int mtd_id_len; - const char *p, *pend; + const char *p; +#ifdef DEBUG + const char *pend; +#endif LIST_HEAD(tmp_list); struct list_head *entry, *n; u16 num_parts; @@ -868,10 +871,12 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_ return 1; } +#ifdef DEBUG + pend = strchr(p, ';'); +#endif debug("dev type = %d (%s), dev num = %d, mtd-id = %s\n", id->type, MTD_DEV_TYPE(id->type), id->num, id->mtd_id); - pend = strchr(p, ';'); debug("parsing partitions %.*s\n", (pend ? pend - p : strlen(p)), p); diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index cbcc165c7e..8d74fa9412 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -222,8 +222,10 @@ int cfi_mtd_init(void) struct mtd_info *mtd; flash_info_t *fi; int error, i; +#ifdef CONFIG_MTD_CONCAT int devices_found = 0; struct mtd_info *mtd_list[CONFIG_SYS_MAX_FLASH_BANKS]; +#endif for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) { fi = &flash_info[i]; @@ -253,7 +255,9 @@ int cfi_mtd_init(void) if (add_mtd_device(mtd)) return -ENOMEM; +#ifdef CONFIG_MTD_CONCAT mtd_list[devices_found++] = mtd; +#endif } #ifdef CONFIG_MTD_CONCAT |