diff options
| author | Felix Singer <felixsinger@posteo.net> | 2020-11-30 08:32:09 +0100 |
|---|---|---|
| committer | Michael Niewöhner <foss@mniewoehner.de> | 2021-01-04 23:35:55 +0000 |
| commit | 1e4c1590fb811ad067b8361fc7233b791ea7ab52 (patch) | |
| tree | dbbbc67bc053bd69875e416b53d335313b6eb9d3 /src | |
| parent | f14e663cc40b1ea6e4ac0664e31933d3c93e1229 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/kontron/mal10/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/kontron/mal10/include/carrier/gpio.h (renamed from src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h) | 6 | ||||
| -rw-r--r-- | src/mainboard/kontron/mal10/include/variant/gpio.h (renamed from src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h) | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/mainboard/kontron/mal10/Makefile.inc b/src/mainboard/kontron/mal10/Makefile.inc index 885786fc55..7fbab00337 100644 --- a/src/mainboard/kontron/mal10/Makefile.inc +++ b/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 diff --git a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h b/src/mainboard/kontron/mal10/include/carrier/gpio.h index 9c9c8edc83..b8606f62a1 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 index d97e199fb8..99cf35a037 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 */ |