From 11348409e52660cec38072aaf3643b9260f22a7c Mon Sep 17 00:00:00 2001 From: Misha Tkachenko <36621698+mishadesh@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:07:59 +0300 Subject: [PATCH] [Telink]: Replaced manual bootloader configuration by conf file (#28260) Replaced manual definition-based overlays by conf file Signed-off-by: Misha Tkachenko Co-authored-by: Alex Tsitsiura --- config/telink/app/bootloader.conf | 30 ++++++++++++++++++++++++ config/telink/chip-module/CMakeLists.txt | 8 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 config/telink/app/bootloader.conf diff --git a/config/telink/app/bootloader.conf b/config/telink/app/bootloader.conf new file mode 100644 index 00000000000000..5fb0182690cdaa --- /dev/null +++ b/config/telink/app/bootloader.conf @@ -0,0 +1,30 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Enable this option in case if restoring the slot0 partition is expected from slot1 +# partition in case if slot0 is not bootable or damaged +CONFIG_BOOT_BOOTSTRAP=n + +# Enable this option in case if SWAP_MOVE logic need to be used +CONFIG_BOOT_SWAP_USING_MOVE=y + +# Enable this option in case if SWAP_MOVE using scratch logic need to be used +# Enabling this option expecting the availability of scratch partition in DTS +CONFIG_BOOT_SWAP_USING_SCRATCH=n + +# Enable this option in case if the whole slot0 image need to be validated +# With disabled option the only image magic is validated +CONFIG_BOOT_VALIDATE_SLOT0=y diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt index 8ff944fd1bfba2..26f0d58612abe8 100644 --- a/config/telink/chip-module/CMakeLists.txt +++ b/config/telink/chip-module/CMakeLists.txt @@ -143,11 +143,17 @@ else() unset(GLOBAL_DTC_OVERLAY_FILE) endif() +if(EXISTS "${CHIP_ROOT}/config/telink/app/bootloader.conf") + set(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf") +else() + unset(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE) +endif() + if (CONFIG_CHIP_OTA_IMAGE_BUILD) add_custom_target(build_mcuboot ALL COMMAND west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr - -- -DCONFIG_BOOT_SWAP_USING_MOVE=y -DDTC_OVERLAY_FILE=${GLOBAL_DTC_OVERLAY_FILE} + -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE=${GLOBAL_DTC_OVERLAY_FILE} ) add_custom_target(merge_mcuboot ALL