From 5d6e6d66e2221a89c193012db0aa93cd3c9c869e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 28 Jun 2018 11:37:29 -0600
Subject: [PATCH] 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.

---
 arch/arm/src/stm32/Kconfig                   | 2 +-
 arch/arm/src/stm32/Make.defs                 | 2 +-
 arch/arm/src/stm32/stm32_hrtim.h             | 2 +-
 configs/nucleo-f334r8/src/Makefile           | 2 +-
 configs/nucleo-f334r8/src/nucleo-f334r8.h    | 2 +-
 configs/nucleo-f334r8/src/stm32_hrtim.c      | 4 ++--
 configs/stm32f334-disco/src/stm32_appinit.c  | 2 +-
 configs/stm32f334-disco/src/stm32_hrtim.c    | 4 ++--
 configs/stm32f334-disco/src/stm32_powerled.c | 2 +-
 configs/stm32f334-disco/src/stm32_smps.c     | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 6252cfa9a8..8465a22582 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -2366,7 +2366,7 @@ config STM32_HASH
 	default n
 	depends on STM32_STM32F207 || STM32_STM32F4XXX
 
-config HRTIM
+config STM32_HRTIM
 	bool "HRTIM"
 	default n
 
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 71a27b6751..254f855920 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -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
 
diff --git a/arch/arm/src/stm32/stm32_hrtim.h b/arch/arm/src/stm32/stm32_hrtim.h
index 7df316a037..987423342c 100644
--- a/arch/arm/src/stm32/stm32_hrtim.h
+++ b/arch/arm/src/stm32/stm32_hrtim.h
@@ -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 */
diff --git a/configs/nucleo-f334r8/src/Makefile b/configs/nucleo-f334r8/src/Makefile
index 938cdb9c92..4175d83663 100644
--- a/configs/nucleo-f334r8/src/Makefile
+++ b/configs/nucleo-f334r8/src/Makefile
@@ -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
 
diff --git a/configs/nucleo-f334r8/src/nucleo-f334r8.h b/configs/nucleo-f334r8/src/nucleo-f334r8.h
index 463f20cb24..6b3c09c6d7 100644
--- a/configs/nucleo-f334r8/src/nucleo-f334r8.h
+++ b/configs/nucleo-f334r8/src/nucleo-f334r8.h
@@ -222,7 +222,7 @@ int stm32_opamp_setup(void);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_HRTIM
+#ifdef CONFIG_STM32_HRTIM
 int stm32_hrtim_setup(void);
 #endif
 
diff --git a/configs/nucleo-f334r8/src/stm32_hrtim.c b/configs/nucleo-f334r8/src/stm32_hrtim.c
index a3bac42f5d..7a5fe91be5 100644
--- a/configs/nucleo-f334r8/src/stm32_hrtim.c
+++ b/configs/nucleo-f334r8/src/stm32_hrtim.c
@@ -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 */
diff --git a/configs/stm32f334-disco/src/stm32_appinit.c b/configs/stm32f334-disco/src/stm32_appinit.c
index dc9a5d1ce7..c07f938932 100644
--- a/configs/stm32f334-disco/src/stm32_appinit.c
+++ b/configs/stm32f334-disco/src/stm32_appinit.c
@@ -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();
diff --git a/configs/stm32f334-disco/src/stm32_hrtim.c b/configs/stm32f334-disco/src/stm32_hrtim.c
index 2310f7d777..3c6906bae0 100644
--- a/configs/stm32f334-disco/src/stm32_hrtim.c
+++ b/configs/stm32f334-disco/src/stm32_hrtim.c
@@ -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 */
diff --git a/configs/stm32f334-disco/src/stm32_powerled.c b/configs/stm32f334-disco/src/stm32_powerled.c
index c199786308..dbd9cc39f3 100644
--- a/configs/stm32f334-disco/src/stm32_powerled.c
+++ b/configs/stm32f334-disco/src/stm32_powerled.c
@@ -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
 
diff --git a/configs/stm32f334-disco/src/stm32_smps.c b/configs/stm32f334-disco/src/stm32_smps.c
index 3d42c76692..11d01d4fda 100644
--- a/configs/stm32f334-disco/src/stm32_smps.c
+++ b/configs/stm32f334-disco/src/stm32_smps.c
@@ -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