LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32prog: add partition name in treat_partition_list error messages 

Add the partition name and remove the line number in error messages
of treat_partition_list() to provide correct information to user of
STM32CubeProgrammer.

The "line number" value was confusing because it is incorrect here;
the index in  part_array[] is not aligned with the line number in
the parsed Layout file, because the empty lines and the lines beginning
by '#' are skipped during the first parsing in parse_flash_layout().

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Patrick Delaunay 2022-01-18 10:33:14 +01:00 committed by Patrice Chotard
parent 046bdb8064
commit 94e561f84a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
View File

@ -835,8 +835,8 @@ static int treat_partition_list(struct stm32prog_data *data)
/* skip partition with IP="none" */ /* skip partition with IP="none" */
if (part->target == STM32PROG_NONE) { if (part->target == STM32PROG_NONE) {
if (IS_SELECT(part)) { if (IS_SELECT(part)) {
stm32prog_err("Layout: selected none phase = 0x%x", stm32prog_err("Layout: selected none phase = 0x%x for part %s",
part->id); part->id, part->name);
return -EINVAL; return -EINVAL;
} }
continue; continue;
@ -844,14 +844,14 @@ static int treat_partition_list(struct stm32prog_data *data)
if (part->id == PHASE_FLASHLAYOUT || if (part->id == PHASE_FLASHLAYOUT ||
part->id > PHASE_LAST_USER) { part->id > PHASE_LAST_USER) {
stm32prog_err("Layout: invalid phase = 0x%x", stm32prog_err("Layout: invalid phase = 0x%x for part %s",
part->id); part->id, part->name);
return -EINVAL; return -EINVAL;
} }
for (j = i + 1; j < data->part_nb; j++) { for (j = i + 1; j < data->part_nb; j++) {
if (part->id == data->part_array[j].id) { if (part->id == data->part_array[j].id) {
stm32prog_err("Layout: duplicated phase 0x%x at line %d and %d", stm32prog_err("Layout: duplicated phase 0x%x for part %s and %s",
part->id, i, j); part->id, part->name, data->part_array[j].name);
return -EINVAL; return -EINVAL;
} }
} }