Change in coreboot[master]: mb/supermicro/x11ssm-f: drop NMI overrides

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48092 )

Change subject: mb/supermicro/x11ssm-f: drop NMI overrides
......................................................................

mb/supermicro/x11ssm-f: drop NMI overrides

Drop the NMI overrides, since NMI now gets configured in gpio common
code. Also remove the variant init mechanism, which is unused now.

Signed-off-by: Michael Niewöhner 
Change-Id: I02e0c679f9aafe33108320a8dfc62dcb278202ef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48092
Reviewed-by: Tim Wawrzynczak 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
D src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h
M src/mainboard/supermicro/x11-lga1151-series/mainboard.c
D src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/Makefile.inc
D src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c
5 files changed, 0 insertions(+), 35 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
index a4ebe46..40afacb 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
+++ b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
@@ -8,5 +8,3 @@
 ramstage-y += mainboard.c
 ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
-
-subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h b/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h
deleted file mode 100644
index cad75f4..0000000
--- a/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _BASEBOARD_X11_LGA1151_SERIES_H
-#define _BASEBOARD_X11_LGA1151_SERIES_H
-
-#include <device/device.h>
-
-void variant_mainboard_init(void *chip_info);
-
-#endif /* _BASEBOARD_X11_LGA1151_SERIES_H */
diff --git a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
index 0f8dbed..b7ea1f2 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
+++ b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
@@ -1,20 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

-#include <mainboard.h>
 #include <device/device.h>
 #include <mainboard/gpio.h>

-__weak void variant_mainboard_init(void *chip_info)
-{
-}
-
 static void mainboard_chip_init(void *chip_info)
 {
-	/* do common init */
    mainboard_configure_gpios();
-
-	/* do variant init */
-	variant_mainboard_init(chip_info);
 }

struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/Makefile.inc b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/Makefile.inc
deleted file mode 100644
index f3c87b2..0000000
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-ramstage-y += mainboard.c
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c
deleted file mode 100644
index 75351eb..0000000
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <mainboard.h>
-#include <device/device.h>
-#include <intelblocks/pcr.h>
-#include <soc/pcr_ids.h>
-
-void variant_mainboard_init(void *chip_info)
-{
-	// TODO: NMI; is this needed? vendor sets it
-	pcr_write32(0xae, 0x01e4, 0x00000004);
-	pcr_write32(0xae, 0x01e8, 0x00000040);
-}