diff --git a/configs/Kconfig b/configs/Kconfig
index 77d872de6ac..7bcec3f2056 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -39,8 +39,8 @@ config ARCH_BOARD_AVR32DEV1
 	bool "Atmel AVR32DEV1 board"
 	depends on ARCH_CHIP_AT32UC3B0256
 	select ARCH_HAVE_LEDS
-	select ARCH_HAVE_BUTTONS
-	select ARCH_HAVE_IRQBUTTONS
+#	select ARCH_HAVE_BUTTONS
+#	select ARCH_HAVE_IRQBUTTONS
 	---help---
 		This is a port of NuttX to the Atmel AVR32DEV1 board.  That board is
 		based on the Atmel AT32UC3B0256 MCU and uses a specially patched
diff --git a/configs/indium-f7/f722-nsh/defconfig b/configs/indium-f7/f722-nsh/defconfig
index c1320917099..0e8f51c7302 100644
--- a/configs/indium-f7/f722-nsh/defconfig
+++ b/configs/indium-f7/f722-nsh/defconfig
@@ -1,10 +1,8 @@
 # CONFIG_ARCH_FPU is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_ARCH_BOARD_NUCLEO_144=y
 CONFIG_ARCH_BOARD_INDIUM_F7=y
 CONFIG_ARCH_BOARD="indium-f7"
-CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_CHIP_STM32F722ZE=y
 CONFIG_ARCH_STACKDUMP=y
@@ -47,6 +45,5 @@ CONFIG_START_YEAR=2015
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_USART6_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/indium-f7/f746-evalos/defconfig b/configs/indium-f7/f746-evalos/defconfig
index e6c97fae372..35ed6036caf 100644
--- a/configs/indium-f7/f746-evalos/defconfig
+++ b/configs/indium-f7/f746-evalos/defconfig
@@ -4,10 +4,8 @@
 # CONFIG_NSH_DISABLE_DATE is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_ARCH_BOARD_NUCLEO_144=y
 CONFIG_ARCH_BOARD_INDIUM_F7=y
 CONFIG_ARCH_BOARD="indium-f7"
-CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_CHIP_STM32F746ZG=y
 CONFIG_ARCH_STACKDUMP=y
@@ -36,7 +34,6 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
@@ -60,7 +57,6 @@ CONFIG_START_YEAR=2015
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERLED_LOWER=y
 CONFIG_USERLED=y
diff --git a/configs/indium-f7/f746-nsh/defconfig b/configs/indium-f7/f746-nsh/defconfig
index 36e0ab24197..7cbe3b8643b 100644
--- a/configs/indium-f7/f746-nsh/defconfig
+++ b/configs/indium-f7/f746-nsh/defconfig
@@ -1,10 +1,8 @@
 # CONFIG_ARCH_FPU is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_ARCH_BOARD_NUCLEO_144=y
 CONFIG_ARCH_BOARD_INDIUM_F7=y
 CONFIG_ARCH_BOARD="indium-f7"
-CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_CHIP_STM32F746ZG=y
 CONFIG_ARCH_STACKDUMP=y
@@ -29,7 +27,6 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
@@ -48,6 +45,5 @@ CONFIG_START_YEAR=2015
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/indium-f7/f767-evalos/defconfig b/configs/indium-f7/f767-evalos/defconfig
index acc08c10659..5e653276f93 100644
--- a/configs/indium-f7/f767-evalos/defconfig
+++ b/configs/indium-f7/f767-evalos/defconfig
@@ -4,10 +4,8 @@
 # CONFIG_NSH_DISABLE_DATE is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_ARCH_BOARD_NUCLEO_144=y
 CONFIG_ARCH_BOARD_INDIUM_F7=y
 CONFIG_ARCH_BOARD="indium-f7"
-CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_CHIP_STM32F767ZI=y
 CONFIG_ARCH_STACKDUMP=y
@@ -36,7 +34,6 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
@@ -60,7 +57,6 @@ CONFIG_START_YEAR=2015
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERLED_LOWER=y
 CONFIG_USERLED=y
diff --git a/configs/indium-f7/f767-nsh/defconfig b/configs/indium-f7/f767-nsh/defconfig
index bf4fd08648e..4aea913d34d 100644
--- a/configs/indium-f7/f767-nsh/defconfig
+++ b/configs/indium-f7/f767-nsh/defconfig
@@ -1,10 +1,8 @@
 # CONFIG_ARCH_FPU is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_ARCH_BOARD_NUCLEO_144=y
 CONFIG_ARCH_BOARD_INDIUM_F7=y
 CONFIG_ARCH_BOARD="indium-f7"
-CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_CHIP_STM32F767ZI=y
 CONFIG_ARCH_STACKDUMP=y
@@ -47,6 +45,5 @@ CONFIG_START_YEAR=2015
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_USART6_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/indium-f7/src/indium-f7.h b/configs/indium-f7/src/indium-f7.h
index 6244f13aa12..552e240aa39 100644
--- a/configs/indium-f7/src/indium-f7.h
+++ b/configs/indium-f7/src/indium-f7.h
@@ -85,6 +85,7 @@
  */
 
 /* GPIO_LED_RED is defined above in the Oscillator section. */
+
 #define GPIO_LED_GREEN (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | GPIO_OUTPUT_INIT_TO_0 | \
                         GPIO_PORTC | GPIO_PIN1)
 #define GPIO_LED_BLUE  (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | GPIO_OUTPUT_INIT_TO_0 | \