From 65b76e3cbea653b275d22a162a10faf178588cea Mon Sep 17 00:00:00 2001 From: Sigvart Hovland Date: Tue, 26 Mar 2019 15:42:38 +0100 Subject: [PATCH] [nrf noup] zephyr: Remove duplication from Kconfig and cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andrzej Puzdrowski Signed-off-by: Marti Bolivar (cherry picked from commit 73d4cd12928fb53930e7bcbe6c376b7c797317bf) (cherry picked from commit 2dbfdddd712770983bf5e49418b35ca229f6e801) Signed-off-by: Martí Bolívar --- boot/zephyr/CMakeLists.txt | 2 -- boot/zephyr/Kconfig | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt index f5e02c7c3..b33967423 100644 --- 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 index e0a7c02ca..7634aeecc 100644 --- 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"