summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaggery Tsai <gaggery.tsai@intel.com>2019-11-10 22:44:46 -0800
committerPatrick Georgi <pgeorgi@google.com>2019-12-02 12:04:48 +0000
commitcc3e2a031aeb81809573bc9c69bf315868420b82 (patch)
treec5a33b515c5c7648f8deb5c002f2fcf318d0ba42
parentfdcc9ab317af2ae9cd69cb2490d3a4444180429a (diff)
downloadcoreboot-cc3e2a031aeb81809573bc9c69bf315868420b82.tar.xz
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 <gaggery.tsai@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36793 Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/intel/coffeelake_rvp/Kconfig10
-rw-r--r--src/mainboard/intel/coffeelake_rvp/Kconfig.name2
-rw-r--r--src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 5ae567d326..72906d7d3e 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 @@ config BOARD_SPECIFIC_OPTIONS
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 @@ config VARIANT_DIR
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 35c0f0ff4a..519cd50dc1 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -12,6 +12,6 @@ config BOARD_INTEL_WHISKEYLAKE_RVP
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 ec8f58ba16..709249e918 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 @@ static const struct pad_config gpio_table[] = {
/* 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),