[nrf noup] zephyr: Remove duplication from Kconfig and cmake

Removes `NRFXLIB_CRYPTO`, `NRF_CC310_BL` and the `add_subdirectory` of nrfxlib it will still check that the nrfxlib is located outside the mcuboot directory. Signed-off-by: Sigvart Hovland <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]> Signed-off-by: Marti Bolivar <[email protected]> (cherry picked from commit 73d4cd1) (cherry picked from commit 2dbfddd) Signed-off-by: Martí Bolívar <[email protected]>
tejlmand · Oct 24, 2019 · 65b76e3 · 65b76e3
1 parent 0e7f543
commit 65b76e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
@@ -73,8 +73,6 @@ set(NRF_DIR "${MCUBOOT_DIR}/ext/nrf")
 if(CONFIG_BOOT_USE_NRF_CC310_BL)
 set(NRFXLIB_DIR ${MCUBOOT_DIR}/../nrfxlib)
 assert_exists(NRFXLIB_DIR)
-# Don't include this if we are using west
- add_subdirectory(${NRFXLIB_DIR} ${PROJECT_BINARY_DIR}/nrfxlib)
 endif()
 
 zephyr_library_include_directories(

diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
@@ -47,14 +47,6 @@ config BOOT_USE_NRF_CC310_BL
 	bool
 	default n
 
-config NRFXLIB_CRYPTO
-	bool
-	default n
-
-config NRF_CC310_BL
-	bool
-	default n
-
 menu "MCUBoot settings"
 
 choice
@@ -84,6 +76,7 @@ config BOOT_SIGNATURE_TYPE_ED25519
 if BOOT_SIGNATURE_TYPE_ECDSA_P256
 choice
 	prompt "Ecdsa implementation"
+	default BOOT_CC310 if HAS_HW_NRF_CC310
 	default BOOT_TINYCRYPT
 config BOOT_TINYCRYPT
 	bool "Use tinycrypt"