From 331481cd0c6ba804860f7cdbd5110a87ff0160fe Mon Sep 17 00:00:00 2001 From: JF Date: Sun, 24 May 2020 16:36:04 +0200 Subject: Refactor CMake files to allow building 2 binaries : one standalone and one compatible with mcuboot bootloader (the offset in memory is different). Add documentation about mcuboot image generation and OTA. Re-enable watchdog --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5af971f0..b6a4e932 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,5 +66,4 @@ endif() set(VERSION_EDIT_WARNING "// Do not edit this file, it is automatically generated by CMAKE!") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h) -include("cmake-nRF5x/CMake_nRF5x.cmake") add_subdirectory(src) -- cgit v1.2.3-70-g09d2 From 84b996bf3f7b11ffc2684fa1ccd4453306914c5b Mon Sep 17 00:00:00 2001 From: JF Date: Sun, 24 May 2020 17:02:45 +0200 Subject: Typo in file name. Set version to 0.6.0. --- CMakeLists.txt | 2 +- bootloader/mynewt_nosemi.elf_4.1.7.bin | Bin 22232 -> 0 bytes bootloader/mynewt_nosemi_4.1.7.elf.bin | Bin 0 -> 22232 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 bootloader/mynewt_nosemi.elf_4.1.7.bin create mode 100644 bootloader/mynewt_nosemi_4.1.7.elf.bin (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 67a9af60..003be764 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pinetime VERSION 0.5.0 LANGUAGES C CXX ASM) +project(pinetime VERSION 0.6.0 LANGUAGES C CXX ASM) set(NRF_TARGET "nrf52") diff --git a/bootloader/mynewt_nosemi.elf_4.1.7.bin b/bootloader/mynewt_nosemi.elf_4.1.7.bin deleted file mode 100644 index bd00ec9c..00000000 Binary files a/bootloader/mynewt_nosemi.elf_4.1.7.bin and /dev/null differ diff --git a/bootloader/mynewt_nosemi_4.1.7.elf.bin b/bootloader/mynewt_nosemi_4.1.7.elf.bin new file mode 100644 index 00000000..bd00ec9c Binary files /dev/null and b/bootloader/mynewt_nosemi_4.1.7.elf.bin differ -- cgit v1.2.3-70-g09d2