Change in ...coreboot[master]: soc/intel/cannonlake: Remove SOC_INTEL_CANNONLAKE_MEMCFG_INIT Kconfig

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31134 )

Change subject: soc/intel/cannonlake: Remove SOC_INTEL_CANNONLAKE_MEMCFG_INIT Kconfig
......................................................................

soc/intel/cannonlake: Remove SOC_INTEL_CANNONLAKE_MEMCFG_INIT Kconfig

This patch removes duplicate selects of same SOC_INTEL_CANNONLAKE_MEMCFG_INIT
from various CFL/WHL SoC based boards to include cnl_memcfg_init.c file
and include the cnl_memcfg_init.c file by default in CNL SoC Makefile.inc.

Change-Id: Ib21ea305871dc859e7db0720c18a9479100346c3
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/31134
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/sarien/Kconfig
M src/mainboard/intel/coffeelake_rvp/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/cannonlake/Makefile.inc
5 files changed, 1 insertion(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index d3ad1a0..6a37325 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -13,7 +13,6 @@
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_SPI_TPM_CR50
    select MAINBOARD_HAS_TPM2
-	select SOC_INTEL_CANNONLAKE_MEMCFG_INIT
    select SOC_INTEL_COFFEELAKE
    select SYSTEM_TYPE_LAPTOP

diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 67f879f..c6a9988 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -15,7 +15,6 @@
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_I2C_TPM_CR50
    select MAINBOARD_HAS_TPM2
-	select SOC_INTEL_CANNONLAKE_MEMCFG_INIT
    select SOC_INTEL_COMMON_ACPI_EC_PTS_WAK
    select SOC_INTEL_COFFEELAKE
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index b208e9b..1019805 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -13,7 +13,6 @@
    select DRIVERS_I2C_HID
    select DRIVERS_I2C_GENERIC
    select SOC_INTEL_COFFEELAKE
-	select SOC_INTEL_CANNONLAKE_MEMCFG_INIT
    select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_WHISKEYLAKE_RVP
    select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index f8193cd..0a1cff0 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -170,10 +170,6 @@
    int
    default 100

-config SOC_INTEL_CANNONLAKE_MEMCFG_INIT
-	bool
-	default n
-
 config SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ
    int
    default 120
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc
index b2ba0fd..d1fc141 100644
--- a/src/soc/intel/cannonlake/Makefile.inc
+++ b/src/soc/intel/cannonlake/Makefile.inc
@@ -21,7 +21,7 @@
 bootblock-y += p2sb.c
 bootblock-y += uart.c

-romstage-$(CONFIG_SOC_INTEL_CANNONLAKE_MEMCFG_INIT) += cnl_memcfg_init.c
+romstage-y += cnl_memcfg_init.c
 romstage-y += gspi.c
 romstage-y += i2c.c
 romstage-y += lpc.c