summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJonathon Murphy <jpmurphy@google.com>2023-04-21 16:22:51 +0000
committerJonathon Murphy <jpmurphy@google.com>2023-04-21 16:24:57 +0000
commiteaf2376ff817d2c0019a6064f9d77187b4f70507 (patch)
tree34a8bc11188cfcef6de74d26f849c32e8e784c96 /core
parent33d87e53009a84379747ae31efac39e067e23484 (diff)
downloadchrome-ec-eaf2376ff817d2c0019a6064f9d77187b4f70507.tar.gz
Revert "Reland "tree: Remove the stale boringssl AES code""
This reverts commit 2e03009c0dccc4ae9683d3b7d761e900b3cf2c46. Reason for revert: Breaks postsubmit b/279174496 Original change's description: > Reland "tree: Remove the stale boringssl AES code" > > This is a reland of commit 1eb725490d0e7ff726b9edcf11579080a412a02f > > 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 > TEST=make runhosttests -j > TEST=make buildall -j > BRANCH=none > > Signed-off-by: Yi Chou <yich@google.com> > Change-Id: Ifca00792d0568ed767a1c9aea4953eb7a93c1c92 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4439570 > Reviewed-by: Tom Hughes <tomhughes@chromium.org> Bug: b:248508087, b:273639386 Change-Id: I4c44cdd75a9cc38e3e0e688d91f2a64b908ae61d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4459598 Tested-by: Jonathon Murphy <jpmurphy@google.com> Reviewed-by: Tom Hughes <tomhughes@chromium.org> Auto-Submit: Jonathon Murphy <jpmurphy@google.com> Owners-Override: Jonathon Murphy <jpmurphy@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