summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2020-11-24 13:24:47 +0100
committerMichael Niewöhner <foss@mniewoehner.de>2020-12-04 00:10:52 +0000
commitd328934c9b9d1454a83971182627565a5d116cb0 (patch)
treec30f1632925a9e1b4b3b9dc5c1fc0c044ebfed30 /src
parent51f5ff6d27ccb9d4f7e5401fe1c093b173711bf9 (diff)
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 <foss@mniewoehner.de> Change-Id: I02e0c679f9aafe33108320a8dfc62dcb278202ef Reviewed-on: https://review.coreboot.org/c/coreboot/+/48092 Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h10
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/mainboard.c9
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/Makefile.inc1
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c13
5 files changed, 0 insertions, 35 deletions
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
index a4ebe461b0..40afacb41c 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
+++ b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
@@ -8,5 +8,3 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio_early.c
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 cad75f4baf..0000000000
--- 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 0f8dbed2ed..b7ea1f2b64 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 f3c87b2318..0000000000
--- 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 75351eb6de..0000000000
--- 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);
-}