[coreboot-gerrit] Change in coreboot[master]: mb/google/cyan: Move board_id() to mainboard_fill_gnvs()

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49003 )

Change subject: mb/google/cyan: Move board_id() to mainboard_fill_gnvs()
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49003
Reviewed-by: Arthur Heymans 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/cyan/acpi_tables.c
M src/soc/intel/braswell/ramstage.c
2 files changed, 3 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index a30cd6a..e7029087 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 @@
    /* 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 68bddfb..7b92c52 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 @@
    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 @@
    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);