[coreboot-gerrit] Change in coreboot[master]: mb/kontron/mal10: Move include directories to mb level

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48142 )

Change subject: mb/kontron/mal10: Move include directories to mb level
......................................................................

mb/kontron/mal10: Move include directories to mb level

Move include directories from carriers and variants to mainboard level
being able to reuse them later. Also, rename guards so that they fit
their usage.

Built with BUILD_TIMELESS=1, coreboot.rom remains the same.

Signed-off-by: Felix Singer 
Change-Id: I55af05cb84b97d567ce1fc3b6151c34d1eda183f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48142
Reviewed-by: Michael Niewöhner 
Reviewed-by: Angel Pons 
Reviewed-by: Maxim Polyakov 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/kontron/mal10/Makefile.inc
R src/mainboard/kontron/mal10/include/carrier/gpio.h
R src/mainboard/kontron/mal10/include/variant/gpio.h
3 files changed, 7 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Maxim Polyakov: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/kontron/mal10/Makefile.inc b/src/mainboard/kontron/mal10/Makefile.inc
index 885786f..7fbab00 100644
--- a/src/mainboard/kontron/mal10/Makefile.inc
+++ b/src/mainboard/kontron/mal10/Makefile.inc
@@ -3,7 +3,5 @@
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads

subdirs-y += variants/$(VARIANT_DIR)
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
-
 subdirs-y += carriers/$(CARRIER_DIR)
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/carriers/$(CARRIER_DIR)/include
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
diff --git a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h b/src/mainboard/kontron/mal10/include/carrier/gpio.h
similarity index 90%
rename from src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h
rename to src/mainboard/kontron/mal10/include/carrier/gpio.h
index 9c9c8ed..b8606f6 100644
--- a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h
+++ b/src/mainboard/kontron/mal10/include/carrier/gpio.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

-#ifndef T10_TNI_CFG_GPIO_H
-#define T10_TNI_CFG_GPIO_H
+#ifndef CARRIER_GPIO_H
+#define CARRIER_GPIO_H

#include <gpio.h>
 #include <stddef.h>
@@ -29,4 +29,4 @@

void carrier_gpio_configure(void);

-#endif /* T10_TNI_CFG_GPIO_H */
+#endif /* CARRIER_GPIO_H */
diff --git a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h b/src/mainboard/kontron/mal10/include/variant/gpio.h
similarity index 60%
rename from src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h
rename to src/mainboard/kontron/mal10/include/variant/gpio.h
index d97e199..99cf35a 100644
--- a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h
+++ b/src/mainboard/kontron/mal10/include/variant/gpio.h
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

-#ifndef MAL_10_CFG_GPIO_H
-#define MAL_10_CFG_GPIO_H
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H

#include <gpio.h>
 #include <stddef.h>

void variant_early_gpio_configure(void);

-#endif /* MAL_10_CFG_GPIO_H */
+#endif /* VARIANT_GPIO_H */