summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Baltieri <fabiobaltieri@google.com>2022-11-02 15:51:12 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-09 10:19:20 +0000
commit274ddb17a7cf89ad68cc768cec887ccb8c5a8cef (patch)
treeb9a42d163f6cd7ab541adfcb91bd6aa07ec82bc1
parent9b240f06ea67164112c47f4341ad52202a114887 (diff)
downloadchrome-ec-274ddb17a7cf89ad68cc768cec887ccb8c5a8cef.tar.gz
zephyr: Kconfig: enable CROS_FLASH_NPCX automatically
Enable CROS_FLASH_NPCX automatically based devicetree compatible nodes. BRANCH=none BUG=none TEST=cq dry run Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com> Change-Id: I59b2559a1db08ab9e33f7b6409d5774a247ee1ed Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4000383 Reviewed-by: Yuval Peress <peress@google.com> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
-rw-r--r--zephyr/drivers/cros_flash/Kconfig2
-rw-r--r--zephyr/program/brya/prj.conf1
-rw-r--r--zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf1
-rw-r--r--zephyr/program/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf1
-rw-r--r--zephyr/program/nissa/npcx_program.conf1
5 files changed, 1 insertions, 5 deletions
diff --git a/zephyr/drivers/cros_flash/Kconfig b/zephyr/drivers/cros_flash/Kconfig
index 731ce31105..06f2b9f8c0 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
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 97781f6e48..6bd30affb4 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -9,7 +9,6 @@ CONFIG_PLATFORM_EC_POWER_BUTTON=y
CONFIG_PLATFORM_EC_LID_SWITCH=y
CONFIG_PLATFORM_EC_SWITCH=y
CONFIG_LTO=y
-CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
CONFIG_PLATFORM_EC_VBOOT_EFS2=y
CONFIG_PLATFORM_EC_VBOOT_HASH=y
diff --git a/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf b/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf
index 2c98fd9330..52d3bac798 100644
--- a/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf
+++ b/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf
@@ -3,7 +3,6 @@
# found in the LICENSE file.
CONFIG_BOARD_ADLRVP_NPCX=y
-CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
CONFIG_SYSCON=y
diff --git a/zephyr/program/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf b/zephyr/program/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf
index 45b101a7ac..162c6c24dc 100644
--- a/zephyr/program/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf
+++ b/zephyr/program/intelrvp/mtlrvp/mtlrvpp_npcx/prj.conf
@@ -3,7 +3,6 @@
# found in the LICENSE file.
CONFIG_BOARD_MTLRVP_NPCX=y
-CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
CONFIG_SYSCON=y
diff --git a/zephyr/program/nissa/npcx_program.conf b/zephyr/program/nissa/npcx_program.conf
index 1af7c9531f..875c4bb2ef 100644
--- a/zephyr/program/nissa/npcx_program.conf
+++ b/zephyr/program/nissa/npcx_program.conf
@@ -3,7 +3,6 @@
# found in the LICENSE file.
# EC chip configuration: NPCX993
-CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
CONFIG_SOC_SERIES_NPCX9=y
CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y