summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorBen Gardner <gardner.ben@gmail.com>2015-12-08 21:20:25 -0600
committerMartin Roth <martinroth@google.com>2015-12-16 01:10:06 +0100
commitfa6014a6ec8253de8c86b0180221856a1398e70b (patch)
tree55d71de574980b69930abed6bf3733050e6b69ac /src/mainboard
parent1e1c7ac3b4cb6d85eb602e04b0e4da8c042846c0 (diff)
downloadcoreboot-fa6014a6ec8253de8c86b0180221856a1398e70b.tar.xz
intel/fsp_baytrail: rename include folder baytrail to include/soc
This is to match the layout of the non-fsp baytrail to make comparisons easier and possibly remove duplicate files. Change-Id: I9a94842d724ab3826de711d398227e7bdc1045ff Signed-off-by: Ben Gardner <gardner.ben@gmail.com> Reviewed-on: https://review.coreboot.org/12686 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/esd/atom15/acpi_tables.c6
-rw-r--r--src/mainboard/esd/atom15/fadt.c2
-rw-r--r--src/mainboard/esd/atom15/gpio.c2
-rw-r--r--src/mainboard/esd/atom15/irqroute.h4
-rw-r--r--src/mainboard/esd/atom15/romstage.c6
-rw-r--r--src/mainboard/intel/bayleybay_fsp/acpi_tables.c6
-rw-r--r--src/mainboard/intel/bayleybay_fsp/fadt.c2
-rw-r--r--src/mainboard/intel/bayleybay_fsp/gpio.c2
-rw-r--r--src/mainboard/intel/bayleybay_fsp/irqroute.h4
-rw-r--r--src/mainboard/intel/bayleybay_fsp/romstage.c14
-rw-r--r--src/mainboard/intel/minnowmax/acpi_tables.c6
-rw-r--r--src/mainboard/intel/minnowmax/fadt.c2
-rw-r--r--src/mainboard/intel/minnowmax/gpio.c2
-rw-r--r--src/mainboard/intel/minnowmax/irqroute.h4
-rw-r--r--src/mainboard/intel/minnowmax/romstage.c6
-rw-r--r--src/mainboard/siemens/mc_tcu3/acpi_tables.c6
-rw-r--r--src/mainboard/siemens/mc_tcu3/fadt.c2
-rw-r--r--src/mainboard/siemens/mc_tcu3/gpio.c2
-rw-r--r--src/mainboard/siemens/mc_tcu3/irqroute.h4
-rw-r--r--src/mainboard/siemens/mc_tcu3/lcd_panel.c2
-rw-r--r--src/mainboard/siemens/mc_tcu3/ptn3460.c2
-rw-r--r--src/mainboard/siemens/mc_tcu3/romstage.c14
22 files changed, 50 insertions, 50 deletions
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index 48991f5aea..3da29ee764 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -28,9 +28,9 @@
#include <device/pci_ids.h>
#include <cpu/cpu.h>
#include <cpu/x86/msr.h>
-#include <baytrail/acpi.h>
-#include <baytrail/nvs.h>
-#include <baytrail/iomap.h>
+#include <soc/acpi.h>
+#include <soc/nvs.h>
+#include <soc/iomap.h>
void acpi_create_gnvs(global_nvs_t *gnvs)
{
diff --git a/src/mainboard/esd/atom15/fadt.c b/src/mainboard/esd/atom15/fadt.c
index 38b9bfdd3f..36e4655a32 100644
--- a/src/mainboard/esd/atom15/fadt.c
+++ b/src/mainboard/esd/atom15/fadt.c
@@ -15,7 +15,7 @@
*/
#include <arch/acpi.h>
-#include <baytrail/acpi.h>
+#include <soc/acpi.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
{
diff --git a/src/mainboard/esd/atom15/gpio.c b/src/mainboard/esd/atom15/gpio.c
index f617de48ef..b9c7829fb1 100644
--- a/src/mainboard/esd/atom15/gpio.c
+++ b/src/mainboard/esd/atom15/gpio.c
@@ -15,7 +15,7 @@
*/
#include <stdlib.h>
-#include <baytrail/gpio.h>
+#include <soc/gpio.h>
#include "irqroute.h"
/*
diff --git a/src/mainboard/esd/atom15/irqroute.h b/src/mainboard/esd/atom15/irqroute.h
index f8660693e5..6b417981ed 100644
--- a/src/mainboard/esd/atom15/irqroute.h
+++ b/src/mainboard/esd/atom15/irqroute.h
@@ -17,8 +17,8 @@
#ifndef IRQROUTE_H
#define IRQROUTE_H
-#include <soc/intel/fsp_baytrail/baytrail/irq.h>
-#include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
+#include <soc/intel/fsp_baytrail/include/soc/irq.h>
+#include <soc/intel/fsp_baytrail/include/soc/pci_devs.h>
/*
*IR02h GFX INT(A) - PIRQ A
diff --git a/src/mainboard/esd/atom15/romstage.c b/src/mainboard/esd/atom15/romstage.c
index 89fc9de8bb..3aa02d8deb 100644
--- a/src/mainboard/esd/atom15/romstage.c
+++ b/src/mainboard/esd/atom15/romstage.c
@@ -15,12 +15,12 @@
* GNU General Public License for more details.
*/
-#include <baytrail/romstage.h>
+#include <soc/romstage.h>
#include <drivers/intel/fsp1_0/fsp_util.h>
#include <pc80/mc146818rtc.h>
#include <console/console.h>
-#include <baytrail/gpio.h>
-#include "chip.h"
+#include <soc/gpio.h>
+#include <soc/intel/fsp_baytrail/chip.h>
/**
* /brief mainboard call for setup that needs to be done before fsp init
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 56d287b236..f8b6f656f6 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -27,9 +27,9 @@
#include <device/pci_ids.h>
#include <cpu/cpu.h>
#include <cpu/x86/msr.h>
-#include <baytrail/acpi.h>
-#include <baytrail/nvs.h>
-#include <baytrail/iomap.h>
+#include <soc/acpi.h>
+#include <soc/nvs.h>
+#include <soc/iomap.h>
void acpi_create_gnvs(global_nvs_t *gnvs)
{
diff --git a/src/mainboard/intel/bayleybay_fsp/fadt.c b/src/mainboard/intel/bayleybay_fsp/fadt.c
index 0ebfc62547..8e8de51668 100644
--- a/src/mainboard/intel/bayleybay_fsp/fadt.c
+++ b/src/mainboard/intel/bayleybay_fsp/fadt.c
@@ -15,7 +15,7 @@
*/
#include <arch/acpi.h>
-#include <baytrail/acpi.h>
+#include <soc/acpi.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
{
diff --git a/src/mainboard/intel/bayleybay_fsp/gpio.c b/src/mainboard/intel/bayleybay_fsp/gpio.c
index 53029f1ab7..27b22c5e17 100644
--- a/src/mainboard/intel/bayleybay_fsp/gpio.c
+++ b/src/mainboard/intel/bayleybay_fsp/gpio.c
@@ -15,7 +15,7 @@
*/
#include <stdlib.h>
-#include <baytrail/gpio.h>
+#include <soc/gpio.h>
#include "irqroute.h"
/* NCORE GPIOs */
diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.h b/src/mainboard/intel/bayleybay_fsp/irqroute.h
index 8b6a46ed54..a24be3e748 100644
--- a/src/mainboard/intel/bayleybay_fsp/irqroute.h
+++ b/src/mainboard/intel/bayleybay_fsp/irqroute.h
@@ -16,8 +16,8 @@
#ifndef IRQROUTE_H
#define IRQROUTE_H
-#include <soc/intel/fsp_baytrail/baytrail/irq.h>
-#include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
+#include <soc/intel/fsp_baytrail/include/soc/irq.h>
+#include <soc/intel/fsp_baytrail/include/soc/pci_devs.h>
/*
*IR02h GFX INT(A) - PIRQ A
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index 970bbd1f8e..7af782f0f3 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -25,13 +25,13 @@
#include <cpu/x86/mtrr.h>
#include <romstage_handoff.h>
#include <timestamp.h>
-#include <baytrail/gpio.h>
-#include <baytrail/iomap.h>
-#include <baytrail/lpc.h>
-#include <baytrail/pci_devs.h>
-#include <baytrail/romstage.h>
-#include <baytrail/acpi.h>
-#include <baytrail/baytrail.h>
+#include <soc/gpio.h>
+#include <soc/iomap.h>
+#include <soc/lpc.h>
+#include <soc/pci_devs.h>
+#include <soc/romstage.h>
+#include <soc/acpi.h>
+#include <soc/baytrail.h>
#include <drivers/intel/fsp1_0/fsp_util.h>
/**
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 48991f5aea..3da29ee764 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -28,9 +28,9 @@
#include <device/pci_ids.h>
#include <cpu/cpu.h>
#include <cpu/x86/msr.h>
-#include <baytrail/acpi.h>
-#include <baytrail/nvs.h>
-#include <baytrail/iomap.h>
+#include <soc/acpi.h>
+#include <soc/nvs.h>
+#include <soc/iomap.h>
void acpi_create_gnvs(global_nvs_t *gnvs)
{
diff --git a/src/mainboard/intel/minnowmax/fadt.c b/src/mainboard/intel/minnowmax/fadt.c
index 38b9bfdd3f..36e4655a32 100644
--- a/src/mainboard/intel/minnowmax/fadt.c
+++ b/src/mainboard/intel/minnowmax/fadt.c
@@ -15,7 +15,7 @@
*/
#include <arch/acpi.h>
-#include <baytrail/acpi.h>
+#include <soc/acpi.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
{
diff --git a/src/mainboard/intel/minnowmax/gpio.c b/src/mainboard/intel/minnowmax/gpio.c
index 008dbee636..228b55b3ac 100644
--- a/src/mainboard/intel/minnowmax/gpio.c
+++ b/src/mainboard/intel/minnowmax/gpio.c
@@ -15,7 +15,7 @@
*/
#include <stdlib.h>
-#include <baytrail/gpio.h>
+#include <soc/gpio.h>
#include "irqroute.h"
/*
diff --git a/src/mainboard/intel/minnowmax/irqroute.h b/src/mainboard/intel/minnowmax/irqroute.h
index 0b577bcc40..0b194aa10d 100644
--- a/src/mainboard/intel/minnowmax/irqroute.h
+++ b/src/mainboard/intel/minnowmax/irqroute.h
@@ -17,8 +17,8 @@
#ifndef IRQROUTE_H
#define IRQROUTE_H
-#include <soc/intel/fsp_baytrail/baytrail/irq.h>
-#include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
+#include <soc/intel/fsp_baytrail/include/soc/irq.h>
+#include <soc/intel/fsp_baytrail/include/soc/pci_devs.h>
/*
*IR02h GFX INT(A) - PIRQ A
diff --git a/src/mainboard/intel/minnowmax/romstage.c b/src/mainboard/intel/minnowmax/romstage.c
index dd441f8bfc..7ee4f216e0 100644
--- a/src/mainboard/intel/minnowmax/romstage.c
+++ b/src/mainboard/intel/minnowmax/romstage.c
@@ -15,12 +15,12 @@
* GNU General Public License for more details.
*/
-#include <baytrail/romstage.h>
+#include <soc/romstage.h>
#include <drivers/intel/fsp1_0/fsp_util.h>
#include <pc80/mc146818rtc.h>
#include <console/console.h>
-#include <baytrail/gpio.h>
-#include "chip.h"
+#include <soc/gpio.h>
+#include <soc/intel/fsp_baytrail/chip.h>
/**
* /brief mainboard call for setup that needs to be done before fsp init
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 56d287b236..f8b6f656f6 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -27,9 +27,9 @@
#include <device/pci_ids.h>
#include <cpu/cpu.h>
#include <cpu/x86/msr.h>
-#include <baytrail/acpi.h>
-#include <baytrail/nvs.h>
-#include <baytrail/iomap.h>
+#include <soc/acpi.h>
+#include <soc/nvs.h>
+#include <soc/iomap.h>
void acpi_create_gnvs(global_nvs_t *gnvs)
{
diff --git a/src/mainboard/siemens/mc_tcu3/fadt.c b/src/mainboard/siemens/mc_tcu3/fadt.c
index 0ebfc62547..8e8de51668 100644
--- a/src/mainboard/siemens/mc_tcu3/fadt.c
+++ b/src/mainboard/siemens/mc_tcu3/fadt.c
@@ -15,7 +15,7 @@
*/
#include <arch/acpi.h>
-#include <baytrail/acpi.h>
+#include <soc/acpi.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
{
diff --git a/src/mainboard/siemens/mc_tcu3/gpio.c b/src/mainboard/siemens/mc_tcu3/gpio.c
index a7e5b0563d..fc5178fcd6 100644
--- a/src/mainboard/siemens/mc_tcu3/gpio.c
+++ b/src/mainboard/siemens/mc_tcu3/gpio.c
@@ -15,7 +15,7 @@
*/
#include <stdlib.h>
-#include <baytrail/gpio.h>
+#include <soc/gpio.h>
#include "irqroute.h"
/* NCORE GPIOs */
diff --git a/src/mainboard/siemens/mc_tcu3/irqroute.h b/src/mainboard/siemens/mc_tcu3/irqroute.h
index 8b6a46ed54..a24be3e748 100644
--- a/src/mainboard/siemens/mc_tcu3/irqroute.h
+++ b/src/mainboard/siemens/mc_tcu3/irqroute.h
@@ -16,8 +16,8 @@
#ifndef IRQROUTE_H
#define IRQROUTE_H
-#include <soc/intel/fsp_baytrail/baytrail/irq.h>
-#include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
+#include <soc/intel/fsp_baytrail/include/soc/irq.h>
+#include <soc/intel/fsp_baytrail/include/soc/pci_devs.h>
/*
*IR02h GFX INT(A) - PIRQ A
diff --git a/src/mainboard/siemens/mc_tcu3/lcd_panel.c b/src/mainboard/siemens/mc_tcu3/lcd_panel.c
index 0ee93172cd..91159f98d2 100644
--- a/src/mainboard/siemens/mc_tcu3/lcd_panel.c
+++ b/src/mainboard/siemens/mc_tcu3/lcd_panel.c
@@ -16,7 +16,7 @@
#include <console/console.h>
#include <string.h>
#include "modhwinfo.h"
-#include "baytrail/gpio.h"
+#include "soc/gpio.h"
#include "lcd_panel.h"
#include "ptn3460.h"
diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.c b/src/mainboard/siemens/mc_tcu3/ptn3460.c
index cdcae684f3..e371e53c7f 100644
--- a/src/mainboard/siemens/mc_tcu3/ptn3460.c
+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.c
@@ -14,7 +14,7 @@
*/
#include <console/console.h>
-#include "baytrail/i2c.h"
+#include "soc/i2c.h"
#include "ptn3460.h"
/** \brief This functions sets up the DP2LVDS-converter to be used with the
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index f19ec83cfc..49483e53e0 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -25,13 +25,13 @@
#include <cpu/x86/mtrr.h>
#include <romstage_handoff.h>
#include <timestamp.h>
-#include <baytrail/gpio.h>
-#include <baytrail/iomap.h>
-#include <baytrail/lpc.h>
-#include <baytrail/pci_devs.h>
-#include <baytrail/romstage.h>
-#include <baytrail/acpi.h>
-#include <baytrail/baytrail.h>
+#include <soc/gpio.h>
+#include <soc/iomap.h>
+#include <soc/lpc.h>
+#include <soc/pci_devs.h>
+#include <soc/romstage.h>
+#include <soc/acpi.h>
+#include <soc/baytrail.h>
#include <drivers/intel/fsp1_0/fsp_util.h>
#include "modhwinfo.h"