summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Polyakov <max.senia.poliak@gmail.com>2020-04-26 20:56:50 +0300
committerAndrey Petrov <andrey.petrov@gmail.com>2020-05-01 22:13:08 +0000
commit8fb221dbd5ce11d27616a36eb6d5dc38bec7fd45 (patch)
tree0b086831fe484dcd5b949913f9a5c62e39d77170
parentd2b3e81095bccee157c8daa0db2d045fe33ea9cd (diff)
md/tiogapass: move all *.h to dir and make them global
It is necessary to rename the file gpio.h so that there are no conflict with another file (src/include/gpio.h) Change-Id: I4e3ef5882d6cb0ddbcb8357b54106ff2f47e4c51 Signed-off-by: Maxim Polyakov <max.senia.poliak@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40733 Reviewed-by: Andrey Petrov <andrey.petrov@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/ocp/tiogapass/Makefile.inc2
-rw-r--r--src/mainboard/ocp/tiogapass/bootblock.c2
-rw-r--r--src/mainboard/ocp/tiogapass/include/skxsp_tp_iio.h (renamed from src/mainboard/ocp/tiogapass/skxsp_tp_iio.h)0
-rw-r--r--src/mainboard/ocp/tiogapass/include/tp_pch_gpio.h (renamed from src/mainboard/ocp/tiogapass/gpio.h)0
-rw-r--r--src/mainboard/ocp/tiogapass/romstage.c3
5 files changed, 3 insertions, 4 deletions
diff --git a/src/mainboard/ocp/tiogapass/Makefile.inc b/src/mainboard/ocp/tiogapass/Makefile.inc
index 27370fd57a..e80a5940e5 100644
--- a/src/mainboard/ocp/tiogapass/Makefile.inc
+++ b/src/mainboard/ocp/tiogapass/Makefile.inc
@@ -17,5 +17,5 @@ bootblock-y += bootblock.c
ramstage-y += ramstage.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
-CPPFLAGS_common += -Isrc/mainboard/$(MAINBOARDDIR)/
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
CPPFLAGS_common += -I$(CONFIG_FSP_HEADER_PATH)
diff --git a/src/mainboard/ocp/tiogapass/bootblock.c b/src/mainboard/ocp/tiogapass/bootblock.c
index dbb3b6a93f..4ca4ca5612 100644
--- a/src/mainboard/ocp/tiogapass/bootblock.c
+++ b/src/mainboard/ocp/tiogapass/bootblock.c
@@ -10,7 +10,7 @@
#include <soc/pcr_ids.h>
#include <superio/aspeed/ast2400/ast2400.h>
#include <superio/aspeed/common/aspeed.h>
-#include "gpio.h"
+#include <tp_pch_gpio.h>
/* these are defined in intelblocks/lpc_lib.h but we can't use them yet */
#define PCR_DMI_LPCIOD 0x2770
diff --git a/src/mainboard/ocp/tiogapass/skxsp_tp_iio.h b/src/mainboard/ocp/tiogapass/include/skxsp_tp_iio.h
index d436e885a4..d436e885a4 100644
--- a/src/mainboard/ocp/tiogapass/skxsp_tp_iio.h
+++ b/src/mainboard/ocp/tiogapass/include/skxsp_tp_iio.h
diff --git a/src/mainboard/ocp/tiogapass/gpio.h b/src/mainboard/ocp/tiogapass/include/tp_pch_gpio.h
index f37ffd5eb5..f37ffd5eb5 100644
--- a/src/mainboard/ocp/tiogapass/gpio.h
+++ b/src/mainboard/ocp/tiogapass/include/tp_pch_gpio.h
diff --git a/src/mainboard/ocp/tiogapass/romstage.c b/src/mainboard/ocp/tiogapass/romstage.c
index 41f785638a..dcd198de70 100644
--- a/src/mainboard/ocp/tiogapass/romstage.c
+++ b/src/mainboard/ocp/tiogapass/romstage.c
@@ -19,8 +19,7 @@
#include <string.h>
#include <gpio.h>
#include <soc/lewisburg_pch_gpio_defs.h>
-
-#include "skxsp_tp_iio.h"
+#include <skxsp_tp_iio.h>
static uint8_t iio_table_buf[sizeof(tp_iio_bifur_table)];