Angel Pons has uploaded this change for review.
superio/nuvoton: Factor out equivalent Kconfig option
There's no need to have multiple Kconfig symbols which do the same
thing. Introduce `SUPERIO_NUVOTON_COMMON_COM_A` and update boards to use
the new symbol. To preserve alphabetical order in mainboard Kconfig,
place the new symbol above the Super I/O symbol (instead of below).
Change-Id: Ic0a30b3177a1a535261525638be301ae07c59c14
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/mainboard/asrock/h110m/Kconfig
M src/mainboard/asrock/h81m-hds/Kconfig
M src/mainboard/asus/p8h61-m_lx/Kconfig
M src/mainboard/intel/saddlebrook/Kconfig
M src/mainboard/supermicro/x10slm-f/Kconfig
M src/mainboard/supermicro/x9scl/Kconfig
M src/superio/nuvoton/common/Kconfig
M src/superio/nuvoton/common/early_serial.c
M src/superio/nuvoton/nct5539d/Kconfig
M src/superio/nuvoton/nct6776/Kconfig
M src/superio/nuvoton/nct6791d/Kconfig
11 files changed, 14 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/46522/1
diff --git a/src/mainboard/asrock/h110m/Kconfig b/src/mainboard/asrock/h110m/Kconfig
index a80b595..d923c30 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -11,8 +11,8 @@
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 6406417..af723a3 100644
--- a/src/mainboard/asrock/h81m-hds/Kconfig
+++ b/src/mainboard/asrock/h81m-hds/Kconfig
@@ -17,8 +17,8 @@
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 069800a..a108c3b 100644
--- a/src/mainboard/asus/p8h61-m_lx/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx/Kconfig
@@ -17,8 +17,8 @@
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 f81dbee..873f257 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -11,8 +11,8 @@
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 598fbbe..5e09349 100644
--- a/src/mainboard/supermicro/x10slm-f/Kconfig
+++ b/src/mainboard/supermicro/x10slm-f/Kconfig
@@ -13,8 +13,8 @@
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 9968d34..6261726 100644
--- a/src/mainboard/supermicro/x9scl/Kconfig
+++ b/src/mainboard/supermicro/x9scl/Kconfig
@@ -9,8 +9,8 @@
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 413b6a6..78523c1 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 3986789..f86e7a2 100644
--- a/src/superio/nuvoton/common/early_serial.c
+++ b/src/superio/nuvoton/common/early_serial.c
@@ -52,9 +52,7 @@
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 440775f..dc48246 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 caa89b3..9f5e084 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 b06ee31..a536491 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
To view, visit change 46522. To unsubscribe, or for help writing mail filters, visit settings.