From 1b25bf1238a3e196765182cd0fecbcafb24a8e8b Mon Sep 17 00:00:00 2001 From: Kamil Sroka Date: Mon, 27 Aug 2018 17:53:48 +0200 Subject: [PATCH] [nrf52840] add crypto to all platform lib variants (#2995) --- examples/platforms/nrf52840/Makefile.am | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/platforms/nrf52840/Makefile.am b/examples/platforms/nrf52840/Makefile.am index 6790c7fe4..674b8edc3 100644 --- a/examples/platforms/nrf52840/Makefile.am +++ b/examples/platforms/nrf52840/Makefile.am @@ -170,13 +170,6 @@ NORDICSEMI_SOURCES @top_builddir@/third_party/NordicSemiconductor/libraries/app_error/app_error_weak.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/atfifo/nrf_atfifo.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/atomic/nrf_atomic.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_cc310.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_soft.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/cc310_mbedtls.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_alt_cc310.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_curves_alt.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/sha256_alt_cc310.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_core.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_string_desc.c \ @@ -191,6 +184,16 @@ NORDICSEMI_SOURCES @top_builddir@/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT.c \ $(NULL) +HWCRYPTO_SOURCES = \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_cc310.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_soft.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/cc310_mbedtls.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_alt_cc310.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_curves_alt.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/sha256_alt_cc310.c \ + $(NULL) + libopenthread_nrf52840_a_CPPFLAGS = \ $(COMMONCPPFLAGS) \ $(SINGLEPHY_CPPFLAGS) \ @@ -201,6 +204,7 @@ libopenthread_nrf52840_a_SOURCES $(RADIO_DRIVER_SOURCES) \ $(NORDICSEMI_SOURCES) \ $(SINGLEPHY_SOURCES) \ + $(HWCRYPTO_SOURCES) \ $(NULL) libopenthread_nrf52840_sdk_a_CPPFLAGS = \ @@ -212,6 +216,7 @@ libopenthread_nrf52840_sdk_a_SOURCES $(PLATFORM_SOURCES) \ $(RADIO_DRIVER_SOURCES) \ $(SINGLEPHY_SOURCES) \ + $(HWCRYPTO_SOURCES) \ $(NULL) libopenthread_nrf52840_softdevice_sdk_a_CPPFLAGS = \ @@ -223,6 +228,7 @@ libopenthread_nrf52840_softdevice_sdk_a_SOURCES $(PLATFORM_SOURCES) \ $(RADIO_DRIVER_SOURCES) \ $(SOFTDEVICE_SOURCES) \ + $(HWCRYPTO_SOURCES) \ $(NULL) noinst_HEADERS = \