GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Gaggery Tsai 2019-11-10 22:44:46 -08:00 committed by Patrick Georgi
parent fdcc9ab317
commit cc3e2a031a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mainboard/intel/coffeelake_rvp/Kconfig
View File

@ -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 config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8 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_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_EC_REGION
select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8 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 "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11
default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP
default "cfl_s" if BOARD_INTEL_COFFEELAKE_RVP8 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 config MAINBOARD_PART_NUMBER
string string
default "whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP default "whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVP default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVPU
default "cflrvp" default "cflrvp"
config MAINBOARD_FAMILY config MAINBOARD_FAMILY
string string
default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP 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" default "Intel_cflrvp"
config CHROMEOS config CHROMEOS

2
src/mainboard/intel/coffeelake_rvp/Kconfig.name
View File

@ -12,6 +12,6 @@ config BOARD_INTEL_WHISKEYLAKE_RVP
config BOARD_INTEL_COFFEELAKE_RVP8 config BOARD_INTEL_COFFEELAKE_RVP8
bool "-> Coffeelake S U-DIMM DDR4 RVP8" bool "-> Coffeelake S U-DIMM DDR4 RVP8"
select SOC_INTEL_COFFEELAKE select SOC_INTEL_COFFEELAKE
config BOARD_INTEL_COMETLAKE_RVP config BOARD_INTEL_COMETLAKE_RVPU
bool "-> Cometlake U DDR4 RVP" bool "-> Cometlake U DDR4 RVP"
select SOC_INTEL_COMETLAKE select SOC_INTEL_COMETLAKE

2
src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
View File

@ -264,7 +264,7 @@ static const struct pad_config gpio_table[] = {
/* H21 : GPPC_H_21 */ /* H21 : GPPC_H_21 */
/* H22 : GPPC_H_22 */ /* H22 : GPPC_H_22 */
PAD_CFG_GPI(GPP_H22, NONE, DEEP), 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), PAD_CFG_GPO(GPP_H22, 1, PLTRST),
#else #else
PAD_CFG_GPI(GPP_H22, NONE, DEEP), PAD_CFG_GPI(GPP_H22, NONE, DEEP),