From 1e4c1590fb811ad067b8361fc7233b791ea7ab52 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 30 Nov 2020 08:32:09 +0100 Subject: mb/kontron/mal10: Move include directories to mb level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- src/mainboard/kontron/mal10/Makefile.inc | 4 +-- .../mal10/carriers/t10-tni/include/carrier/gpio.h | 32 ---------------------- src/mainboard/kontron/mal10/include/carrier/gpio.h | 32 ++++++++++++++++++++++ src/mainboard/kontron/mal10/include/variant/gpio.h | 11 ++++++++ .../mal10/variants/mal10/include/variant/gpio.h | 11 -------- 5 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h create mode 100644 src/mainboard/kontron/mal10/include/carrier/gpio.h create mode 100644 src/mainboard/kontron/mal10/include/variant/gpio.h delete mode 100644 src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h (limited to 'src/mainboard/kontron/mal10') 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/carriers/t10-tni/include/carrier/gpio.h deleted file mode 100644 index 9c9c8edc83..0000000000 --- a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef T10_TNI_CFG_GPIO_H -#define T10_TNI_CFG_GPIO_H - -#include -#include - -/* - * Bidirectional GPIO port when both RX and TX buffer is enabled - * TODO: move this macros to src/soc/intel/common/block/include/intelblocks/gpio_defs.h - */ -#ifndef PAD_CFG_GPIO_BIDIRECT_IOS -#define PAD_CFG_GPIO_BIDIRECT_IOS(pad, val, pull, rst, trig, iosstate, iosterm, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own) | \ - PAD_IOSSTATE(iosstate) | PAD_IOSTERM(iosterm)) -#endif - -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - -void carrier_gpio_configure(void); - -#endif /* T10_TNI_CFG_GPIO_H */ diff --git a/src/mainboard/kontron/mal10/include/carrier/gpio.h b/src/mainboard/kontron/mal10/include/carrier/gpio.h new file mode 100644 index 0000000000..b8606f62a1 --- /dev/null +++ b/src/mainboard/kontron/mal10/include/carrier/gpio.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef CARRIER_GPIO_H +#define CARRIER_GPIO_H + +#include +#include + +/* + * Bidirectional GPIO port when both RX and TX buffer is enabled + * TODO: move this macros to src/soc/intel/common/block/include/intelblocks/gpio_defs.h + */ +#ifndef PAD_CFG_GPIO_BIDIRECT_IOS +#define PAD_CFG_GPIO_BIDIRECT_IOS(pad, val, pull, rst, trig, iosstate, iosterm, own) \ + _PAD_CFG_STRUCT(pad, \ + PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ + PAD_BUF(NO_DISABLE) | val, \ + PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own) | \ + PAD_IOSSTATE(iosstate) | PAD_IOSTERM(iosterm)) +#endif + +#ifndef PAD_CFG_GPIO_BIDIRECT +#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ + _PAD_CFG_STRUCT(pad, \ + PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ + PAD_BUF(NO_DISABLE) | val, \ + PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) +#endif + +void carrier_gpio_configure(void); + +#endif /* CARRIER_GPIO_H */ diff --git a/src/mainboard/kontron/mal10/include/variant/gpio.h b/src/mainboard/kontron/mal10/include/variant/gpio.h new file mode 100644 index 0000000000..99cf35a037 --- /dev/null +++ b/src/mainboard/kontron/mal10/include/variant/gpio.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef VARIANT_GPIO_H +#define VARIANT_GPIO_H + +#include +#include + +void variant_early_gpio_configure(void); + +#endif /* VARIANT_GPIO_H */ diff --git a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h b/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h deleted file mode 100644 index d97e199fb8..0000000000 --- a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef MAL_10_CFG_GPIO_H -#define MAL_10_CFG_GPIO_H - -#include -#include - -void variant_early_gpio_configure(void); - -#endif /* MAL_10_CFG_GPIO_H */ -- cgit v1.2.3