summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2021-07-15 12:58:02 -0700
committerCommit Bot <commit-bot@chromium.org>2021-07-15 22:50:39 +0000
commitafcca55528b45fccec91db1b87fd8c458c6ca825 (patch)
treec8bc4de5be6cc840209d2683b9538df31731a90a
parent278c7a1290a8a8715b194046bebcea78628dbb56 (diff)
downloadchrome-ec-afcca55528b45fccec91db1b87fd8c458c6ca825.tar.gz
zephyr: Source the chip/ Kconfig in ARCH-specific
The Zephyr upstream sources the soc/ directory in ARCH-specific. Our shim zephyr/app/ec should align to source the chip/ directory in ARCH-specific. So it won't result defining a default value in the shim layer but missing the original definition in Zephyr. BRANCH=None BUG=b:192253134 TEST=Built the brya, lazor, asurada, and posix-ec images. Change-Id: I20476f8b071d530008333850d4d0a4c9598d0958 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3032867 Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/app/ec/Kconfig2
-rw-r--r--zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx (renamed from zephyr/app/ec/chip/Kconfig.npcx)0
-rw-r--r--zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 (renamed from zephyr/app/ec/chip/Kconfig.npcx7)0
-rw-r--r--zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 (renamed from zephyr/app/ec/chip/Kconfig.npcx9)0
4 files changed, 1 insertions, 1 deletions
diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig
index 9f533aeac8..9f4bdd95a1 100644
--- a/zephyr/app/ec/Kconfig
+++ b/zephyr/app/ec/Kconfig
@@ -17,7 +17,7 @@ menuconfig CROS_EC
if CROS_EC
rsource "soc/Kconfig"
-rsource "chip/Kconfig.*"
+orsource "chip/$(ARCH)/*/Kconfig.*"
config LTO
bool "Link Time Optimization (LTO)"
diff --git a/zephyr/app/ec/chip/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx
index b4a7c36a3d..b4a7c36a3d 100644
--- a/zephyr/app/ec/chip/Kconfig.npcx
+++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx
diff --git a/zephyr/app/ec/chip/Kconfig.npcx7 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7
index 26b36509ad..26b36509ad 100644
--- a/zephyr/app/ec/chip/Kconfig.npcx7
+++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7
diff --git a/zephyr/app/ec/chip/Kconfig.npcx9 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9
index cc41bb408f..cc41bb408f 100644
--- a/zephyr/app/ec/chip/Kconfig.npcx9
+++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9