stm32mp: stm32prog: reactivate console and display serial error

When serial instance is not found in device tree, the console
should be enabled and the error should be indicated.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index a453f89d02189dafae031f4dcf5b2432579e72a7..527b6290decd9f709d4d68c65d228ac743fd2157 100644 (file)
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -476,11 +476,17 @@ static void setup_boot_mode(void)
                        break;
                /* serial : search associated alias in devicetree */
                sprintf(cmd, "serial@%x", serial_addr[instance]);
-               if (uclass_get_device_by_name(UCLASS_SERIAL, cmd, &dev))
-                       break;
-               if (fdtdec_get_alias_seq(gd->fdt_blob, "serial",
-                                        dev_of_offset(dev), &alias))
+               if (uclass_get_device_by_name(UCLASS_SERIAL, cmd, &dev) ||
+                   fdtdec_get_alias_seq(gd->fdt_blob, "serial",
+                                        dev_of_offset(dev), &alias)) {
+                       /* restore console on error */
+                       if (IS_ENABLED(CONFIG_CMD_STM32PROG_SERIAL))
+                               gd->flags &= ~(GD_FLG_SILENT |
+                                              GD_FLG_DISABLE_CONSOLE);
+                       printf("serial%d = %s not found in device tree!\n",
+                              instance, cmd);
                        break;
+               }
                sprintf(cmd, "%d", alias);
                env_set("boot_device", "serial");
                env_set("boot_instance", cmd);