diff --git a/configs/nucleo-l496zg/Kconfig b/configs/nucleo-l496zg/Kconfig
index af61775c0b..713c28241c 100644
--- a/configs/nucleo-l496zg/Kconfig
+++ b/configs/nucleo-l496zg/Kconfig
@@ -3,221 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_BOARD_NUCLEO_144
+if ARCH_BOARD_NUCLEO_L496ZG
 
-choice
-	prompt "Select Console wiring."
-	default NUCLEO_ARDUINO
-	---help---
-		Select where you will connect the console.
-
-		Virtual COM Port:
-
-		Advantage: Use the ST-Link as a console. No Extra wiring
-		neded.
-
-		Disdvantage: Not the best choice for initial bring up.
-
-		ARDUINO Connector:
-
-		Advantage: You have a shield so it is
-		easy.
-
-		Disdvantage: You loose the use of the
-		other functions on PC6, PC7
-
-				STM32F7
-			ARDUIONO FUNCTION  GPIO
-			-- ----- --------- ----
-			DO RX    USART6_RX PG9
-			D1 TX    USART6_TX PG14
-			-- ----- --------- ---
-
-					OR
-
-		Morpho Connector:
-
-				STM32F7
-			MORPHO   FUNCTION  GPIO
-			-------- --------- -----
-			CN12-64  USART8_RX PE0
-			CN11-61  USART8_TX PE1
-			-------- --------- -----
-
-config NUCLEO_CONSOLE_ARDUINO
-	bool "ARDUINO Connector"
-	select STM32F7_USART6
-	select USART6_SERIALDRIVER
-	select USART6_SERIAL_CONSOLE
-
-config NUCLEO_CONSOLE_VIRTUAL
-	bool "Virtual Comport"
-	select STM32F7_USART3
-	select USART3_SERIALDRIVER
-	select USART3_SERIAL_CONSOLE
-
-config NUCLEO_CONSOLE_MORPHO
-	bool "Morpho Connector"
-	select STM32F7_UART8
-	select UART8_SERIALDRIVER
-	select UART8_SERIAL_CONSOLE
-
-config NUCLEO_CONSOLE_NONE
-	bool "No Console"
-
-endchoice # "Select Console wiring"
-
-config NUCLEO_SPI_TEST
-	bool "Enable SPI test"
-	default n
-	---help---
-		Enable Spi test - initalize and configure SPI to send
-		NUCLEO_SPI_TEST_MESSAGE text. The text is sent on the
-		selected SPI Buses with the configured parameters.
-		Note the CS lines will not be asserted.
-
-if NUCLEO_SPI_TEST
-
-config NUCLEO_SPI_TEST_MESSAGE
-	string "Text to Send on SPI Bus(es)"
-	default "Hello World"
-	depends on NUCLEO_SPI_TEST
-	---help---
-		Text to sent on SPI bus(es)
-
-config NUCLEO_SPI1_TEST
-	bool "Test SPI bus 1"
-	default n
-	depends on NUCLEO_SPI_TEST
-	---help---
-		Enable Spi test - on SPI BUS 1
-
-if NUCLEO_SPI1_TEST
-
-config NUCLEO_SPI1_TEST_FREQ
-	int "SPI 1 Clock Freq in Hz"
-	default 1000000
-	depends on NUCLEO_SPI1_TEST
-	---help---
-		Sets SPI 1 Clock Freq
-
-config NUCLEO_SPI1_TEST_BITS
-	int "SPI 1 number of bits"
-	default 8
-	depends on NUCLEO_SPI1_TEST
-	---help---
-		Sets SPI 1 bit length
-
-choice
-	prompt "SPI BUS 1 Clock Mode"
-	default NUCLEO_SPI1_TEST_MODE3
-	---help---
-		Sets SPI 1 clock mode
-
-config NUCLEO_SPI1_TEST_MODE0
-	bool "CPOL=0 CHPHA=0"
-
-config NUCLEO_SPI1_TEST_MODE1
-	bool "CPOL=0 CHPHA=1"
-
-config NUCLEO_SPI1_TEST_MODE2
-	bool "CPOL=1 CHPHA=0"
-
-config NUCLEO_SPI1_TEST_MODE3
-	bool "CPOL=1 CHPHA=1"
-
-endchoice # "SPI BUS 1 Clock Mode"
-
-endif # NUCLEO_SPI1_TEST
-
-config NUCLEO_SPI2_TEST
-	bool "Test SPI bus 2"
-	default n
-	depends on NUCLEO_SPI_TEST
-	---help---
-		Enable Spi test - on SPI BUS 2
-
-if NUCLEO_SPI2_TEST
-
-config NUCLEO_SPI2_TEST_FREQ
-	int "SPI 2 Clock Freq in Hz"
-	default 12000000
-	depends on NUCLEO_SPI2_TEST
-	---help---
-		Sets SPI 2 Clock Freq
-
-config NUCLEO_SPI2_TEST_BITS
-	int "SPI 2 number of bits"
-	default 8
-	depends on NUCLEO_SPI2_TEST
-	---help---
-		Sets SPI 2 bit length
-
-choice
-	prompt "SPI BUS 2 Clock Mode"
-	default NUCLEO_SPI2_TEST_MODE3
-	---help---
-		Sets SPI 2 clock mode
-
-config NUCLEO_SPI2_TEST_MODE0
-	bool "CPOL=0 CHPHA=0"
-
-config NUCLEO_SPI2_TEST_MODE1
-	bool "CPOL=0 CHPHA=1"
-
-config NUCLEO_SPI2_TEST_MODE2
-	bool "CPOL=1 CHPHA=0"
-
-config NUCLEO_SPI2_TEST_MODE3
-	bool "CPOL=1 CHPHA=1"
-
-endchoice # "SPI BUS 2 Clock Mode"
-
-endif # NUCLEO_SPI2_TEST
-
-config NUCLEO_SPI3_TEST
-	bool "Test SPI bus 3"
-	default n
-	depends on NUCLEO_SPI_TEST
-	---help---
-		Enable Spi test - on SPI BUS 3
-
-if NUCLEO_SPI3_TEST
-
-config NUCLEO_SPI3_TEST_FREQ
-	int "SPI 3 Clock Freq in Hz"
-	default 40000000
-	depends on NUCLEO_SPI3_TEST
-	---help---
-		Sets SPI 3 Clock Freq
-
-config NUCLEO_SPI3_TEST_BITS
-	int "SPI 3 number of bits"
-	default 8
-	depends on NUCLEO_SPI3_TEST
-	---help---
-		Sets SPI 3 bit length
-
-choice
-	prompt "SPI BUS 3 Clock Mode"
-	default NUCLEO_SPI3_TEST_MODE3
-	---help---
-		Sets SPI 3 clock mode
-
-config NUCLEO_SPI3_TEST_MODE0
-	bool "CPOL=0 CHPHA=0"
-
-config NUCLEO_SPI3_TEST_MODE1
-	bool "CPOL=0 CHPHA=1"
-
-config NUCLEO_SPI3_TEST_MODE2
-	bool "CPOL=1 CHPHA=0"
-
-config NUCLEO_SPI3_TEST_MODE3
-	bool "CPOL=1 CHPHA=1"
-
-endchoice # "SPI BUS 3 Clock Mode"
-
-endif # NUCLEO_SPI3_TEST
-endif # NUCLEO_SPI_TEST
-endif # ARCH_BOARD_NUCLEO_144
+endif # ARCH_BOARD_NUCLEO_L496ZG