summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/intel/mtlrvp/Kconfig4
-rw-r--r--src/mainboard/intel/mtlrvp/Makefile.inc6
-rw-r--r--src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h (renamed from src/mainboard/intel/mtlrvp/include/baseboard/gpio.h)0
3 files changed, 9 insertions, 1 deletions
diff --git a/src/mainboard/intel/mtlrvp/Kconfig b/src/mainboard/intel/mtlrvp/Kconfig
index e73d26adf2..db7c161ec9 100644
--- a/src/mainboard/intel/mtlrvp/Kconfig
+++ b/src/mainboard/intel/mtlrvp/Kconfig
@@ -13,6 +13,10 @@ if BOARD_INTEL_MTLRVP_COMMON
config MAINBOARD_DIR
default "intel/mtlrvp"
+config BASEBOARD_DIR
+ string
+ default "mtlrvp"
+
config MAINBOARD_PART_NUMBER
string
default "mtlrvp"
diff --git a/src/mainboard/intel/mtlrvp/Makefile.inc b/src/mainboard/intel/mtlrvp/Makefile.inc
index 830a6d31af..71ca021fd0 100644
--- a/src/mainboard/intel/mtlrvp/Makefile.inc
+++ b/src/mainboard/intel/mtlrvp/Makefile.inc
@@ -1,5 +1,9 @@
## SPDX-License-Identifier: GPL-2.0-or-later
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
+VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
+BASEBOARD_DIR:=$(call strip_quotes,$(CONFIG_BASEBOARD_DIR))
+subdirs-y += variants/baseboard/$(BASEBOARD_DIR)
subdirs-y += variants/$(VARIANT_DIR)
+
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/$(BASEBOARD_DIR)/include
diff --git a/src/mainboard/intel/mtlrvp/include/baseboard/gpio.h b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h
index a708db11ad..a708db11ad 100644
--- a/src/mainboard/intel/mtlrvp/include/baseboard/gpio.h
+++ b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h