[coreboot-gerrit] Change in ...coreboot[master]: mb/intel/coffeelake_rvp: Add cml_u board support

[Subrata Banik (Code Review)]

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

Change subject: mb/intel/coffeelake_rvp: Add cml_u board support
......................................................................

mb/intel/coffeelake_rvp: Add cml_u board support

This patch adds support to select CMLRVP board.

Change-Id: I5f81b47f33345edefa0a7064559d9531e1d20eff
Signed-off-by: Subrata Banik 
Signed-off-by: Maulik V Vaghela 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31283
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/intel/coffeelake_rvp/Kconfig
M src/mainboard/intel/coffeelake_rvp/Kconfig.name
M src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
3 files changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index d2d4b81..185d756 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8
+if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_COMETLAKE_RVP

config BOARD_SPECIFIC_OPTIONS
    def_bool y
@@ -13,8 +13,8 @@
    select DRIVERS_I2C_HID
    select DRIVERS_I2C_GENERIC
    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
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if !BOARD_INTEL_COFFEELAKE_RVPU
+	select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVP
    select MAINBOARD_USES_IFD_EC_REGION
    select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8

@@ -28,10 +28,12 @@
    default "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11
    default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP
    default "cfl_s" if BOARD_INTEL_COFFEELAKE_RVP8
+	default "cml_u" if BOARD_INTEL_COMETLAKE_RVP

config MAINBOARD_PART_NUMBER
    string
    default "whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
+	default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVP
    default "cflrvp"

config MAINBOARD_VENDOR
@@ -41,6 +43,7 @@
 config MAINBOARD_FAMILY
    string
    default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
+	default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVP
    default "Intel_cflrvp"

config CHROMEOS
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index 70652ef..35c0f0f 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -12,3 +12,6 @@
 config BOARD_INTEL_COFFEELAKE_RVP8
    bool "-> Coffeelake S U-DIMM DDR4 RVP8"
    select SOC_INTEL_COFFEELAKE
+config BOARD_INTEL_COMETLAKE_RVP
+	bool "-> Cometlake U DDR4 RVP"
+	select SOC_INTEL_COMETLAKE
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
index b0091bd..e345146 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
@@ -264,7 +264,8 @@
    /* H21 : GPPC_H_21 */
    /* H22 : GPPC_H_22 */
    PAD_CFG_GPI(GPP_H22, NONE, DEEP),
-#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP)
+#if IS_ENABLED(CONFIG_BOARD_INTEL_WHISKEYLAKE_RVP) || \
+		IS_ENABLED(CONFIG_BOARD_INTEL_COMETLAKE_RVP)
    PAD_CFG_GPO(GPP_H22, 1, PLTRST),
 #else
    PAD_CFG_GPI(GPP_H22, NONE, DEEP),