diff options
Diffstat (limited to 'nuttx/arch/arm/src')
-rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_internal.h | 15 | ||||
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_lowputc.c | 6 | ||||
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_start.c | 4 |
4 files changed, 10 insertions, 19 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_internal.h b/nuttx/arch/arm/src/stm32/stm32_internal.h index 285e0ae20..e737473b5 100755 --- a/nuttx/arch/arm/src/stm32/stm32_internal.h +++ b/nuttx/arch/arm/src/stm32/stm32_internal.h @@ -133,14 +133,14 @@ extern "C" { ****************************************************************************/ /**************************************************************************** - * Name: up_lowsetup + * Name: stm32_lowsetup * * Description: * Called at the very beginning of _start. Performs low level initialization. * ****************************************************************************/ -EXTERN void up_lowsetup(void); +EXTERN void stm32_lowsetup(void); /**************************************************************************** * Name: stm32_clockconfig @@ -153,17 +153,6 @@ EXTERN void up_lowsetup(void); EXTERN void stm32_clockconfig(void); /**************************************************************************** - * Name: up_clockconfig - * - * Description: - * Called early in the bootsequence (before .data and .bss are available) - * in order to configure initial clocking. - * - ****************************************************************************/ - -EXTERN void up_clockconfig(void); - -/**************************************************************************** * Name: stm32_configgpio * * Description: diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c index 61a4765e8..0c364022e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c +++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c @@ -40,6 +40,8 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <arch/board/board.h> + #include "up_internal.h" #include "up_arch.h" @@ -206,7 +208,7 @@ void up_lowputc(char ch) } /************************************************************************** - * Name: up_lowsetup + * Name: stm32_lowsetup * * Description: * This performs basic initialization of the USART used for the serial @@ -215,7 +217,7 @@ void up_lowputc(char ch) * **************************************************************************/ -void up_lowsetup(void) +void stm32_lowsetup(void) { #if !defined(CONFIG_USART1_DISABLE) || !defined(CONFIG_USART2_DISABLE) || !defined(CONFIG_USART3_DISABLE) uint32 enr; diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index 5561708ef..30df74114 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -438,7 +438,7 @@ static int up_setup(struct uart_dev_s *dev) uint16 regval; /* Note: The logic here depends on the fact that that the USART module - * was enabled and the pins were configured in up_lowsetup(). + * was enabled and the pins were configured in stm32_lowsetup(). */ /* Configure CR2 */ @@ -961,7 +961,7 @@ static boolean up_txready(struct uart_dev_s *dev) void up_earlyserialinit(void) { /* NOTE: All GPIO configuration for the USARTs was performed in - * up_lowsetup + * stm32_lowsetup */ /* Disable all USARTS */ diff --git a/nuttx/arch/arm/src/stm32/stm32_start.c b/nuttx/arch/arm/src/stm32/stm32_start.c index 25f6d0ed6..554b94ca4 100644 --- a/nuttx/arch/arm/src/stm32/stm32_start.c +++ b/nuttx/arch/arm/src/stm32/stm32_start.c @@ -101,8 +101,8 @@ void __start(void) /* Configure the uart so that we can get debug output as soon as possible */ - up_clockconfig(); - up_lowsetup(); + stm32_clockconfig(); + stm32_lowsetup(); showprogress('A'); /* Clear .bss. We'll do this inline (vs. calling memset) just to be |