3 files changed, 1 insertions, 36 deletions
diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig
index 31c29cd31b..3e9f462879 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Kconfig
+++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig
@@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_HID
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select DRIVERS_GENERIC_CBFS_SERIAL
 
 	# For now no way to choose the correct the available RAM
 	config BOARD_RAZER_BLADE_STEALTH_KBL_16GB
diff --git a/src/mainboard/razer/blade_stealth_kbl/Makefile.inc b/src/mainboard/razer/blade_stealth_kbl/Makefile.inc
index 3d8d4fc847..0d4380a6f6 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Makefile.inc
+++ b/src/mainboard/razer/blade_stealth_kbl/Makefile.inc
@@ -2,7 +2,6 @@
 
 subdirs-y += spd
 
-ramstage-y += mainboard.c
 ramstage-y += ramstage.c
 ramstage-y += hda_verb.c
 
diff --git a/src/mainboard/razer/blade_stealth_kbl/mainboard.c b/src/mainboard/razer/blade_stealth_kbl/mainboard.c
deleted file mode 100644
index eecfa3b656..0000000000
--- a/src/mainboard/razer/blade_stealth_kbl/mainboard.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <smbios.h>
-#include <string.h>
-#include <cbfs.h>
-
-#define MAX_SERIAL_LENGTH 0x100
-
-const char *smbios_mainboard_serial_number(void)
-{
-	static char serial_number[MAX_SERIAL_LENGTH + 1] = {0};
-	struct cbfsf file;
-
-	if (serial_number[0] != 0)
-		return serial_number;
-
-	if (cbfs_boot_locate(&file, "serial_number", NULL) == 0) {
-		struct region_device cbfs_region;
-		size_t ser_len;
-
-		cbfs_file_data(&cbfs_region, &file);
-
-		ser_len = region_device_sz(&cbfs_region);
-		if (ser_len <= MAX_SERIAL_LENGTH) {
-			if (rdev_readat(&cbfs_region, serial_number, 0, ser_len) == ser_len) {
-				serial_number[ser_len] = 0;
-				return serial_number;
-			}
-		}
-	}
-
-	strncpy(serial_number, CONFIG_MAINBOARD_SERIAL_NUMBER, MAX_SERIAL_LENGTH);
-
-	return serial_number;
-}