11 files changed, 14 insertions, 24 deletions
diff --git a/src/mainboard/asrock/h110m/Kconfig b/src/mainboard/asrock/h110m/Kconfig
index a80b5954df..d923c30d3c 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -11,8 +11,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select SOC_INTEL_KABYLAKE
 	select SKYLAKE_SOC_PCH_H
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6791D
-	select SUPERIO_NUVOTON_NCT6791D_COM_A
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
 	select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/asrock/h81m-hds/Kconfig b/src/mainboard/asrock/h81m-hds/Kconfig
index 6406417ac0..af723a3e04 100644
--- a/src/mainboard/asrock/h81m-hds/Kconfig
+++ b/src/mainboard/asrock/h81m-hds/Kconfig
@@ -17,8 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select RT8168_SET_LED_MODE
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6776
-	select SUPERIO_NUVOTON_NCT6776_COM_A
 
 config CBFS_SIZE
 	hex
diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig
index 069800ade8..a108c3bc0c 100644
--- a/src/mainboard/asus/p8h61-m_lx/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx/Kconfig
@@ -17,8 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select RT8168_SET_LED_MODE
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6776
-	select SUPERIO_NUVOTON_NCT6776_COM_A
 	select USE_NATIVE_RAMINIT
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig
index f81dbee976..873f25727c 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -11,8 +11,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select SKYLAKE_SOC_PCH_H
 	select SOC_INTEL_SKYLAKE
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6776
-	select SUPERIO_NUVOTON_NCT6776_COM_A
 	select HAVE_CMOS_DEFAULT
 	select MAINBOARD_USES_IFD_GBE_REGION
 
diff --git a/src/mainboard/supermicro/x10slm-f/Kconfig b/src/mainboard/supermicro/x10slm-f/Kconfig
index 598fbbeb1a..5e09349d61 100644
--- a/src/mainboard/supermicro/x10slm-f/Kconfig
+++ b/src/mainboard/supermicro/x10slm-f/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6776
-	select SUPERIO_NUVOTON_NCT6776_COM_A
 
 config CBFS_SIZE
 	hex
diff --git a/src/mainboard/supermicro/x9scl/Kconfig b/src/mainboard/supermicro/x9scl/Kconfig
index 9968d34cb5..626172609d 100644
--- a/src/mainboard/supermicro/x9scl/Kconfig
+++ b/src/mainboard/supermicro/x9scl/Kconfig
@@ -9,8 +9,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select RAMINIT_ENABLE_ECC
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
+	select SUPERIO_NUVOTON_COMMON_COM_A
 	select SUPERIO_NUVOTON_NCT6776
-	select SUPERIO_NUVOTON_NCT6776_COM_A
 	select SUPERIO_NUVOTON_WPCM450
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select IPMI_KCS
diff --git a/src/superio/nuvoton/common/Kconfig b/src/superio/nuvoton/common/Kconfig
index 413b6a6882..78523c1b7e 100644
--- a/src/superio/nuvoton/common/Kconfig
+++ b/src/superio/nuvoton/common/Kconfig
@@ -5,6 +5,13 @@
 config SUPERIO_NUVOTON_COMMON_PRE_RAM
 	bool
 
+config SUPERIO_NUVOTON_COMMON_COM_A
+	bool
+	depends on SUPERIO_NUVOTON_COMMON_PRE_RAM
+	help
+	  When enabled, the 'nuvoton_enable_serial()' function will unset
+	  global CR 0x2a bit 7 to route COM A to the GPIO8 pin group.
+
 # Generic Nuvoton HWM driver
 config SUPERIO_NUVOTON_COMMON_HWM
 	bool
diff --git a/src/superio/nuvoton/common/early_serial.c b/src/superio/nuvoton/common/early_serial.c
index 398678983a..f86e7a27d0 100644
--- a/src/superio/nuvoton/common/early_serial.c
+++ b/src/superio/nuvoton/common/early_serial.c
@@ -52,9 +52,7 @@ void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase)
 
 	nuvoton_pnp_enter_conf_state(dev);
 
-	if (CONFIG(SUPERIO_NUVOTON_NCT5539D_COM_A) ||
-	    CONFIG(SUPERIO_NUVOTON_NCT6791D_COM_A) ||
-	    CONFIG(SUPERIO_NUVOTON_NCT6776_COM_A))
+	if (CONFIG(SUPERIO_NUVOTON_COMMON_COM_A))
 		/* Route COM A to GPIO8 pin group */
 		pnp_unset_and_set_config(dev, 0x2a, 1 << 7, 0);
 
diff --git a/src/superio/nuvoton/nct5539d/Kconfig b/src/superio/nuvoton/nct5539d/Kconfig
index 440775f13e..dc48246668 100644
--- a/src/superio/nuvoton/nct5539d/Kconfig
+++ b/src/superio/nuvoton/nct5539d/Kconfig
@@ -3,8 +3,3 @@
 config SUPERIO_NUVOTON_NCT5539D
 	bool
 	select SUPERIO_NUVOTON_COMMON_PRE_RAM
-
-config SUPERIO_NUVOTON_NCT5539D_COM_A
-	bool
-	depends on SUPERIO_NUVOTON_NCT5539D
-	default n
diff --git a/src/superio/nuvoton/nct6776/Kconfig b/src/superio/nuvoton/nct6776/Kconfig
index caa89b37fb..9f5e0843f5 100644
--- a/src/superio/nuvoton/nct6776/Kconfig
+++ b/src/superio/nuvoton/nct6776/Kconfig
@@ -3,8 +3,3 @@
 config SUPERIO_NUVOTON_NCT6776
 	bool
 	select SUPERIO_NUVOTON_COMMON_PRE_RAM
-
-config SUPERIO_NUVOTON_NCT6776_COM_A
-	bool
-	depends on SUPERIO_NUVOTON_NCT6776
-	default n
diff --git a/src/superio/nuvoton/nct6791d/Kconfig b/src/superio/nuvoton/nct6791d/Kconfig
index b06ee31a0f..a5364916c9 100644
--- a/src/superio/nuvoton/nct6791d/Kconfig
+++ b/src/superio/nuvoton/nct6791d/Kconfig
@@ -3,8 +3,3 @@
 config SUPERIO_NUVOTON_NCT6791D
 	bool
 	select SUPERIO_NUVOTON_COMMON_PRE_RAM
-
-config SUPERIO_NUVOTON_NCT6791D_COM_A
-	bool
-	depends on SUPERIO_NUVOTON_NCT6791D
-	default n