Kevin Cody-Little has uploaded this change for review.

View Change

Move "select SOC_INTLE_COMMON_BLOCK_GPIO_LEGACY_MACROS" from
src/soc/intel/skylake/Kconfig to individual Skylake and Kaby Lake
mainboard Kconfig's, to allow de-legacying on a per-board basis.

Change-Id: Idc756f65b1377d3f31507ff25424e8c898ae6f59
Signed-off-by: Kevin Cody <kcodyjr@gmail.com>
---
M src/mainboard/asrock/h110m/Kconfig
M src/mainboard/facebook/monolith/Kconfig
M src/mainboard/google/eve/Kconfig
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/glados/Kconfig
M src/mainboard/google/poppy/Kconfig
M src/mainboard/intel/kblrvp/Kconfig
M src/mainboard/intel/kunimitsu/Kconfig
M src/mainboard/intel/saddlebrook/Kconfig
M src/mainboard/purism/librem_skl/Kconfig
M src/mainboard/razer/blade_stealth_kbl/Kconfig
M src/mainboard/supermicro/x11-lga1151-series/Kconfig
M src/soc/intel/skylake/Kconfig
13 files changed, 12 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/38207/1
diff --git a/src/mainboard/asrock/h110m/Kconfig b/src/mainboard/asrock/h110m/Kconfig
index eebce57..165c440 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -16,6 +16,7 @@
select SUPERIO_NUVOTON_NCT6791D_COM_A
select REALTEK_8168_RESET
select RT8168_SET_LED_MODE
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/facebook/monolith/Kconfig b/src/mainboard/facebook/monolith/Kconfig
index 3261661..2dabb2b 100644
--- a/src/mainboard/facebook/monolith/Kconfig
+++ b/src/mainboard/facebook/monolith/Kconfig
@@ -11,6 +11,7 @@
select MAINBOARD_HAS_TPM2
select MAINBOARD_USES_IFD_GBE_REGION
select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config CBFS_SIZE
hex "CBFS_SIZE"
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index dcc5b38..34a0368 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -22,6 +22,7 @@
select MAINBOARD_HAS_TPM2
select SOC_INTEL_KABYLAKE
select SYSTEM_TYPE_CONVERTIBLE
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index cafb855..9abf2bc 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -26,6 +26,7 @@
select RT8168_GET_MAC_FROM_VPD
select RT8168_SET_LED_MODE
select SPD_READ_BY_WORD
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

if BOARD_GOOGLE_BASEBOARD_FIZZ

diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index bc0c67b..e8f3e3e 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -21,6 +21,7 @@
select SYSTEM_TYPE_LAPTOP
select MAINBOARD_HAS_LIBGFXINIT
select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

if BOARD_GOOGLE_BASEBOARD_GLADOS

diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 5a621bb..b2f28fa 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -15,6 +15,7 @@
select MAINBOARD_HAS_CHROMEOS
select SOC_INTEL_KABYLAKE
select MAINBOARD_HAS_TPM2
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

if BOARD_GOOGLE_BASEBOARD_POPPY

diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index afc510f..cd5f8a2 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -16,6 +16,7 @@
select MAINBOARD_HAS_LPC_TPM
select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_KBLRVP8
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config VBOOT
select VBOOT_LID_SWITCH
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index d7706d1..6bad7c8 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -19,6 +19,7 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select SOC_INTEL_SKYLAKE
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig
index 315104e..f985cde 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -30,6 +30,7 @@
select SUPERIO_NUVOTON_NCT6776_COM_A
select HAVE_CMOS_DEFAULT
select MAINBOARD_USES_IFD_GBE_REGION
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index ca1582a..cfef895 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -11,6 +11,7 @@
select SPD_READ_BY_WORD
select MAINBOARD_HAS_LIBGFXINIT
select MAINBOARD_HAS_LPC_TPM
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

if BOARD_PURISM_BASEBOARD_LIBREM_SKL

diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig
index 903d7ba..4aa6669 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Kconfig
+++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig
@@ -16,6 +16,7 @@
select HAVE_ACPI_TABLES
select ADD_FSP_BINARIES
select FSP_USE_REPO
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

# For now no way to choose the correct the available RAM
config BOARD_RAZER_BLADE_STEALTH_KBL_16GB
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index 5a99f7a..27b4e44 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -15,6 +15,7 @@
select MAINBOARD_NO_FSP_GOP
select SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND
select NO_FADT_8042
+ select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS

if BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index d90fb6b..ab944b6 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -57,7 +57,6 @@
select SOC_INTEL_COMMON_BLOCK_CPU
select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT
select SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT
- select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS
select SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL
select SOC_INTEL_COMMON_BLOCK_GSPI
select SOC_INTEL_COMMON_BLOCK_HDA

To view, visit change 38207. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Idc756f65b1377d3f31507ff25424e8c898ae6f59
Gerrit-Change-Number: 38207
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Cody-Little <kcodyjr@gmail.com>
Gerrit-MessageType: newchange