sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix another improperly qualified configuration varaible: CONFIG_HRTIM -> CONFIG_STM32_HRTIM. This is necessary to avoid conflict and confusion with other Kconfig files that may have the save variable definition.

Browse Source
This commit is contained in:
Gregory Nutt 2018-06-28 11:37:29 -06:00
parent b030209532
commit 5d6e6d66e2
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/Kconfig
View File

@ -2366,7 +2366,7 @@ config STM32_HASH
default n
depends on STM32_STM32F207 || STM32_STM32F4XXX
config HRTIM
config STM32_HRTIM
bool "HRTIM"
default n

2
arch/arm/src/stm32/Make.defs
View File

@ -218,7 +218,7 @@ ifeq ($(CONFIG_OPAMP),y)
CHIP_CSRCS += stm32_opamp.c
endif
ifeq ($(CONFIG_HRTIM),y)
ifeq ($(CONFIG_STM32_HRTIM),y)
CHIP_CSRCS += stm32_hrtim.c
endif

2
arch/arm/src/stm32/stm32_hrtim.h
View File

@ -1073,7 +1073,7 @@ struct stm32_hrtim_ops_s
struct hrtim_dev_s
{
#ifdef CONFIG_HRTIM
#ifdef CONFIG_STM32_HRTIM
/* Fields managed by common upper half HRTIM logic */
uint8_t hd_ocount; /* The number of times the device has been opened */

2
configs/nucleo-f334r8/src/Makefile
View File

@ -76,7 +76,7 @@ ifeq ($(CONFIG_TIMER),y)
CSRCS += stm32_timer.c
endif
ifeq ($(CONFIG_HRTIM),y)
ifeq ($(CONFIG_STM32_HRTIM),y)
CSRCS += stm32_hrtim.c
endif

2
configs/nucleo-f334r8/src/nucleo-f334r8.h
View File

@ -222,7 +222,7 @@ int stm32_opamp_setup(void);
*
****************************************************************************/
#ifdef CONFIG_HRTIM
#ifdef CONFIG_STM32_HRTIM
int stm32_hrtim_setup(void);
#endif

4
configs/nucleo-f334r8/src/stm32_hrtim.c
View File

@ -47,7 +47,7 @@
#include "stm32_hrtim.h"
#if defined(CONFIG_HRTIM) && defined(CONFIG_STM32_HRTIM1) && \
#if defined(CONFIG_STM32_HRTIM) && defined(CONFIG_STM32_HRTIM1) && \
!defined(CONFIG_NUCLEOF334R8_HIGHPRI)
/****************************************************************************
@ -97,4 +97,4 @@ int stm32_hrtim_setup(void)
return OK;
}
#endif /* CONFIG_HRTIM && CONFIG_STM32_HRTIM1 */
#endif /* CONFIG_STM32_HRTIM && CONFIG_STM32_HRTIM1 */

2
configs/stm32f334-disco/src/stm32_appinit.c
View File

@ -148,7 +148,7 @@ int board_app_initialize(uintptr_t arg)
}
#endif
#ifdef CONFIG_HRTIM
#ifdef CONFIG_STM32_HRTIM
/* Initialize HRTIM and register the HRTIM driver. */
ret = stm32_hrtim_setup();

4
configs/stm32f334-disco/src/stm32_hrtim.c
View File

@ -47,7 +47,7 @@
#include "stm32_hrtim.h"
#if defined(CONFIG_HRTIM) && defined(CONFIG_STM32_HRTIM1)
#if defined(CONFIG_STM32_HRTIM) && defined(CONFIG_STM32_HRTIM1)
/****************************************************************************
* Public Functions
@ -96,4 +96,4 @@ int stm32_hrtim_setup(void)
return OK;
}
#endif /* CONFIG_HRTIM && CONFIG_STM32_HRTIM1 */
#endif /* CONFIG_STM32_HRTIM && CONFIG_STM32_HRTIM1 */

2
configs/stm32f334-disco/src/stm32_powerled.c
View File

@ -66,7 +66,7 @@
#if defined(CONFIG_EXAMPLES_POWERLED) && defined(CONFIG_DRIVERS_POWERLED)
#if !defined(CONFIG_STM32_HRTIM1) || !defined(CONFIG_HRTIM)
#if !defined(CONFIG_STM32_HRTIM1) || !defined(CONFIG_STM32_HRTIM)
# error "Powerled example requires HRTIM1 support"
#endif

2
configs/stm32f334-disco/src/stm32_smps.c
View File

@ -89,7 +89,7 @@
# warning Set CONFIG_ARCH_FPU for hardware FPU support
#endif
#if !defined(CONFIG_STM32_HRTIM1) || !defined(CONFIG_HRTIM)
#if !defined(CONFIG_STM32_HRTIM1) || !defined(CONFIG_STM32_HRTIM)
# error "SMPS example requires HRTIM1 support"
#endif