Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48803 )
Change subject: soc/intel: Drop indirect <soc/nvs.h> include ......................................................................
soc/intel: Drop indirect <soc/nvs.h> include
Change-Id: Ia19018685749efdd543cb09c06df117690ab9d66 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/baytrail/acpi.c M src/soc/intel/baytrail/include/soc/acpi.h M src/soc/intel/braswell/acpi.c M src/soc/intel/braswell/include/soc/acpi.h M src/soc/intel/broadwell/include/soc/acpi.h M src/soc/intel/denverton_ns/acpi.c M src/soc/intel/denverton_ns/include/soc/acpi.h M src/soc/intel/skylake/acpi.c M src/soc/intel/skylake/include/soc/acpi.h M src/soc/intel/xeon_sp/cpx/soc_acpi.c M src/soc/intel/xeon_sp/include/soc/acpi.h M src/soc/intel/xeon_sp/skx/soc_acpi.c 12 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/48803/1
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 1413dcb..e9e08c7 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -14,6 +14,7 @@ #include <cpu/intel/turbo.h>
#include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/iomap.h> #include <soc/irq.h> #include <soc/msr.h> diff --git a/src/soc/intel/baytrail/include/soc/acpi.h b/src/soc/intel/baytrail/include/soc/acpi.h index 8d9e93a..d629b24 100644 --- a/src/soc/intel/baytrail/include/soc/acpi.h +++ b/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); diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 63accb9..f754226 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -12,6 +12,7 @@ #include <device/pci.h> #include <drivers/intel/gma/opregion.h> #include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/gfx.h> #include <soc/iomap.h> #include <soc/irq.h> diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h index 8ce8c2a..461913d 100644 --- a/src/soc/intel/braswell/include/soc/acpi.h +++ b/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); diff --git a/src/soc/intel/broadwell/include/soc/acpi.h b/src/soc/intel/broadwell/include/soc/acpi.h index 39d6cb4..4999f8f 100644 --- a/src/soc/intel/broadwell/include/soc/acpi.h +++ b/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 diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c index 05ee467..d634e70 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -12,6 +12,7 @@ #include <console/console.h> #include <intelblocks/acpi.h> #include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/cpu.h> #include <soc/soc_util.h> #include <soc/pmc.h> diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h index 40d2098..5ee89f5 100644 --- a/src/soc/intel/denverton_ns/include/soc/acpi.h +++ b/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); diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index b46c241..7b9e73d 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -19,6 +19,7 @@ #include <intelblocks/systemagent.h> #include <soc/intel/common/acpi.h> #include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/cpu.h> #include <soc/iomap.h> #include <soc/msr.h> diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h index 5f209a7..e12a748 100644 --- a/src/soc/intel/skylake/include/soc/acpi.h +++ b/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 diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 4808344..4e374bd 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -10,6 +10,7 @@ #include <device/pci.h> #include <intelblocks/cpulib.h> #include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/cpu.h> #include <soc/iomap.h> #include <soc/msr.h> diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h index 743251b..8c12cbf 100644 --- a/src/soc/intel/xeon_sp/include/soc/acpi.h +++ b/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 { diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index 703ec21..ff3ea28 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -9,6 +9,7 @@ #include <device/mmio.h> #include <device/pci.h> #include <soc/acpi.h> +#include <soc/nvs.h> #include <soc/cpu.h> #include <soc/iomap.h> #include <device/mmio.h>