diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-12-23 05:07:17 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-01-10 11:41:32 +0000 |
| commit | 388c16a7e8be048f8d2db11eba305430c03a7647 (patch) | |
| tree | 68e6de4315c90f6a4df27f438c2d937e67dc1498 | |
| parent | 98323cd2224fa9c4f7db857da1e4190a9782935f (diff) | |
mb/google/cyan: Move board_id() to mainboard_fill_gnvs()
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>
| -rw-r--r-- | src/mainboard/google/cyan/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/braswell/ramstage.c | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c index a30cd6a2bd..e70290873b 100644 --- a/src/mainboard/google/cyan/acpi_tables.c +++ b/src/mainboard/google/cyan/acpi_tables.c @@ -3,6 +3,7 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> #include <arch/ioapic.h> +#include <boardid.h> #include <soc/acpi.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 */ if (!CONFIG(BOARD_GOOGLE_CYAN)) gnvs->dev.lpss_en[LPSS_NVS_I2C2] = 0; + + gnvs->bdid = board_id(); } unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index 68bddfb9a9..7b92c52e78 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -2,7 +2,6 @@ #include <arch/cpu.h> #include <acpi/acpi.h> -#include <acpi/acpi_gnvs.h> #include <cbmem.h> #include <console/console.h> #include <cpu/intel/microcode.h> @@ -15,13 +14,11 @@ #include <soc/gpio.h> #include <soc/lpc.h> #include <soc/msr.h> -#include <soc/nvs.h> #include <soc/pattrs.h> #include <soc/pci_devs.h> #include <soc/pm.h> #include <soc/ramstage.h> #include <soc/intel/common/acpi.h> -#include <boardid.h> #include <string.h> #define SHOW_PATTRS 1 @@ -136,14 +133,6 @@ int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0) 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) { struct soc_gpio_config *gpio_config; @@ -157,7 +146,6 @@ void soc_init_pre_device(struct soc_intel_braswell_config *config) intel_silicon_init(); set_max_freq(); - set_board_id(); /* Get GPIO initial states from mainboard */ gpio_config = mainboard_get_gpios(); setup_soc_gpios(gpio_config, config->enable_xdp_tap); |