Skip to content

Commit e46d74a

Browse files
legrand-gregshuelegrand-gregshue
committed
Copy conf/overlay files APPLICATION_CONFIG_DIR ignored
APPLICATION_CONFIG_DIR does not fully support extending CONF_FILE to be a list. This means implicit inclusion of board-specific config files requres copies local to the top-level CMakeLists.txt. Fixes #1410 Signed-off-by: Gregory Shue <[email protected]>
1 parent 31b4514 commit e46d74a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+611
-7
lines changed

‎samples/zephyr_external_config/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33

44
cmake_minimum_required(VERSION 3.20.0)
55

6-
# For this sample, use the all the configurations from mcuboot/boot/zephyr,
7-
# then supplement with local settings.
8-
set(APPLICATION_CONFIG_DIR "\${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr")
9-
10-
list(APPEND CONF_FILE ${APPLICATION_CONFIG_DIR}/prj.conf)
11-
list(APPEND CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prj.conf)
12-
136
# Add a common dts overlay necessary to ensure mcuboot is linked into,
147
# and fits inside, the boot partition. (If the user specified a
158
# DTC_OVERLAY_FILE on the CMake command line, we need to append onto

‎samples/zephyr_external_config/boards/actinius_icarus.conf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Disable Zephyr console
2+
CONFIG_CONSOLE=n
3+
4+
# MCUBoot settings
5+
CONFIG_BOOT_MAX_IMG_SECTORS=256
6+
7+
# MCUboot serial recovery
8+
CONFIG_MCUBOOT_SERIAL=y

‎samples/zephyr_external_config/boards/bl5340_dvk_cpuapp.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_MULTITHREADING=y
2+
# Enable QSPI (MX25R64) - Slot 1 in QSPI
3+
CONFIG_NORDIC_QSPI_NOR=y
4+
CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
5+
CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=4
6+
CONFIG_BOOT_MAX_IMG_SECTORS=256

‎samples/zephyr_external_config/boards/circuitdojo_feather_nrf9160.conf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Disable Zephyr console
2+
CONFIG_CONSOLE=n
3+
4+
# Multithreading
5+
CONFIG_MULTITHREADING=y
6+
7+
# MCUBoot settings
8+
CONFIG_BOOT_MAX_IMG_SECTORS=256
9+
10+
# MCUboot serial recovery
11+
CONFIG_MCUBOOT_SERIAL=y
12+
CONFIG_BOOT_SERIAL_DETECT_DELAY=450
13+
CONFIG_MCUBOOT_INDICATION_LED=y
14+
15+
# Size of mcuboot partition
16+
CONFIG_SIZE_OPTIMIZATIONS=y

‎samples/zephyr_external_config/boards/conexio_stratus.conf‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Disable Zephyr console
2+
CONFIG_CONSOLE=n
3+
CONFIG_CONSOLE_HANDLER=n
4+
CONFIG_UART_CONSOLE=n
5+
6+
# Multithreading
7+
CONFIG_MULTITHREADING=y
8+
9+
# MCUBoot settings
10+
CONFIG_BOOT_MAX_IMG_SECTORS=256
11+
12+
# MCUboot serial recovery
13+
CONFIG_MCUBOOT_SERIAL=y
14+
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
15+
CONFIG_BOOT_SERIAL_DETECT_PIN=12
16+
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
17+
CONFIG_BOOT_SERIAL_DETECT_DELAY=450
18+
CONFIG_MCUBOOT_INDICATION_LED=y
19+
20+
# Size of mcuboot partition
21+
CONFIG_SIZE_OPTIMIZATIONS=y

‎samples/zephyr_external_config/boards/disco_l475_iot1.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_BOOT_MAX_IMG_SECTORS=256
2+
CONFIG_WATCHDOG=y

‎samples/zephyr_external_config/boards/flash_sim_driver.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_FLASH_SIMULATOR=y
2+
CONFIG_FLASH_SIMULATOR_UNALIGNED_READ=y

‎samples/zephyr_external_config/boards/frdm_k64f.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_WATCHDOG=y

‎samples/zephyr_external_config/boards/intel_s1000_crb.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONFIG_DEBUG=n
2+
CONFIG_I2C=n
3+
CONFIG_BOOT_MAX_IMG_SECTORS=512
4+
CONFIG_BOOT_WAIT_FOR_USB_DFU=y

‎samples/zephyr_external_config/boards/intel_s1000_crb.overlay‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright (c) 2018 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
/ {
7+
sram0: memory@be000000 {
8+
device_type = "memory";
9+
compatible = "mmio-sram";
10+
reg = <0xbe000000 0x30000>;
11+
};
12+
};
13+

0 commit comments

Comments
 (0)