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 <felixsinger@posteo.net>
Change-Id: I55af05cb84b97d567ce1fc3b6151c34d1eda183f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48142
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/kontron/mal10/Makefile.inc

@@ -3,7 +3,5 @@ ramstage-y += ramstage.c
 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

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 */

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 */