summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/ibase/mb899/Kconfig1
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig1
-rw-r--r--src/superio/nuvoton/Makefile.inc3
-rw-r--r--src/superio/nuvoton/common/hwm.c14
-rw-r--r--src/superio/nuvoton/common/hwm.h8
5 files changed, 7 insertions, 20 deletions
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 94c4e23781..66d85f396b 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS
select CHECK_SLFRCS_ON_RESUME
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_WINBOND_W83627EHG
- select SUPERIO_NUVOTON_COMMON_HWM # Nuvoton is a Winbond spin-off
select HAVE_ACPI_TABLES
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 006837aaf7..1a527d6178 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS
select CHECK_SLFRCS_ON_RESUME
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_WINBOND_W83627THG
- select SUPERIO_NUVOTON_COMMON_HWM # Nuvoton is a Winbond spin-off
select HAVE_ACPI_TABLES
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
diff --git a/src/superio/nuvoton/Makefile.inc b/src/superio/nuvoton/Makefile.inc
index 054c7bae77..e9ac2e37f1 100644
--- a/src/superio/nuvoton/Makefile.inc
+++ b/src/superio/nuvoton/Makefile.inc
@@ -4,9 +4,6 @@
bootblock-$(CONFIG_SUPERIO_NUVOTON_COMMON_PRE_RAM) += common/early_serial.c
romstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_PRE_RAM) += common/early_serial.c
-## include generic Nuvoton HWM driver
-ramstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_HWM) += common/hwm.c
-
subdirs-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += wpcm450
subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += nct5104d
subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5539D) += nct5539d
diff --git a/src/superio/nuvoton/common/hwm.c b/src/superio/nuvoton/common/hwm.c
deleted file mode 100644
index fb7b79ce69..0000000000
--- a/src/superio/nuvoton/common/hwm.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* Nuvoton is a Winbond spin-off, so this code is for both */
-
-#include <stdint.h>
-#include <superio/hwm5_conf.h>
-#include "hwm.h"
-
-#define HWM_BANK_SELECT 0x4e
-
-void nuvoton_hwm_select_bank(const u16 base, const u8 bank)
-{
- pnp_write_hwm5_index(base, HWM_BANK_SELECT, bank);
-}
diff --git a/src/superio/nuvoton/common/hwm.h b/src/superio/nuvoton/common/hwm.h
index 47d4e04e41..42e0f4af94 100644
--- a/src/superio/nuvoton/common/hwm.h
+++ b/src/superio/nuvoton/common/hwm.h
@@ -6,7 +6,13 @@
/* Nuvoton is a Winbond spin-off, so this code is for both */
#include <stdint.h>
+#include <superio/hwm5_conf.h>
-void nuvoton_hwm_select_bank(const u16 base, const u8 bank);
+#define HWM_BANK_SELECT 0x4e
+
+static inline void nuvoton_hwm_select_bank(const u16 base, const u8 bank)
+{
+ pnp_write_hwm5_index(base, HWM_BANK_SELECT, bank);
+}
#endif /* SUPERIO_NUVOTON_COMMON_HWM_H */