4 files changed, 20 insertions, 23 deletions
diff --git a/zephyr/drivers/cros_flash/Kconfig b/zephyr/drivers/cros_flash/Kconfig
index 06f2b9f8c0..8931f413e4 100644
--- a/zephyr/drivers/cros_flash/Kconfig
+++ b/zephyr/drivers/cros_flash/Kconfig
@@ -4,8 +4,8 @@
 
 menuconfig CROS_FLASH_NPCX
 	bool "Nuvoton NPCX flash driver for the Zephyr shim"
+	depends on SOC_FAMILY_NPCX
 	default y
-	depends on DT_HAS_NUVOTON_NPCX_CROS_FLASH_ENABLED
 	select PLATFORM_EC_FLASH_CROS
 	select PLATFORM_EC_SPI_FLASH_REGS
 	help
@@ -39,8 +39,8 @@ config CROS_FLASH_IT8XXX2
 
 config CROS_FLASH_XEC
 	bool "Microchip XEC flash driver for the Zephyr shim"
+	depends on SOC_FAMILY_MEC
 	default y
-	depends on DT_HAS_MICROCHIP_XEC_CROS_FLASH_ENABLED
 	select PLATFORM_EC_FLASH_CROS
 	select PLATFORM_EC_SPI_FLASH_REGS
 	help
diff --git a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
index 79ef0c36b2..4838c5d583 100644
--- a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
+++ b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
@@ -5,18 +5,17 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_cros_flash
 
-#include "flash.h"
-#include "host_command.h"
-#include "system.h"
-#include "watchdog.h"
-
+#include <drivers/cros_flash.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
-#include <drivers/cros_flash.h>
 #include <soc.h>
 
+#include "flash.h"
+#include "host_command.h"
+#include "system.h"
+#include "watchdog.h"
+
 LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR);
 
 /* Device data */
diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c
index e49067ad1a..032bb5906c 100644
--- a/zephyr/drivers/cros_flash/cros_flash_npcx.c
+++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c
@@ -5,20 +5,19 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_cros_flash
 
-#include "../drivers/flash/spi_nor.h"
-#include "flash.h"
-#include "spi_flash_reg.h"
-#include "write_protect.h"
-
+#include <drivers/cros_flash.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
-#include <drivers/cros_flash.h>
 #include <soc.h>
 
+#include "flash.h"
+#include "spi_flash_reg.h"
+#include "write_protect.h"
+#include "../drivers/flash/spi_nor.h"
+
 LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR);
 
 static int all_protected; /* Has all-flash protection been requested? */
diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c
index 610a79c971..2b92eae25b 100644
--- a/zephyr/drivers/cros_flash/cros_flash_xec.c
+++ b/zephyr/drivers/cros_flash/cros_flash_xec.c
@@ -5,20 +5,19 @@
 
 #define DT_DRV_COMPAT microchip_xec_cros_flash
 
-#include "../drivers/flash/spi_nor.h"
-#include "flash.h"
-#include "spi_flash_reg.h"
-#include "write_protect.h"
-
+#include <drivers/cros_flash.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
-#include <drivers/cros_flash.h>
 #include <soc.h>
 
+#include "flash.h"
+#include "spi_flash_reg.h"
+#include "write_protect.h"
+#include "../drivers/flash/spi_nor.h"
+
 LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR);
 
 static int all_protected;