[coreboot-gerrit] Change in coreboot[master]: src/mb/intel/coffeelake_rvp: Rename COMETLAKE_RVP to COMETLAKE_RVPU

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36793 )

Change subject: src/mb/intel/coffeelake_rvp: Rename COMETLAKE_RVP to COMETLAKE_RVPU
......................................................................

src/mb/intel/coffeelake_rvp: Rename COMETLAKE_RVP to COMETLAKE_RVPU

This patch renames COMETLAKE_RVP to COMETLAKE_RVPU to avoid confusion.

TEST=build an image with COMETLAKE_RVPU

Change-Id: I93d7b5cc0be475926bb92503b66797dc67e607f5
Signed-off-by: Gaggery Tsai 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36793
Reviewed-by: Subrata Banik 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
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, 7 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 5ae567d..72906d7 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 || BOARD_INTEL_COMETLAKE_RVP
+if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_COMETLAKE_RVPU

config BOARD_SPECIFIC_OPTIONS
    def_bool y
@@ -13,7 +13,7 @@
    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_RVPU
-	select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVP
+	select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVPU
    select MAINBOARD_USES_IFD_EC_REGION
    select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8

@@ -27,18 +27,18 @@
    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
+	default "cml_u" if BOARD_INTEL_COMETLAKE_RVPU

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

config MAINBOARD_FAMILY
    string
    default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
-	default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVP
+	default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVPU
    default "Intel_cflrvp"

config CHROMEOS
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index 35c0f0f..519cd50 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -12,6 +12,6 @@
 config BOARD_INTEL_COFFEELAKE_RVP8
    bool "-> Coffeelake S U-DIMM DDR4 RVP8"
    select SOC_INTEL_COFFEELAKE
-config BOARD_INTEL_COMETLAKE_RVP
+config BOARD_INTEL_COMETLAKE_RVPU
    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 ec8f58b..709249e 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
@@ -264,7 +264,7 @@
    /* H21 : GPPC_H_21 */
    /* H22 : GPPC_H_22 */
    PAD_CFG_GPI(GPP_H22, NONE, DEEP),
-#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVP)
+#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVPU)
    PAD_CFG_GPO(GPP_H22, 1, PLTRST),
 #else
    PAD_CFG_GPI(GPP_H22, NONE, DEEP),