diff --git a/src/mainboard/msi/ms7d25/Kconfig b/src/mainboard/msi/ms7d25/Kconfig
index daef6c9b65..0c8130fbfe 100644
--- a/src/mainboard/msi/ms7d25/Kconfig
+++ b/src/mainboard/msi/ms7d25/Kconfig
@@ -49,4 +49,26 @@ config CBFS_SIZE
 	hex
 	default 0x1000000
 
+config VBOOT
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_FWMP
+	select GBB_FLAG_DISABLE_LID_SHUTDOWN
+	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+	select VBOOT_ALWAYS_ENABLE_DISPLAY
+	select VBOOT_NO_BOARD_SUPPORT
+	select HAS_RECOVERY_MRC_CACHE
+
+config VBOOT_SLOTS_RW_AB
+	default y if VBOOT
+
+config FMDFILE
+	string
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT && VBOOT_SLOTS_RW_AB
+
+# gen_test_hwid.sh script doesn't like parentheses in the MAINBOARD_PART_NUMBER
+# Override the GBB_HWID
+config GBB_HWID
+	string
+	default "MSI_MS7D25"
+
 endif
diff --git a/src/mainboard/msi/ms7d25/vboot-rwab.fmd b/src/mainboard/msi/ms7d25/vboot-rwab.fmd
new file mode 100644
index 0000000000..b4dc044da6
--- /dev/null
+++ b/src/mainboard/msi/ms7d25/vboot-rwab.fmd
@@ -0,0 +1,48 @@
+FLASH 32M {
+	SI_ALL 4M {
+		SI_DESC 4K
+		SI_ME
+	}
+
+	UNUSED 12M
+
+	RW_MISC 320K {
+		UNIFIED_MRC_CACHE(PRESERVE) {
+			RECOVERY_MRC_CACHE 128K
+			RW_MRC_CACHE 128K
+		}
+		RW_ELOG(PRESERVE) 16K
+		RW_SHARED 16K {
+			SHARED_DATA 8K
+			VBLOCK_DEV 8K
+		}
+		RW_VPD(PRESERVE) 8K
+		RW_NVRAM(PRESERVE) 24K
+	}
+
+	CONSOLE 128K
+	SMMSTORE(PRESERVE) 256K
+
+	RW_SECTION_A 5280K {
+		VBLOCK_A 64K
+		FW_MAIN_A(CBFS)
+		RW_FWID_A 0x100
+	}
+
+	RW_SECTION_B 5280K {
+		VBLOCK_B 64K
+		FW_MAIN_B(CBFS)
+		RW_FWID_B 0x100
+	}
+
+	WP_RO 5M {
+		RO_VPD(PRESERVE) 16K
+		RO_SECTION {
+			FMAP 2K
+			RO_FRID 0x100
+			RO_FRID_PAD 0x700
+			GBB 12K
+			COREBOOT(CBFS)
+		}
+	}
+}