diff --git a/arch/arm/src/tiva/chip/tiva_flash.h b/arch/arm/src/tiva/chip/tiva_flash.h index 47b46000743..42c68807572 100644 --- a/arch/arm/src/tiva/chip/tiva_flash.h +++ b/arch/arm/src/tiva/chip/tiva_flash.h @@ -47,7 +47,7 @@ #if defined(CONFIG_ARCH_CHIP_TM4C129) # include "chip/tm4c_flash.h" -/* Others (including TM4C123) are similar to the LM3S family */ +/* Others (including LM4F and TM4C123) are similar to the LM3S family */ #else # include "chip/lm3s_flash.h" diff --git a/arch/arm/src/tiva/tiva_lowputc.c b/arch/arm/src/tiva/tiva_lowputc.c index 5c0d6eaa131..d982ff441e5 100644 --- a/arch/arm/src/tiva/tiva_lowputc.c +++ b/arch/arm/src/tiva/tiva_lowputc.c @@ -331,6 +331,11 @@ void up_lowsetup(void) /* Enable the selected console device */ #if defined(HAVE_SERIAL_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG) + /* REVISIT: There is some missing logic. We really should wait to be + * certain that the selected serial console UART is ready before writing + * to the UART registers. + */ + /* Disable the UART by clearing the UARTEN bit in the UART CTL register */ ctl = getreg32(TIVA_CONSOLE_BASE+TIVA_UART_CTL_OFFSET);