diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index ab24213375..0cc55c9c03 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select GFXUMA
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select MAINBOARD_HAS_CHROMEOS
-	select PICASSO_UART
+	select PICASSO_CONSOLE_UART
 	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_ASPM
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index e23cfd8f87..dd5731df05 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -254,8 +254,8 @@ config PICASSO_ACPI_IO_BASE
 	help
 	  Base address for the ACPI registers.
 
-config PICASSO_UART
-	bool "UART controller on Picasso"
+config PICASSO_CONSOLE_UART
+	bool "Use Picasso UART controller for console"
 	default n
 	select DRIVERS_UART_8250MEM
 	select DRIVERS_UART_8250MEM_32
@@ -270,7 +270,7 @@ config PICASSO_UART
 
 choice PICASSO_UART_CLOCK_SOURCE
 	prompt "UART Frequency"
-	depends on PICASSO_UART
+	depends on PICASSO_CONSOLE_UART
 	default PICASSO_UART_48MZ
 
 config PICASSO_UART_48MZ
@@ -288,7 +288,7 @@ endchoice
 
 config PICASSO_UART_LEGACY
 	bool "Decode legacy I/O range"
-	depends on PICASSO_UART
+	depends on PICASSO_CONSOLE_UART # TODO: shouldn't depend on this
 	help
 	  Assign I/O 3F8, 2F8, etc. to a Picasso UART.  Only a single UART may
 	  decode legacy addresses and this option enables the one used for the
@@ -296,7 +296,7 @@ config PICASSO_UART_LEGACY
 	  of MMIO.  The MMIO decode is still present when this option is used.
 
 config CONSOLE_UART_BASE_ADDRESS
-	depends on CONSOLE_SERIAL && PICASSO_UART
+	depends on CONSOLE_SERIAL && PICASSO_CONSOLE_UART
 	hex
 	default 0xfedc9000 if UART_FOR_CONSOLE = 0
 	default 0xfedca000 if UART_FOR_CONSOLE = 1
diff --git a/src/soc/amd/picasso/aoac.c b/src/soc/amd/picasso/aoac.c
index 2bf99845c9..f31afbf808 100644
--- a/src/soc/amd/picasso/aoac.c
+++ b/src/soc/amd/picasso/aoac.c
@@ -76,13 +76,13 @@ void enable_aoac_devices(void)
 	for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
 		power_on_aoac_device(aoac_devs[i]);
 
-	if (CONFIG(PICASSO_UART))
+	if (CONFIG(PICASSO_CONSOLE_UART))
 		power_on_aoac_device(FCH_AOAC_UART_FOR_CONSOLE);
 
 	/* Wait for AOAC devices to indicate power and clock OK */
 	for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
 		wait_for_aoac_enabled(aoac_devs[i]);
 
-	if (CONFIG(PICASSO_UART))
+	if (CONFIG(PICASSO_CONSOLE_UART))
 		wait_for_aoac_enabled(FCH_AOAC_UART_FOR_CONSOLE);
 }
diff --git a/src/soc/amd/picasso/southbridge.c b/src/soc/amd/picasso/southbridge.c
index 54128abe5d..0ff56066e4 100644
--- a/src/soc/amd/picasso/southbridge.c
+++ b/src/soc/amd/picasso/southbridge.c
@@ -152,7 +152,7 @@ void fch_pre_init(void)
 	 */
 	clear_uart_legacy_config();
 
-	if (CONFIG(PICASSO_UART))
+	if (CONFIG(PICASSO_CONSOLE_UART))
 		set_uart_config(CONFIG_UART_FOR_CONSOLE);
 }
 
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index f523bce162..0d97fd701e 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -31,14 +31,14 @@ static const struct _uart_info {
 };
 
 /*
- * Don't provide uart_platform_base and uart_platform_refclk functions if PICASSO_UART
+ * Don't provide uart_platform_base and uart_platform_refclk functions if PICASSO_CONSOLE_UART
  * isn't selected. Those two functions are used by the console UART driver and need to be
  * provided exactly once and only by the UART that is used for console.
  *
  * TODO: Replace the #if block by factoring out the two functions into a different compilation
  *       unit.
  */
-#if CONFIG(PICASSO_UART)
+#if CONFIG(PICASSO_CONSOLE_UART)
 
 uintptr_t uart_platform_base(int idx)
 {
@@ -53,7 +53,7 @@ unsigned int uart_platform_refclk(void)
 	return CONFIG(PICASSO_UART_48MZ) ? 48000000 : 115200 * 16;
 }
 
-#endif /* PICASSO_UART */
+#endif /* PICASSO_CONSOLE_UART */
 
 void clear_uart_legacy_config(void)
 {