From b5bdd707583a5731722f848cecae75753decf9b9 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 23 Jul 2022 21:28:52 +0200 Subject: [PATCH] mb/lenovo/haswell: Make INT15 support T440p specific In preparation to CB:63514, make the INT15 support specific for the T440p variant since the W541 doesn't support it currently. Change-Id: I8dfcc061e1b8a831f75bf9a8035770cb678a85d4 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/66106 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/lenovo/haswell/Kconfig | 2 +- src/mainboard/lenovo/haswell/Makefile.inc | 1 - src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc | 1 + src/mainboard/lenovo/haswell/{ => variants/t440p}/mainboard.c | 0 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc rename src/mainboard/lenovo/haswell/{ => variants/t440p}/mainboard.c (100%) diff --git a/src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/haswell/Kconfig index 71d30f2778..efac41b1d7 100644 --- a/src/mainboard/lenovo/haswell/Kconfig +++ b/src/mainboard/lenovo/haswell/Kconfig @@ -10,7 +10,6 @@ config BOARD_LENOVO_HASWELL_COMMON select HAVE_CMOS_DEFAULT select HAVE_OPTION_TABLE select INTEL_GMA_HAVE_VBT - select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_TPM1 select MAINBOARD_USES_IFD_GBE_REGION @@ -23,6 +22,7 @@ config BOARD_LENOVO_HASWELL_COMMON config BOARD_LENOVO_THINKPAD_T440P select BOARD_LENOVO_HASWELL_COMMON + select INTEL_INT15 if BOARD_LENOVO_HASWELL_COMMON diff --git a/src/mainboard/lenovo/haswell/Makefile.inc b/src/mainboard/lenovo/haswell/Makefile.inc index 5af50e7139..d1300f8f67 100644 --- a/src/mainboard/lenovo/haswell/Makefile.inc +++ b/src/mainboard/lenovo/haswell/Makefile.inc @@ -1,7 +1,6 @@ romstage-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/romstage.c -ramstage-y += mainboard.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads subdirs-y += variants/$(VARIANT_DIR) diff --git a/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc b/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc new file mode 100644 index 0000000000..f3c87b2318 --- /dev/null +++ b/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += mainboard.c diff --git a/src/mainboard/lenovo/haswell/mainboard.c b/src/mainboard/lenovo/haswell/variants/t440p/mainboard.c similarity index 100% rename from src/mainboard/lenovo/haswell/mainboard.c rename to src/mainboard/lenovo/haswell/variants/t440p/mainboard.c