[coreboot-gerrit] Change in coreboot[master]: mb/siemens/chili: Introduce include folder for header files

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47973 )

Change subject: mb/siemens/chili: Introduce include folder for header files
......................................................................

mb/siemens/chili: Introduce include folder for header files

Use include folder for header files allowing proper includes.

Change-Id: I80066fb925b918d040062397e633c5d499a50dbe
Signed-off-by: Felix Singer 
---
M src/mainboard/siemens/chili/Makefile.inc
M src/mainboard/siemens/chili/ec.c
R src/mainboard/siemens/chili/include/mainboard/ec.h
R src/mainboard/siemens/chili/include/variant.h
M src/mainboard/siemens/chili/mainboard.c
M src/mainboard/siemens/chili/romstage.c
M src/mainboard/siemens/chili/variants/base/gpio.c
M src/mainboard/siemens/chili/variants/chili/gpio.c
M src/mainboard/siemens/chili/variants/chili/romstage.c
9 files changed, 7 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/47973/1

diff --git a/src/mainboard/siemens/chili/Makefile.inc b/src/mainboard/siemens/chili/Makefile.inc
index abeedf3..c57c0a5 100644
--- a/src/mainboard/siemens/chili/Makefile.inc
+++ b/src/mainboard/siemens/chili/Makefile.inc
@@ -1,6 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only

-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include

romstage-y += romstage.c

diff --git a/src/mainboard/siemens/chili/ec.c b/src/mainboard/siemens/chili/ec.c
index bc0eb7d..7d9b6f2 100644
--- a/src/mainboard/siemens/chili/ec.c
+++ b/src/mainboard/siemens/chili/ec.c
@@ -4,10 +4,9 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
+#include <mainboard/ec.h>
 #include <timer.h>

-#include "ec.h"
-
 #define EC_STATUS			0x50
 #define   EC_RUNNING			(1 << 1)
 #define EC_DEVICE_CONTROL_1		0x80
diff --git a/src/mainboard/siemens/chili/ec.h b/src/mainboard/siemens/chili/include/mainboard/ec.h
similarity index 100%
rename from src/mainboard/siemens/chili/ec.h
rename to src/mainboard/siemens/chili/include/mainboard/ec.h
diff --git a/src/mainboard/siemens/chili/variant.h b/src/mainboard/siemens/chili/include/variant.h
similarity index 100%
rename from src/mainboard/siemens/chili/variant.h
rename to src/mainboard/siemens/chili/include/variant.h
diff --git a/src/mainboard/siemens/chili/mainboard.c b/src/mainboard/siemens/chili/mainboard.c
index 91395ea..c1d1a1d 100644
--- a/src/mainboard/siemens/chili/mainboard.c
+++ b/src/mainboard/siemens/chili/mainboard.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <device/device.h>
-
-#include "ec.h"
+#include <mainboard/ec.h>

static void mainboard_dev_init(struct device *dev)
 {
diff --git a/src/mainboard/siemens/chili/romstage.c b/src/mainboard/siemens/chili/romstage.c
index c1ec7e4..a981f50 100644
--- a/src/mainboard/siemens/chili/romstage.c
+++ b/src/mainboard/siemens/chili/romstage.c
@@ -4,8 +4,7 @@
 #include <soc/cnl_memcfg_init.h>
 #include <soc/gpio.h>
 #include <soc/romstage.h>
-
-#include "variant.h"
+#include <variant.h>

static void mainboard_init(void)
 {
diff --git a/src/mainboard/siemens/chili/variants/base/gpio.c b/src/mainboard/siemens/chili/variants/base/gpio.c
index 65ea037..61ec27d 100644
--- a/src/mainboard/siemens/chili/variants/base/gpio.c
+++ b/src/mainboard/siemens/chili/variants/base/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <soc/gpio.h>
-#include "variant.h"
+#include <variant.h>

static const struct pad_config gpio_table[] = {
 /* GPP_A14  GPIO                  */ PAD_NC(GPP_A14, NONE),
diff --git a/src/mainboard/siemens/chili/variants/chili/gpio.c b/src/mainboard/siemens/chili/variants/chili/gpio.c
index 4b18e79..d7e5ab02 100644
--- a/src/mainboard/siemens/chili/variants/chili/gpio.c
+++ b/src/mainboard/siemens/chili/variants/chili/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <soc/gpio.h>
-#include "variant.h"
+#include <variant.h>

static const struct pad_config gpio_table[] = {
 /* GPP_A14   GPIO                 0x0000002644000300 */ PAD_NC(GPP_A14, NONE),
diff --git a/src/mainboard/siemens/chili/variants/chili/romstage.c b/src/mainboard/siemens/chili/variants/chili/romstage.c
index ebffc8d3..3a83824 100644
--- a/src/mainboard/siemens/chili/variants/chili/romstage.c
+++ b/src/mainboard/siemens/chili/variants/chili/romstage.c
@@ -3,8 +3,7 @@
 #include <option.h>
 #include <console/console.h>
 #include <fsp/soc_binding.h>
-
-#include "../../variant.h"
+#include <variant.h>

void variant_romstage_params(FSPM_UPD *const mupd)
 {