Skip to content

Commit

Permalink
[nrf temphack] cmake: multi-image + partition manager
Browse files Browse the repository at this point in the history
Align with upstream by not checking the board, this patch will
disappear on the next upmerge.

Signed-off-by: Sebastian Bøe <[email protected]>
  • Loading branch information
SebastianBoe committed Dec 4, 2019
1 parent 5280906 commit cb04f10
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions boot/zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb04f10

Please sign in to comment.