summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Baltieri <fabiobaltieri@google.com>2021-06-14 16:44:22 +0000
committerCommit Bot <commit-bot@chromium.org>2021-06-14 21:37:51 +0000
commit2c58e541897163dcb879a3755884d193fb0011a9 (patch)
tree4fc7434dad1e7a4ee19e524158bd82445fda71b3
parent9efe07cf273a1bbe9bde1854a2884809d3c11be7 (diff)
downloadchrome-ec-2c58e541897163dcb879a3755884d193fb0011a9.tar.gz
zephyr: shim: move mpu code under core/cortex-m
The MPU code is cortex-m specific, so move it out of shim/src and into shim/core/cortex-m. BRANCH=none BUG=b:180039888 TEST=build & run on volteer Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com> Change-Id: Ic77d6f58751822e3dad461f9236f5b43da764164 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2961189 Reviewed-by: Yuval Peress <peress@chromium.org>
-rw-r--r--zephyr/shim/core/cortex-m/CMakeLists.txt1
-rw-r--r--zephyr/shim/core/cortex-m/mpu.c (renamed from zephyr/shim/src/mpu.c)0
-rw-r--r--zephyr/shim/src/CMakeLists.txt1
3 files changed, 1 insertions, 1 deletions
diff --git a/zephyr/shim/core/cortex-m/CMakeLists.txt b/zephyr/shim/core/cortex-m/CMakeLists.txt
index 2481b49efe..ca5fd0f04c 100644
--- a/zephyr/shim/core/cortex-m/CMakeLists.txt
+++ b/zephyr/shim/core/cortex-m/CMakeLists.txt
@@ -3,3 +3,4 @@
# found in the LICENSE file.
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_SOFTWARE_PANIC software_panic.c)
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MPU mpu.c)
diff --git a/zephyr/shim/src/mpu.c b/zephyr/shim/core/cortex-m/mpu.c
index 64e5a93db0..64e5a93db0 100644
--- a/zephyr/shim/src/mpu.c
+++ b/zephyr/shim/core/cortex-m/mpu.c
diff --git a/zephyr/shim/src/CMakeLists.txt b/zephyr/shim/src/CMakeLists.txt
index ceb92d436f..6beaced2dc 100644
--- a/zephyr/shim/src/CMakeLists.txt
+++ b/zephyr/shim/src/CMakeLists.txt
@@ -28,7 +28,6 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD keyboard_raw.c)
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MKBP_EVENT mkbp_event.c)
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MOTIONSENSE
motionsense_sensors.c)
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MPU mpu.c)
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_PANIC panic.c)
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_PWM pwm.c)
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_RTC rtc.c)