diff --git a/arch/arm/src/stm32f7/stm32_adc.h b/arch/arm/src/stm32f7/stm32_adc.h
index 89dd750d80..b26a5206b1 100644
--- a/arch/arm/src/stm32f7/stm32_adc.h
+++ b/arch/arm/src/stm32f7/stm32_adc.h
@@ -103,19 +103,19 @@
 
 /* Up to 3 ADC interfaces are supported */
 
-#if STM32_NADC < 4
+#if STM32F7_NADC < 4
 #  undef CONFIG_STM32F7_ADC4
 #endif
 
-#if STM32_NADC < 3
+#if STM32F7_NADC < 3
 #  undef CONFIG_STM32F7_ADC3
 #endif
 
-#if STM32_NADC < 2
+#if STM32F7_NADC < 2
 #  undef CONFIG_STM32F7_ADC2
 #endif
 
-#if STM32_NADC < 1
+#if STM32F7_NADC < 1
 #  undef CONFIG_STM32F7_ADC1
 #endif
 
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index e6fa309cd7..6d4793fda7 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -2221,8 +2221,8 @@ static int stm32_i2c_process(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
   struct stm32_i2c_inst_s     *inst = (struct stm32_i2c_inst_s *)dev;
   FAR struct stm32_i2c_priv_s *priv = inst->priv;
   uint32_t    status = 0;
-  uint32_t    cr1 = 0;
-  uint32_t    cr2 = 0;
+  uint32_t    cr1;
+  uint32_t    cr2;
   int         errval = 0;
   int         waitrc = 0;
 
diff --git a/configs/Kconfig b/configs/Kconfig
index de92e92a6a..2cd2d68c44 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1009,9 +1009,6 @@ config ARCH_BOARD_STM32F746G_DISCO
 config ARCH_BOARD_STM32F746_WS
 	bool "Waveshare STM32F746 board"
 	depends on ARCH_CHIP_STM32F746IG
-	select ARCH_HAVE_LEDS
-	select ARCH_HAVE_BUTTONS
-	select ARCH_HAVE_IRQBUTTONS
 	---help---
 		Waveshare STM32F746 development board featuring the STM32F746IG MCU.
 
diff --git a/configs/stm32f746-ws/nsh/defconfig b/configs/stm32f746-ws/nsh/defconfig
index 75e56a0d01..97b867c160 100644
--- a/configs/stm32f746-ws/nsh/defconfig
+++ b/configs/stm32f746-ws/nsh/defconfig
@@ -415,11 +415,6 @@ CONFIG_ARCH_BOARD="stm32f746-ws"
 #
 # Common Board Options
 #
-CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_HAVE_BUTTONS=y
-# CONFIG_ARCH_BUTTONS is not set
-CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_NSH_MMCSDMINOR=0
 
 #
@@ -614,7 +609,6 @@ CONFIG_ADC_FIFOSIZE=8
 #
 # LED Support
 #
-# CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
 # CONFIG_NCP5623C is not set