From 827a852acf7050e0e2bed6a5cd9bd636cf4b8ae2 Mon Sep 17 00:00:00 2001 From: Trond Einar Snekvik Date: Wed, 11 Sep 2019 10:12:29 +0200 Subject: [PATCH] Bluetooth: Mesh: Same config for all nrf51_qfaa boards in sample Renames the nrf51_blenano config file to something generic and uses that same config for the nrf51_ble400 board, which has the same constraints. Cannot rely on the CONFIG_SOC_NRF51_QFAA variable, as the CONF_FILE variable must be set before the boilerplate. Signed-off-by: Trond Einar Snekvik --- samples/bluetooth/mesh/CMakeLists.txt | 4 ++++ .../mesh/{prj_nrf51_blenano.conf => nrf51_qfaa.conf} | 0 2 files changed, 4 insertions(+) rename samples/bluetooth/mesh/{prj_nrf51_blenano.conf => nrf51_qfaa.conf} (100%) diff --git a/samples/bluetooth/mesh/CMakeLists.txt b/samples/bluetooth/mesh/CMakeLists.txt index c7ead201423..5547c4c5763 100644 --- a/samples/bluetooth/mesh/CMakeLists.txt +++ b/samples/bluetooth/mesh/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.13.1) set(QEMU_EXTRA_FLAGS -s) +if((BOARD STREQUAL nrf51_blenano) OR (BOARD STREQUAL nrf51_ble400)) + set(CONF_FILE nrf51_qfaa.conf) +endif() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) project(mesh) diff --git a/samples/bluetooth/mesh/prj_nrf51_blenano.conf b/samples/bluetooth/mesh/nrf51_qfaa.conf similarity index 100% rename from samples/bluetooth/mesh/prj_nrf51_blenano.conf rename to samples/bluetooth/mesh/nrf51_qfaa.conf