diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 599e64ab83..0913c15458 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -70,7 +70,7 @@ config MANDOLIN_MCHP_FW_FILE
 	default "3rdparty/blobs/mainboard/amd/mandolin/EC_mandolin.bin" if BOARD_AMD_MANDOLIN
 
 if !AMD_LPC_DEBUG_CARD
-choice MANDOLIN_LPC_IOMUX
+choice
 	prompt "State of IOMux for LPC/eMMC signals"
 	default MANDOLIN_IOMUX_USE_EMMC
 	help
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index 428ea84cfe..cbbeb47ef8 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -28,7 +28,7 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Padmelon"
 
-choice PADMELON_SOC
+choice
 	prompt "SOC used in padmelon board"
 	default PADMELON_MERLIN_FALCON
 
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 3bdaad22c0..aaabf435c0 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -271,7 +271,7 @@ config PICASSO_CONSOLE_UART
 	  2: 0xfedc3000
 	  3: 0xfedcf000
 
-choice PICASSO_UART_CLOCK_SOURCE
+choice
 	prompt "UART Frequency"
 	depends on PICASSO_CONSOLE_UART
 	default PICASSO_UART_48MZ