From 118a127771e1dce933642c4c01187ff8192ca522 Mon Sep 17 00:00:00 2001 From: Tiago Medicci Serrano Date: Wed, 24 May 2023 13:53:36 -0300 Subject: [PATCH] esp32_start: use up_putc instead up_puts in showprogress define During initialization it isn't possible to use up_puts once it's protected against concurrent access through a mutex lock. Instead, using up_putc makes it similar to ESP32S2 and ESP32S3 and perfectly fits for showprogress usage. --- arch/xtensa/src/esp32/esp32_start.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/xtensa/src/esp32/esp32_start.c b/arch/xtensa/src/esp32/esp32_start.c index bde7ef8624..0422dd7a3e 100644 --- a/arch/xtensa/src/esp32/esp32_start.c +++ b/arch/xtensa/src/esp32/esp32_start.c @@ -51,7 +51,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_puts(c) +# define showprogress(c) up_putc(c) #else # define showprogress(c) #endif @@ -220,7 +220,7 @@ static noreturn_function void __esp32_start(void) xtensa_earlyserialinit(); #endif - showprogress("A"); + showprogress('A'); #if defined(CONFIG_ESP32_SPIRAM_BOOT_INIT) if (esp_spiram_init() != OK) @@ -252,7 +252,7 @@ static noreturn_function void __esp32_start(void) esp32_board_initialize(); - showprogress("B"); + showprogress('B'); /* For the case of the separate user-/kernel-space build, perform whatever * platform specific initialization of the user memory is required. @@ -262,7 +262,7 @@ static noreturn_function void __esp32_start(void) #ifdef CONFIG_BUILD_PROTECTED esp32_userspace(); - showprogress("C"); + showprogress('C'); #endif /* Bring up NuttX */