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

mb/google/cyan: Move board_id() to mainboard_fill_gnvs()

Browse source 
Only a google/cyan variant evalutes BDID in ASL.

Change-Id: I3d839333333b4762ae5350734c85471a3c12838a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49003
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-12-23 05:07:17 +02:00 committed by Nico Huber
parent 98323cd222
commit 388c16a7e8
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mainboard/google/cyan/acpi_tables.c
View file

@ -3,6 +3,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <arch/ioapic.h> #include <arch/ioapic.h>
#include <boardid.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
@ -22,6 +23,8 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs)
/* Disable PMIC I2C port for ACPI for all boards except cyan */ /* Disable PMIC I2C port for ACPI for all boards except cyan */
if (!CONFIG(BOARD_GOOGLE_CYAN)) if (!CONFIG(BOARD_GOOGLE_CYAN))
gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0;
gnvs->bdid = board_id();
} }
unsigned long acpi_fill_madt(unsigned long current) unsigned long acpi_fill_madt(unsigned long current)

12
src/soc/intel/braswell/ramstage.c
View file

@ -2,7 +2,6 @@
#include <arch/cpu.h> #include <arch/cpu.h>
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
@ -15,13 +14,11 @@
#include <soc/gpio.h> #include <soc/gpio.h>
#include <soc/lpc.h> #include <soc/lpc.h>
#include <soc/msr.h> #include <soc/msr.h>
#include <soc/nvs.h>
#include <soc/pattrs.h> #include <soc/pattrs.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <soc/intel/common/acpi.h> #include <soc/intel/common/acpi.h>
#include <boardid.h>
#include <string.h> #include <string.h>
#define SHOW_PATTRS 1 #define SHOW_PATTRS 1
@ -136,14 +133,6 @@ int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0)
return 1; return 1;
} }
static void set_board_id(void)
{
struct global_nvs *gnvs = acpi_get_gnvs();
if (!gnvs)
return;
gnvs->bdid = board_id();
}
void soc_init_pre_device(struct soc_intel_braswell_config *config) void soc_init_pre_device(struct soc_intel_braswell_config *config)
{ {
struct soc_gpio_config *gpio_config; struct soc_gpio_config *gpio_config;
@ -157,7 +146,6 @@ void soc_init_pre_device(struct soc_intel_braswell_config *config)
intel_silicon_init(); intel_silicon_init();
set_max_freq(); set_max_freq();
set_board_id();
/* Get GPIO initial states from mainboard */ /* Get GPIO initial states from mainboard */
gpio_config = mainboard_get_gpios(); gpio_config = mainboard_get_gpios();
setup_soc_gpios(gpio_config, config->enable_xdp_tap); setup_soc_gpios(gpio_config, config->enable_xdp_tap);