Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf mergeup] Upmerge 2020 09 16 #120

Merged
merged 41 commits into from
Oct 6, 2020
Merged

[nrf mergeup] Upmerge 2020 09 16 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
014f42d
zephyr: Replace DT_FLASH_DEV_NAME with DT_CHOSEN_ZEPHYR_FLASH_CONTROL…
galak Apr 8, 2020
8cd5dc5
zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros
galak Apr 8, 2020
39d1aef
Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros"
nvlsianpu May 7, 2020
48b8ef0
Revert "Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt ma…
nvlsianpu May 7, 2020
5657d00
mergeup: merge up to upstream 82c5f7c
nvlsianpu May 7, 2020
b7254d1
zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_
galak May 8, 2020
322b11a
zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA for multimage
nvlsianpu May 11, 2020
1f181dd
sim: Fixup devicetree.h for changes to mcuboot
galak May 11, 2020
e88113b
scripts/assemble: Rework to use EDT library to get devicetree data
galak May 11, 2020
f625267
kconfig: Update to CONFIG_FLOAT to CONFIG_FPU rename in zephyr
joerchan May 19, 2020
4bb0f95
cmake: use find_package to locate Zephyr
tejlmand May 28, 2020
ba7748d
Convert from Zephyr to C99 types
galak May 27, 2020
60cc568
Revert "zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_"
nvlsianpu Jun 8, 2020
032eb72
mergeup: merge up to upstream 9b48d08
nvlsianpu Jun 8, 2020
d52aff5
mergeup: merge up to upstream 33fbef5
nvlsianpu Jun 19, 2020
9920005
zephyr: serial: Align with new callback signature
carlescufi Jul 20, 2020
813d29c
mergeup: merge up to upstream 1cb076c
nvlsianpu Aug 3, 2020
0f2c585
mergeup: merge up to upstream 5a6e181
nvlsianpu Aug 14, 2020
3ab5ab3
sample: inclusive language: whitelist -> allow
nashif Aug 26, 2020
f78d1d0
imgtool: fix package's author email
utzig Aug 17, 2020
4804219
zephyr: struct device const-ification
utzig Sep 2, 2020
a5d79cf
boot: zephyr: Fix build issue for multiple conf files
MarekPieta Aug 12, 2020
265d52f
Revert "[nrf toup] boot: zephyr: Fix build issue for multiple conf fi…
tejlmand Sep 16, 2020
9271366
Revert "[nrf temphack] do_boot: clean peripherals state before boot"
tejlmand Sep 16, 2020
238ba83
Revert "[nrf noup] boot: zephyr: Use correct pm template"
tejlmand Sep 16, 2020
ebc9f96
Revert "[nrf noup] zephyr: Fix redefinition compiler warning"
tejlmand Sep 16, 2020
f0afa0f
Revert "[nrf noup] zephyr: Single image application support for PM"
tejlmand Sep 16, 2020
b4d70ca
Revert "[nrf temphack] Kconfig: add accessor for flash write block size"
tejlmand Sep 16, 2020
c90d6dc
Revert "[nrf noup] zephyr: lock mcuboot using fprotect before jumping"
tejlmand Sep 16, 2020
6692afc
Revert "[nrf noup] treewide: add NCS partition manager support"
tejlmand Sep 16, 2020
28e5697
[nrf mergeup] Merge mcuboot to commit a5d79cf
tejlmand Sep 16, 2020
e632ea6
[nrf noup] treewide: add NCS partition manager support
SebastianBoe Dec 12, 2018
3f02019
[nrf noup] zephyr: lock mcuboot using fprotect before jumping
hakonfam Jan 6, 2020
7dfa63a
[nrf temphack] Kconfig: add accessor for flash write block size
mbolivar-nordic Apr 24, 2020
e66f032
[nrf noup] zephyr: Single image application support for PM
de-nordic May 20, 2020
fcbc47f
[nrf noup] zephyr: Fix redefinition compiler warning
de-nordic Jul 22, 2020
5409c45
[nrf noup] boot: zephyr: Use correct pm template
pdunaj Aug 4, 2020
664b8ad
[nrf temphack] do_boot: clean peripherals state before boot
nvlsianpu Feb 27, 2020
9bf6927
[nrf fromlist] zephyr: Fix serial recovery compilation warnings
de-nordic Sep 11, 2020
b40176e
[nrf fromlist] boot: zephyr: reset SPLIM registers before boot
hakonfam Oct 1, 2020
ec441e0
[nrf fromtree] boot: zephyr: Disable HW stack protection
mniestroj Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boot/zephyr/flash_map_extended.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ MCUBOOT_LOG_MODULE_DECLARE(mcuboot);
#error "FLASH_DEVICE_ID could not be determined"
#endif

static struct device *flash_dev;
static const struct device *flash_dev;

struct device *flash_device_get_binding(char *dev_name)
const struct device *flash_device_get_binding(char *dev_name)
{
if (!flash_dev) {
flash_dev = device_get_binding(dev_name);
Expand Down
2 changes: 1 addition & 1 deletion boot/zephyr/include/flash_map_backend/flash_map_backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extern "C" {
*
* Returns the flash device on success, or NULL on failure.
*/
struct device *flash_device_get_binding(char *dev_name);
const struct device *flash_device_get_binding(char *dev_name);

/*
* Retrieve a memory-mapped flash device's base address.
Expand Down
11 changes: 10 additions & 1 deletion boot/zephyr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,15 @@ static void do_boot(struct boot_rsp *rsp)
cleanup_arm_nvic(); /* cleanup NVIC registers */
#endif

#if defined(CONFIG_BUILTIN_STACK_GUARD) && \
defined(CONFIG_CPU_CORTEX_M_HAS_SPLIM)
/* Reset limit registers to avoid inflicting stack overflow on image
* being booted.
*/
__set_PSPLIM(0);
__set_MSPLIM(0);
#endif

#ifdef CONFIG_BOOT_INTR_VEC_RELOC
#if defined(CONFIG_SW_VECTOR_RELAY)
_vector_table_pointer = vt;
Expand Down Expand Up @@ -346,7 +355,7 @@ void main(void)

#ifdef CONFIG_MCUBOOT_SERIAL

struct device *detect_port;
struct device const *detect_port;
uint32_t detect_value = !CONFIG_BOOT_SERIAL_DETECT_PIN_VAL;

detect_port = device_get_binding(CONFIG_BOOT_SERIAL_DETECT_PORT);
Expand Down
2 changes: 2 additions & 0 deletions boot/zephyr/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ CONFIG_FPROTECT=y
CONFIG_LOG=y
### Ensure Zephyr logging changes don't use more resources
CONFIG_LOG_DEFAULT_LEVEL=0

CONFIG_HW_STACK_PROTECTION=n
8 changes: 4 additions & 4 deletions boot/zephyr/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ sample:
tests:
sample.bootloader.mcuboot:
tags: bootloader_mcuboot
platform_whitelist: nrf52840dk_nrf52840 frdm_k64f
platform_allow: nrf52840dk_nrf52840 frdm_k64f
sample.bootloader.mcuboot.serial_recovery:
extra_args: OVERLAY_CONFIG=serial_recovery.conf
platform_whitelist: nrf52840dk_nrf52840
platform_allow: nrf52840dk_nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.usb_cdc_acm_recovery:
tags: bootloader_mcuboot
platform_whitelist: nrf52840dongle_nrf52840
platform_allow: nrf52840dongle_nrf52840
sample.bootloader.mcuboot.usb_cdc_acm_recovery_log:
extra_args: OVERLAY_CONFIG=./usb_cdc_acm_log_recovery.conf
DTC_OVERLAY_FILE=./boards/nrf52840_big.overlay
platform_whitelist: nrf52840dk_nrf52840
platform_allow: nrf52840dk_nrf52840
tags: bootloader_mcuboot
4 changes: 2 additions & 2 deletions boot/zephyr/serial_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct line_input {
char line[CONFIG_BOOT_MAX_LINE_INPUT_LEN];
};

static struct device *uart_dev;
static struct device const *uart_dev;
static struct line_input line_bufs[2];

static sys_slist_t avail_queue;
Expand Down Expand Up @@ -115,7 +115,7 @@ boot_console_init(void)
}

static void
boot_uart_fifo_callback(struct device *dev, void *user_data)
boot_uart_fifo_callback(const struct device *dev, void *user_data)
{
static struct line_input *cmd;
uint8_t byte;
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name="imgtool",
version=imgtool_version,
author="The MCUboot committers",
author_email="dev-mcuboot@lists.runtime.co",
author_email="mcuboot@groups.io",
description=("MCUboot's image signing and key management"),
license="Apache Software License",
url="http://github.com/JuulLabs-OSS/mcuboot",
Expand Down