sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

superio/nuvoton: Factor out equivalent Kconfig option

Browse Source 
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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46522
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons
2020-10-17 15:06:40 +02:00
committed by Patrick Georgi
parent 9357ac3860
commit 00e58c35c6
11 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/asrock/h110m/Kconfig
View File

@@ -11,8 +11,8 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_INT15 select INTEL_INT15
select SOC_INTEL_KABYLAKE select SOC_INTEL_KABYLAKE
select SKYLAKE_SOC_PCH_H select SKYLAKE_SOC_PCH_H
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6791D select SUPERIO_NUVOTON_NCT6791D
select SUPERIO_NUVOTON_NCT6791D_COM_A
select REALTEK_8168_RESET select REALTEK_8168_RESET
select RT8168_SET_LED_MODE select RT8168_SET_LED_MODE
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM

2
src/mainboard/asrock/h81m-hds/Kconfig
View File

@@ -17,8 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
select RT8168_SET_LED_MODE select RT8168_SET_LED_MODE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_LYNXPOINT select SOUTHBRIDGE_INTEL_LYNXPOINT
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6776 select SUPERIO_NUVOTON_NCT6776
select SUPERIO_NUVOTON_NCT6776_COM_A
config CBFS_SIZE config CBFS_SIZE
hex hex

2
src/mainboard/asus/p8h61-m_lx/Kconfig
View File

@@ -17,8 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
select RT8168_SET_LED_MODE select RT8168_SET_LED_MODE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_BD82X6X select SOUTHBRIDGE_INTEL_BD82X6X
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6776 select SUPERIO_NUVOTON_NCT6776
select SUPERIO_NUVOTON_NCT6776_COM_A
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
config MAINBOARD_DIR config MAINBOARD_DIR

2
src/mainboard/intel/saddlebrook/Kconfig
View File

@@ -11,8 +11,8 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select SKYLAKE_SOC_PCH_H select SKYLAKE_SOC_PCH_H
select SOC_INTEL_SKYLAKE select SOC_INTEL_SKYLAKE
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6776 select SUPERIO_NUVOTON_NCT6776
select SUPERIO_NUVOTON_NCT6776_COM_A
select HAVE_CMOS_DEFAULT select HAVE_CMOS_DEFAULT
select MAINBOARD_USES_IFD_GBE_REGION select MAINBOARD_USES_IFD_GBE_REGION

2
src/mainboard/supermicro/x10slm-f/Kconfig
View File

@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS
select NORTHBRIDGE_INTEL_HASWELL select NORTHBRIDGE_INTEL_HASWELL
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_LYNXPOINT select SOUTHBRIDGE_INTEL_LYNXPOINT
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6776 select SUPERIO_NUVOTON_NCT6776
select SUPERIO_NUVOTON_NCT6776_COM_A
config CBFS_SIZE config CBFS_SIZE
hex hex

2
src/mainboard/supermicro/x9scl/Kconfig
View File

@@ -9,8 +9,8 @@ config BOARD_SPECIFIC_OPTIONS
select RAMINIT_ENABLE_ECC select RAMINIT_ENABLE_ECC
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_BD82X6X select SOUTHBRIDGE_INTEL_BD82X6X
select SUPERIO_NUVOTON_COMMON_COM_A
select SUPERIO_NUVOTON_NCT6776 select SUPERIO_NUVOTON_NCT6776
select SUPERIO_NUVOTON_NCT6776_COM_A
select SUPERIO_NUVOTON_WPCM450 select SUPERIO_NUVOTON_WPCM450
select MAINBOARD_USES_IFD_GBE_REGION select MAINBOARD_USES_IFD_GBE_REGION
select IPMI_KCS select IPMI_KCS

7
src/superio/nuvoton/common/Kconfig
View File

@@ -5,6 +5,13 @@
config SUPERIO_NUVOTON_COMMON_PRE_RAM config SUPERIO_NUVOTON_COMMON_PRE_RAM
bool 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 # Generic Nuvoton HWM driver
config SUPERIO_NUVOTON_COMMON_HWM config SUPERIO_NUVOTON_COMMON_HWM
bool bool

4
src/superio/nuvoton/common/early_serial.c
View File

@@ -52,9 +52,7 @@ void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase)
nuvoton_pnp_enter_conf_state(dev); nuvoton_pnp_enter_conf_state(dev);
if (CONFIG(SUPERIO_NUVOTON_NCT5539D_COM_A) || if (CONFIG(SUPERIO_NUVOTON_COMMON_COM_A))
CONFIG(SUPERIO_NUVOTON_NCT6791D_COM_A) ||
CONFIG(SUPERIO_NUVOTON_NCT6776_COM_A))
/* Route COM A to GPIO8 pin group */ /* Route COM A to GPIO8 pin group */
pnp_unset_and_set_config(dev, 0x2a, 1 << 7, 0); pnp_unset_and_set_config(dev, 0x2a, 1 << 7, 0);

5
src/superio/nuvoton/nct5539d/Kconfig
View File

@@ -3,8 +3,3 @@
config SUPERIO_NUVOTON_NCT5539D config SUPERIO_NUVOTON_NCT5539D
bool bool
select SUPERIO_NUVOTON_COMMON_PRE_RAM select SUPERIO_NUVOTON_COMMON_PRE_RAM
config SUPERIO_NUVOTON_NCT5539D_COM_A
bool
depends on SUPERIO_NUVOTON_NCT5539D
default n

5
src/superio/nuvoton/nct6776/Kconfig
View File

@@ -3,8 +3,3 @@
config SUPERIO_NUVOTON_NCT6776 config SUPERIO_NUVOTON_NCT6776
bool bool
select SUPERIO_NUVOTON_COMMON_PRE_RAM select SUPERIO_NUVOTON_COMMON_PRE_RAM
config SUPERIO_NUVOTON_NCT6776_COM_A
bool
depends on SUPERIO_NUVOTON_NCT6776
default n

5
src/superio/nuvoton/nct6791d/Kconfig
View File

@@ -3,8 +3,3 @@
config SUPERIO_NUVOTON_NCT6791D config SUPERIO_NUVOTON_NCT6791D
bool bool
select SUPERIO_NUVOTON_COMMON_PRE_RAM select SUPERIO_NUVOTON_COMMON_PRE_RAM
config SUPERIO_NUVOTON_NCT6791D_COM_A
bool
depends on SUPERIO_NUVOTON_NCT6791D
default n