bd82x6x: Consolidate common GNVS init
Change-Id: Iea035f80695623e4e8d53eea7e3ec294d868fb5b Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7053 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
1aff2e97ea
commit
06c788db1a
|
@ -46,11 +46,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
@ -76,11 +71,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
// the lid is open by default.
|
||||
gnvs->lids = 1;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
#endif
|
||||
|
||||
acpi_update_thermal_table(gnvs);
|
||||
|
||||
}
|
||||
|
|
|
@ -56,11 +56,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
@ -78,9 +73,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[4] = 0x00000000;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
|
||||
gnvs->chromeos.vbt2 = google_ec_running_ro() ?
|
||||
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
|
||||
#endif
|
||||
|
|
|
@ -47,11 +47,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
@ -69,9 +64,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[4] = 0x00000005;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
|
||||
gnvs->chromeos.vbt2 = parrot_ec_running_ro() ?
|
||||
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
|
||||
#endif
|
||||
|
|
|
@ -50,11 +50,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
@ -72,9 +67,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[4] = 0x00000005;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
|
||||
gnvs->chromeos.vbt2 = get_recovery_mode_switch() ?
|
||||
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
|
||||
#endif
|
||||
|
|
|
@ -66,10 +66,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
gnvs_ = gnvs;
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Enable USB ports in S3 */
|
||||
gnvs->s3u0 = 1;
|
||||
|
@ -90,11 +86,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[3] = 0x80000410;
|
||||
gnvs->did[4] = 0x00000005;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
#endif
|
||||
|
||||
acpi_update_thermal_table(gnvs);
|
||||
|
||||
// Stumpy has no arms^H^H^H^HEC.
|
||||
|
|
|
@ -44,11 +44,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
|
|
@ -43,11 +43,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
|
|
@ -43,11 +43,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
|
|
@ -43,11 +43,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
|
|
@ -43,11 +43,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
|
||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Disable USB ports in S3 by default */
|
||||
gnvs->s3u0 = 0;
|
||||
gnvs->s3u1 = 0;
|
||||
|
|
|
@ -65,10 +65,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
gnvs_ = gnvs;
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/*
|
||||
* Disable 3G in suspend by default.
|
||||
|
@ -92,10 +88,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[3] = 0x80000410;
|
||||
gnvs->did[4] = 0x00000005;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
#endif
|
||||
acpi_update_thermal_table(gnvs);
|
||||
|
||||
gnvs->chromeos.vbt2 = ec_read(0xcb) ? ACTIVE_ECFW_RW : ACTIVE_ECFW_RO;
|
||||
|
|
|
@ -67,10 +67,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
|
|||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||
{
|
||||
gnvs_ = gnvs;
|
||||
memset((void *)gnvs, 0, sizeof(*gnvs));
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
/* Enable Front USB ports in S3 by default */
|
||||
gnvs->s3u0 = 1;
|
||||
|
@ -91,11 +87,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
|||
gnvs->did[3] = 0x80000410;
|
||||
gnvs->did[4] = 0x00000005;
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
// TODO(reinauer) this could move elsewhere?
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
#endif
|
||||
|
||||
acpi_update_thermal_table(gnvs);
|
||||
|
||||
// Stumpy has no arms^H^H^H^HEC.
|
||||
|
|
|
@ -685,6 +685,15 @@ static void southbridge_inject_dsdt(void)
|
|||
memset(gnvs, 0, sizeof (*gnvs));
|
||||
|
||||
acpi_create_gnvs(gnvs);
|
||||
|
||||
gnvs->apic = 1;
|
||||
gnvs->mpen = 1; /* Enable Multi Processing */
|
||||
gnvs->pcnt = dev_count_cpu();
|
||||
|
||||
#if CONFIG_CHROMEOS
|
||||
chromeos_init_vboot(&(gnvs->chromeos));
|
||||
#endif
|
||||
|
||||
/* IGD OpRegion Base Address */
|
||||
gnvs->aslb = (u32)opregion;
|
||||
/* And tell SMI about it */
|
||||
|
|
Loading…
Reference in New Issue