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

Braswell: Modify CB to accomodate new FSPv83 

Latest FSPv83 made some change related to UPD/VPD
need this patch to align those

BUG=None
TEST=Build and Boot Cyan System
BRANCH=strago-7287.B
CQ-DEPEND=CL:*226897

Original-Change-Id: I6395f3a1f4eecaef14fc4720b00252f9e6143fa3
Original-Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/291394
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: Hannah Williams <hannah.williams@intel.com>
Original-Commit-Queue: Hannah Williams <hannah.williams@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/303137
Original-Commit-Ready: John Zhao <john.zhao@intel.com>
Original-Tested-by: John Zhao <john.zhao@intel.com>

Change-Id: I9920eea84b802699454850bfde489668201ffeb6
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11813
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Subrata Banik 2015-08-07 18:22:54 +05:30 committed by Aaron Durbin
parent 951f2d3ebb
commit 13cd3310a5
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/soc/intel/braswell/chip.c
View File

@ -96,7 +96,6 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->PcdEnableHsuart0 = config->PcdEnableHsuart0; params->PcdEnableHsuart0 = config->PcdEnableHsuart0;
params->PcdEnableHsuart1 = config->PcdEnableHsuart1; params->PcdEnableHsuart1 = config->PcdEnableHsuart1;
params->PcdEnableAzalia = config->PcdEnableAzalia; params->PcdEnableAzalia = config->PcdEnableAzalia;
params->AzaliaConfigPtr = config->AzaliaConfigPtr;
params->PcdEnableSata = config->PcdEnableSata; params->PcdEnableSata = config->PcdEnableSata;
params->PcdEnableXhci = config->PcdEnableXhci; params->PcdEnableXhci = config->PcdEnableXhci;
params->PcdEnableLpe = config->PcdEnableLpe; params->PcdEnableLpe = config->PcdEnableLpe;
@ -109,7 +108,8 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->PcdEnableI2C4 = config->PcdEnableI2C4; params->PcdEnableI2C4 = config->PcdEnableI2C4;
params->PcdEnableI2C5 = config->PcdEnableI2C5; params->PcdEnableI2C5 = config->PcdEnableI2C5;
params->PcdEnableI2C6 = config->PcdEnableI2C6; params->PcdEnableI2C6 = config->PcdEnableI2C6;
params->PcdGraphicsConfigPtr = config->PcdGraphicsConfigPtr; params->GraphicsConfigPtr = 0;
params->AzaliaConfigPtr = 0;
params->PunitPwrConfigDisable = config->PunitPwrConfigDisable; params->PunitPwrConfigDisable = config->PunitPwrConfigDisable;
params->ChvSvidConfig = config->ChvSvidConfig; params->ChvSvidConfig = config->ChvSvidConfig;
params->DptfDisable = config->DptfDisable; params->DptfDisable = config->DptfDisable;
@ -171,11 +171,9 @@ void soc_display_silicon_init_params(const SILICON_INIT_UPD *old,
new->PcdEnableHsuart1); new->PcdEnableHsuart1);
soc_display_upd_value("PcdEnableAzalia", 1, old->PcdEnableAzalia, soc_display_upd_value("PcdEnableAzalia", 1, old->PcdEnableAzalia,
new->PcdEnableAzalia); new->PcdEnableAzalia);
soc_display_upd_value("AzaliaVerbTablePtr", 4, soc_display_upd_value("AzaliaConfigPtr", 4,
(uint32_t)old->AzaliaVerbTablePtr, (uint32_t)old->AzaliaConfigPtr,
(uint32_t)new->AzaliaVerbTablePtr); (uint32_t)new->AzaliaConfigPtr);
soc_display_upd_value("AzaliaConfigPtr", 4, old->AzaliaConfigPtr,
new->AzaliaConfigPtr);
soc_display_upd_value("PcdEnableSata", 1, old->PcdEnableSata, soc_display_upd_value("PcdEnableSata", 1, old->PcdEnableSata,
new->PcdEnableSata); new->PcdEnableSata);
soc_display_upd_value("PcdEnableXhci", 1, old->PcdEnableXhci, soc_display_upd_value("PcdEnableXhci", 1, old->PcdEnableXhci,
@ -201,7 +199,7 @@ void soc_display_silicon_init_params(const SILICON_INIT_UPD *old,
soc_display_upd_value("PcdEnableI2C6", 1, old->PcdEnableI2C6, soc_display_upd_value("PcdEnableI2C6", 1, old->PcdEnableI2C6,
new->PcdEnableI2C6); new->PcdEnableI2C6);
soc_display_upd_value("PcdGraphicsConfigPtr", 4, soc_display_upd_value("PcdGraphicsConfigPtr", 4,
old->PcdGraphicsConfigPtr, new->PcdGraphicsConfigPtr); old->GraphicsConfigPtr, new->GraphicsConfigPtr);
soc_display_upd_value("GpioFamilyInitTablePtr", 4, soc_display_upd_value("GpioFamilyInitTablePtr", 4,
(uint32_t)old->GpioFamilyInitTablePtr, (uint32_t)old->GpioFamilyInitTablePtr,
(uint32_t)new->GpioFamilyInitTablePtr); (uint32_t)new->GpioFamilyInitTablePtr);

2
src/soc/intel/braswell/chip.h
View File

@ -85,7 +85,6 @@ struct soc_intel_braswell_config {
UINT8 PcdEnableHsuart0; UINT8 PcdEnableHsuart0;
UINT8 PcdEnableHsuart1; UINT8 PcdEnableHsuart1;
UINT8 PcdEnableAzalia; UINT8 PcdEnableAzalia;
UINT32 AzaliaConfigPtr;
UINT8 PcdEnableSata; UINT8 PcdEnableSata;
UINT8 PcdEnableXhci; UINT8 PcdEnableXhci;
UINT8 PcdEnableLpe; UINT8 PcdEnableLpe;
@ -98,7 +97,6 @@ struct soc_intel_braswell_config {
UINT8 PcdEnableI2C4; UINT8 PcdEnableI2C4;
UINT8 PcdEnableI2C5; UINT8 PcdEnableI2C5;
UINT8 PcdEnableI2C6; UINT8 PcdEnableI2C6;
UINT32 PcdGraphicsConfigPtr;
UINT8 PunitPwrConfigDisable; UINT8 PunitPwrConfigDisable;
UINT8 ChvSvidConfig; UINT8 ChvSvidConfig;
UINT8 DptfDisable; UINT8 DptfDisable;

2
src/soc/intel/common/vbt.c
View File

@ -47,5 +47,5 @@ void load_vbt(uint8_t s3_resume, SILICON_INIT_UPD *params)
} else } else
vbt_data = NULL; vbt_data = NULL;
} }
params->PcdGraphicsConfigPtr = (u32)vbt_data; params->GraphicsConfigPtr = (u32)vbt_data;
} }