diff --git a/src/mainboard/asrock/z87_extreme4/Makefile.mk b/src/mainboard/asrock/z87_extreme4/Makefile.mk
index c3cf55d397..58368c333e 100644
--- a/src/mainboard/asrock/z87_extreme4/Makefile.mk
+++ b/src/mainboard/asrock/z87_extreme4/Makefile.mk
@@ -4,3 +4,5 @@ bootblock-y += bootblock.c
 bootblock-y += gpio.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+ramstage-y += nuvoton.c
+smm-y += nuvoton.c
diff --git a/src/mainboard/asrock/z87_extreme4/mainboard.c b/src/mainboard/asrock/z87_extreme4/mainboard.c
index 1e62d65d2e..8e30e3c61c 100644
--- a/src/mainboard/asrock/z87_extreme4/mainboard.c
+++ b/src/mainboard/asrock/z87_extreme4/mainboard.c
@@ -10,24 +10,6 @@
 #include <southbridge/intel/lynxpoint/pch.h>
 
 #define GPIO1_DEV PNP_DEV(0x2e, NCT6776_WDT1_GPIO01A_V)
-#define NUVOTON_ENTRY_KEY 0x87
-#define NUVOTON_EXIT_KEY 0xAA
-
-/* Enable configuration: pass entry key '0x87' into index port dev
- * two times. */
-void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(NUVOTON_ENTRY_KEY, port);
-	outb(NUVOTON_ENTRY_KEY, port);
-}
-
-/* Disable configuration: pass exit key '0xAA' into index port dev. */
-void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(NUVOTON_EXIT_KEY, port);
-}
 
 static void turn_off_leds(void *unused)
 {
diff --git a/src/mainboard/asrock/z87_extreme4/nuvoton.c b/src/mainboard/asrock/z87_extreme4/nuvoton.c
new file mode 100644
index 0000000000..56453329cb
--- /dev/null
+++ b/src/mainboard/asrock/z87_extreme4/nuvoton.c
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <device/pnp_ops.h>
+#include <superio/nuvoton/common/nuvoton.h>
+#include <superio/nuvoton/nct6776/nct6776.h>
+
+#define NUVOTON_ENTRY_KEY 0x87
+#define NUVOTON_EXIT_KEY 0xAA
+
+/* Enable configuration: pass entry key '0x87' into index port dev
+ * two times. */
+void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev)
+{
+	u16 port = dev >> 8;
+	outb(NUVOTON_ENTRY_KEY, port);
+	outb(NUVOTON_ENTRY_KEY, port);
+}
+
+/* Disable configuration: pass exit key '0xAA' into index port dev. */
+void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev)
+{
+	u16 port = dev >> 8;
+	outb(NUVOTON_EXIT_KEY, port);
+}
diff --git a/src/mainboard/asrock/z87_extreme4/smihandler.c b/src/mainboard/asrock/z87_extreme4/smihandler.c
index d6ebcef9a0..462316a692 100644
--- a/src/mainboard/asrock/z87_extreme4/smihandler.c
+++ b/src/mainboard/asrock/z87_extreme4/smihandler.c
@@ -7,24 +7,6 @@
 #include <superio/nuvoton/nct6776/nct6776.h>
 
 #define GPIO1_DEV PNP_DEV(0x2e, NCT6776_WDT1_GPIO01A_V)
-#define NUVOTON_ENTRY_KEY 0x87
-#define NUVOTON_EXIT_KEY 0xAA
-
-/* Enable configuration: pass entry key '0x87' into index port dev
- * two times. */
-void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(NUVOTON_ENTRY_KEY, port);
-	outb(NUVOTON_ENTRY_KEY, port);
-}
-
-/* Disable configuration: pass exit key '0xAA' into index port dev. */
-void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(NUVOTON_EXIT_KEY, port);
-}
 
 void mainboard_smi_sleep(u8 slp_typ)
 {