diff --git a/drivers/flash/flash_stm32f4x.c b/drivers/flash/flash_stm32f4x.c
index fce2157..de2d7b1 100644
--- a/drivers/flash/flash_stm32f4x.c
+++ b/drivers/flash/flash_stm32f4x.c
@@ -13,12 +13,14 @@
 
 #include <flash_stm32.h>
 
+#define STM32F4X_SECTOR_MASK		((u32_t) 0xFFFFFF07)
+
 bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
 			     bool write)
 {
-	ARG_UNUSED(dev);
 	ARG_UNUSED(write);
-	return offset >= 0 && (offset + len - 1 <= STM32F4X_FLASH_END);
+
+	return flash_stm32_range_exists(dev, offset, len);
 }
 
 static int write_byte(struct device *dev, off_t offset, u8_t val)
@@ -52,7 +54,7 @@
 	return rc;
 }
 
-static int erase_sector(struct device *dev, u16_t sector)
+static int erase_sector(struct device *dev, u32_t sector)
 {
 	struct stm32f4x_flash *regs = FLASH_STM32_REGS(dev);
 	u32_t tmp;
@@ -84,10 +86,22 @@
 int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset,
 				 unsigned int len)
 {
-	int i, rc = 0;
+	struct flash_pages_info info;
+	u32_t start_sector, end_sector;
+	u32_t i, rc = 0;
 
-	i = stm32f4x_get_sector(offset);
-	for (; i <= stm32f4x_get_sector(offset + len - 1); i++) {
+	rc = flash_get_page_info_by_offs(dev, offset, &info);
+	if (rc) {
+		return rc;
+	}
+	start_sector = info.index;
+	rc = flash_get_page_info_by_offs(dev, offset + len - 1, &info);
+	if (rc) {
+		return rc;
+	}
+	end_sector = info.index;
+
+	for (i = start_sector; i <= end_sector; i++) {
 		rc = erase_sector(dev, i);
 		if (rc < 0) {
 			break;
@@ -112,3 +126,87 @@
 
 	return rc;
 }
+
+/*
+ * Different SoC flash layouts are specified in across various
+ * reference manuals, but the flash layout for a given number of
+ * sectors is consistent across these manuals, with one "gotcha". The
+ * number of sectors is given by the HAL as FLASH_SECTOR_TOTAL.
+ *
+ * The only "gotcha" is that when there are 24 sectors, they are split
+ * across 2 "banks" of 12 sectors each, with another set of small
+ * sectors (16 KB) in the second bank occurring after the large ones
+ * (128 KB) in the first. We could consider supporting this as two
+ * devices to make the layout cleaner, but this will do for now.
+ */
+#ifndef FLASH_SECTOR_TOTAL
+#error "Unknown flash layout"
+#else  /* defined(FLASH_SECTOR_TOTAL) */
+#if FLASH_SECTOR_TOTAL == 5
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/* RM0401, table 5: STM32F410Tx, STM32F410Cx, STM32F410Rx */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+};
+#elif FLASH_SECTOR_TOTAL == 6
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/* RM0368, table 5: STM32F401xC */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 1, .pages_size = KB(128)},
+};
+#elif FLASH_SECTOR_TOTAL == 8
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/*
+	 * RM0368, table 5: STM32F401xE
+	 * RM0383, table 4: STM32F411xE
+	 * RM0390, table 4: STM32F446xx
+	 */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 3, .pages_size = KB(128)},
+};
+#elif FLASH_SECTOR_TOTAL == 12
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/*
+	 * RM0090, table 5: STM32F405xx, STM32F415xx, STM32F407xx, STM32F417xx
+	 * RM0402, table 5: STM32F412Zx, STM32F412Vx, STM32F412Rx, STM32F412Cx
+	 */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 7, .pages_size = KB(128)},
+};
+#elif FLASH_SECTOR_TOTAL == 16
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/* RM0430, table 5.: STM32F413xx, STM32F423xx */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 11, .pages_size = KB(128)},
+};
+#elif FLASH_SECTOR_TOTAL == 24
+static const struct flash_pages_layout stm32f4_flash_layout[] = {
+	/*
+	 * RM0090, table 6: STM32F427xx, STM32F437xx, STM32F429xx, STM32F439xx
+	 * RM0386, table 4: STM32F469xx, STM32F479xx
+	 */
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 7, .pages_size = KB(128)},
+	{.pages_count = 4, .pages_size = KB(16)},
+	{.pages_count = 1, .pages_size = KB(64)},
+	{.pages_count = 7, .pages_size = KB(128)},
+};
+#else
+#error "Unknown flash layout"
+#endif /* FLASH_SECTOR_TOTAL == 5 */
+#endif/* !defined(FLASH_SECTOR_TOTAL) */
+
+void flash_stm32_page_layout(struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	ARG_UNUSED(dev);
+
+	*layout = stm32f4_flash_layout;
+	*layout_size = ARRAY_SIZE(stm32f4_flash_layout);
+}