diff --git a/Documentation b/Documentation
index ce750c0899..cae6e67e05 160000
--- a/Documentation
+++ b/Documentation
@@ -1 +1 @@
-Subproject commit ce750c0899c2138b37b52a48d020a3eceb92fd04
+Subproject commit cae6e67e0534485cd42119346a2e0121d6652965
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index cf912b3ca5..5989a526ba 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -387,6 +387,27 @@ config M25P_SUBSECTOR_ERASE
 
 endif
 
+config MTD_ST25FL1
+	bool "QuadSPI-based ST25FL1 FLASH"
+	default n
+	select SPI
+
+if MTD_ST25FL1
+
+config ST25FL1_SPIMODE
+	int "ST25FL1 SPI Mode"
+	default 0
+
+config ST25FL1_SPIFREQUENCY
+	int "ST25FL1 SPI Frequency"
+	default 20000000
+
+config ST25FL1_SECTOR512
+	bool "Simulate 512 byte Erase Blocks"
+	default n
+
+endif
+
 config MTD_SMART
 	bool "Sector Mapped Allocation for Really Tiny (SMART) Flash support"
 	default n