soc/intel: Drop indirect <soc/nvs.h> include

Change-Id: Ia19018685749efdd543cb09c06df117690ab9d66
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48803
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/protectli/vault_bsw/acpi_tables.c

@@ -3,6 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <arch/ioapic.h>
 #include <soc/acpi.h>
+#include <soc/nvs.h>
 #include <string.h>
 
 void acpi_create_gnvs(struct global_nvs *gnvs)

src/soc/intel/baytrail/acpi.c

@@ -17,6 +17,7 @@
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/msr.h>
+#include <soc/nvs.h>
 #include <soc/pattrs.h>
 #include <soc/pm.h>
 

src/soc/intel/baytrail/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _BAYTRAIL_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 int acpi_sci_irq(void);
 unsigned long acpi_madt_irq_overrides(unsigned long current);

src/soc/intel/braswell/acpi.c

@@ -18,6 +18,7 @@
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/msr.h>
+#include <soc/nvs.h>
 #include <soc/pattrs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>

src/soc/intel/braswell/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _SOC_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 int acpi_sci_irq(void);
 void acpi_create_serialio_ssdt(acpi_header_t *ssdt);

src/soc/intel/broadwell/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _BROADWELL_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 /* P-state configuration */
 #define PSS_MAX_ENTRIES			8

src/soc/intel/common/block/sgx/sgx.c

@@ -11,6 +11,7 @@
 #include <intelblocks/sgx.h>
 #include <intelblocks/systemagent.h>
 #include <soc/cpu.h>
+#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 
 static inline uint64_t sgx_resource(uint32_t low, uint32_t high)

src/soc/intel/common/block/systemagent/systemagent.c

@@ -11,6 +11,7 @@
 #include <intelblocks/systemagent.h>
 #include <smbios.h>
 #include <soc/iomap.h>
+#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
 #include <types.h>

src/soc/intel/denverton_ns/acpi.c

@@ -13,6 +13,7 @@
 #include <intelblocks/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
+#include <soc/nvs.h>
 #include <soc/soc_util.h>
 #include <soc/pmc.h>
 #include <soc/systemagent.h>

src/soc/intel/denverton_ns/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _DENVERTON_NS_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);

src/soc/intel/skylake/acpi.c

@@ -23,6 +23,7 @@
 #include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/msr.h>
+#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/ramstage.h>

src/soc/intel/skylake/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _SOC_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 /* P-state configuration */
 #define PSS_MAX_ENTRIES			8

src/soc/intel/xeon_sp/cpx/soc_acpi.c

@@ -14,6 +14,7 @@
 #include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/msr.h>
+#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/soc_util.h>

src/soc/intel/xeon_sp/include/soc/acpi.h

@@ -4,7 +4,6 @@
 #define _SOC_ACPI_H_
 
 #include <acpi/acpi.h>
-#include <soc/nvs.h>
 
 #define MEM_BLK_COUNT      0x140
 typedef struct {

src/soc/intel/xeon_sp/skx/soc_acpi.c

@@ -14,6 +14,7 @@
 #include <soc/iomap.h>
 #include <device/mmio.h>
 #include <soc/msr.h>
+#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/soc_util.h>