From 87e0b5b1d741179e4ce63c9950ad91f265417283 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sat, 9 Oct 2021 14:11:42 -0600
Subject: [PATCH] util/autoport/bd82x6x.go: Fix includes

Fix include of nvs.h to reflect commit 661ad4666c (ACPI: Select
ACPI_SOC_NVS only where suitable); and re-add <device/pci_ops.h>,
removed in commit 0aad0531dc (util/autoport/bd82x6x.go: Drop unused
includes), as the generated early_init.c uses pci_write_config16().

Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Change-Id: Ic1e97cfa7dce0e4d25f7a37c28d3635bdbf6c2a5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58210
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
---
 util/autoport/bd82x6x.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go
index ad8918a041..f00c89fb47 100644
--- a/util/autoport/bd82x6x.go
+++ b/util/autoport/bd82x6x.go
@@ -296,6 +296,7 @@ func (b bd82x6x) Scan(ctx Context, addr PCIDevData) {
 
 	sb.WriteString(`
 #include <bootblock_common.h>
+#include <device/pci_ops.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 
@@ -359,7 +360,7 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
 
 	Add_gpl(gnvs)
 	gnvs.WriteString(`#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
+#include <soc/nvs.h>
 
 /* FIXME: check this function.  */
 void mainboard_fill_gnvs(struct global_nvs *gnvs)