summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorYi Chou <yich@google.com>2023-04-18 07:04:42 +0000
committerYi Chou <yich@google.com>2023-04-18 07:11:32 +0000
commitb2ddaa748824a5430ab6ccce2b896efda3339788 (patch)
treef4ea4d222efaa07eaae0104aaf706b41c9220ad6 /core
parent06e507c9b58aef5c5290a504c625cfbbe1bb2f4e (diff)
downloadchrome-ec-b2ddaa748824a5430ab6ccce2b896efda3339788.tar.gz
Revert "tree: Remove the stale boringssl AES code"
This reverts commit 1eb725490d0e7ff726b9edcf11579080a412a02f. Reason for revert: break the build of chromeos-base/chromeos-fpmcu-unittests. Original change's description: > tree: Remove the stale boringssl AES code > > BUG=b:248508087, b:273639386 > TEST=make runhosttests -j > TEST=make buildall -j > BRANCH=none > > Change-Id: If4d7ee558871debdca5998c51d75c1062dce2a50 > Signed-off-by: Yi Chou <yich@google.com> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4388275 > Reviewed-by: Tom Hughes <tomhughes@chromium.org> Bug: b:248508087, b:273639386 Change-Id: I81f5035e25bed8e98516072a6f2a7a609fd6eede Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4439431 Commit-Queue: Yi Chou <yich@google.com> Tested-by: Yi Chou <yich@google.com> Reviewed-by: Howard Yang <hcyang@google.com>
Diffstat (limited to 'core')
l---------core/cortex-m/aes.S1
-rw-r--r--core/cortex-m/build.mk2
l---------core/cortex-m/ghash.S1
3 files changed, 4 insertions, 0 deletions
diff --git a/core/cortex-m/aes.S b/core/cortex-m/aes.S
new file mode 120000
index 0000000000..39d1286943
--- /dev/null
+++ b/core/cortex-m/aes.S
@@ -0,0 +1 @@
+../../third_party/boringssl/core/cortex-m/aes.S \ No newline at end of file
diff --git a/core/cortex-m/build.mk b/core/cortex-m/build.mk
index cb5b12b380..1e2c47297b 100644
--- a/core/cortex-m/build.mk
+++ b/core/cortex-m/build.mk
@@ -44,6 +44,8 @@ core-y=cpu.o debug.o init.o vecttable.o
ifneq ($(cc-name),clang)
core-y+=ldivmod.o llsr.o uldivmod.o
endif
+core-$(CONFIG_AES)+=aes.o
+core-$(CONFIG_AES_GCM)+=ghash.o
core-$(CONFIG_ARMV7M_CACHE)+=cache.o
core-$(CONFIG_COMMON_PANIC_OUTPUT)+=panic.o
core-$(CONFIG_COMMON_RUNTIME)+=switch.o task.o
diff --git a/core/cortex-m/ghash.S b/core/cortex-m/ghash.S
new file mode 120000
index 0000000000..e9acbf4b25
--- /dev/null
+++ b/core/cortex-m/ghash.S
@@ -0,0 +1 @@
+../../third_party/boringssl/core/cortex-m/ghash.S \ No newline at end of file