2 files changed, 31 insertions, 12 deletions
diff --git a/src/drivers/smmstore/Kconfig b/src/drivers/smmstore/Kconfig
index d7063dfad5..1ab3a5e941 100644
--- a/src/drivers/smmstore/Kconfig
+++ b/src/drivers/smmstore/Kconfig
@@ -19,14 +19,22 @@ config SMMSTORE
 	depends on BOOT_DEVICE_SUPPORTS_WRITES
 	select SPI_FLASH_SMM if BOOT_DEVICE_SPI_FLASH_RW_NOMMAP
 
+config SMMSTORE_IN_CBFS
+	bool
+	default n
+	help
+	  Select this if you want to the SMMSTORE region in a
+	  cbfsfile in a cbfs FMAP region
+
 if SMMSTORE
 config SMMSTORE_REGION
-	string "fmap region in which SMM store file is kept"
-	default "RW_LEGACY" if CHROMEOS
-	default "COREBOOT"
+	string "fmap region in which SMM store file is kept" if SMMSTORE_IN_CBFS
+	default "RW_LEGACY" if CHROMEOS && SMMSTORE_IN_CBFS
+	default "COREBOOT" if SMMSTORE_IN_CBFS
+	default "SMMSTORE"
 
 config SMMSTORE_FILENAME
-	string "SMM store file name"
+	string "SMM store file name" if SMMSTORE_IN_CBFS
 	default "smm_store"
 
 endif
diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c
index 4463bad84a..409949a8d1 100644
--- a/src/drivers/smmstore/store.c
+++ b/src/drivers/smmstore/store.c
@@ -15,6 +15,7 @@
 
 #include <boot_device.h>
 #include <cbfs.h>
+#include <fmap.h>
 #include <commonlib/region.h>
 #include <console/console.h>
 #include <smmstore.h>
@@ -57,15 +58,25 @@
 static int lookup_store(struct region_device *rstore)
 {
 	struct cbfsf file;
-	if (cbfs_locate_file_in_region(&file,
-		CONFIG_SMMSTORE_REGION, CONFIG_SMMSTORE_FILENAME, NULL) < 0) {
-		printk(BIOS_WARNING, "smm store: "
-			"Unable to find SMM store file in region '%s'\n",
-			CONFIG_SMMSTORE_REGION);
-		return -1;
-	}
+	if (IS_ENABLED(CONFIG_SMMSTORE_IN_CBFS)) {
+		if (cbfs_locate_file_in_region(&file,
+			       CONFIG_SMMSTORE_REGION,
+			       CONFIG_SMMSTORE_FILENAME, NULL) < 0) {
+			printk(BIOS_WARNING, "smm store: "
+			       "Unable to find SMM store file in region '%s'\n",
+			       CONFIG_SMMSTORE_REGION);
+			return -1;
+		}
 
-	cbfs_file_data(rstore, &file);
+		cbfs_file_data(rstore, &file);
+	} else {
+		if (fmap_locate_area_as_rdev_rw(CONFIG_SMMSTORE_REGION, rstore)) {
+			printk(BIOS_WARNING,
+			       "smm store: Unable to find SMM store FMAP region '%s'\n",
+			       CONFIG_SMMSTORE_REGION);
+			return -1;
+		}
+	}
 
 	return 0;
 }