From 5b92aa9c64c74194d1e405e0c8ec9f827f7c4fc6 Mon Sep 17 00:00:00 2001 From: Harsha B R Date: Fri, 25 Nov 2022 00:01:41 +0530 Subject: [PATCH] mb/intel/mtlrvp: Create baseboard structure for mtlrvp This patch will create the baseboard structure for mtlrvp. Changes include, 1. Adding Baseboard config for mtlrvp in Kconfig 2. Move gpio.h to corresponding baseboard directory 3. Append header reference to CPPFLAGS_common in Makefile.inc BUG=none TEST=FW_NAME=mtlrvp_p emerge-rex coreboot chromeos-bootimage Signed-off-by: Harsha B R Change-Id: I82acb6879fecb242014258f2c358804d5abbbd48 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69971 Reviewed-by: Rizwan Qureshi Reviewed-by: Ronak Kanabar Tested-by: build bot (Jenkins) --- src/mainboard/intel/mtlrvp/Kconfig | 4 ++++ src/mainboard/intel/mtlrvp/Makefile.inc | 6 +++++- .../baseboard/mtlrvp}/include/baseboard/gpio.h | 0 3 files changed, 9 insertions(+), 1 deletion(-) rename src/mainboard/intel/mtlrvp/{ => variants/baseboard/mtlrvp}/include/baseboard/gpio.h (100%) 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 similarity index 100% rename from src/mainboard/intel/mtlrvp/include/baseboard/gpio.h rename to src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h