From cb04f10c4ebda8b58dbd7aec3254f909d15b2f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Thu, 21 Nov 2019 17:07:27 +0100 Subject: [PATCH] [nrf temphack] cmake: multi-image + partition manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Align with upstream by not checking the board, this patch will disappear on the next upmerge. Signed-off-by: Sebastian Bøe --- boot/zephyr/CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt index 70a88a7a8..0d3fd27a4 100644 --- a/boot/zephyr/CMakeLists.txt +++ b/boot/zephyr/CMakeLists.txt @@ -6,14 +6,6 @@ cmake_minimum_required(VERSION 3.8.2) -# Board-specific CONF_FILES should get merged into the build as well. -# Default to qemu_x86 if no board has been specified. -# If BOARD is already defined, mcuboot is being built in a multi image -# context, and should default to its parent image BOARD. -if (NOT BOARD) - set(BOARD qemu_x86) -endif() - # Add a common dts overlay necessary to ensure mcuboot is linked into, # and fits inside, the boot partition. (If the user specified a # DTC_OVERLAY_FILE on the CMake command line, we need to append onto