michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: bl654_usb: Fix non-mcuboot builds not limiting size

Browse source 
This limits non-mcuboot builds to have a maximum size of 892KB to
prevent code being placed over the top of the bootloader's flash area.

Signed-off-by: Jamie McCrae <jamie.mccrae@lairdconnect.com>
This commit is contained in:
Jamie McCrae 2022-04-05 08:12:39 +01:00 • committed by Carles Cufí
commit 54e6d8435a
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
boards/arm/bl654_usb/Kconfig.defconfig
View file

@ -1,6 +1,6 @@
# BL654 USB adapter board configuration # BL654 USB adapter board configuration
# Copyright (c) 2021 Laird Connectivity # Copyright (c) 2021-2022 Laird Connectivity
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if BOARD_BL654_USB if BOARD_BL654_USB
@ -13,16 +13,21 @@ config BOARD
# Nordic nRF5 bootloader exists outside of the partitions specified in the # Nordic nRF5 bootloader exists outside of the partitions specified in the
# DTS file, so we manually override FLASH_LOAD_OFFSET to link the application # DTS file, so we manually override FLASH_LOAD_OFFSET to link the application
# correctly, after Nordic MBR. # correctly, after Nordic MBR, and limit the maximum size to not protude into
# the bootloader at the end of flash.
# When building MCUBoot, MCUBoot itself will select USE_DT_CODE_PARTITION # When building MCUBoot, MCUBoot itself will select USE_DT_CODE_PARTITION
# which will make it link into the correct partition specified in DTS file, # which will make it link into the correct partition specified in DTS file,
# so no override is necessary. # so no override or limit is necessary.
config FLASH_LOAD_OFFSET config FLASH_LOAD_OFFSET
default 0x1000 default 0x1000
depends on !USE_DT_CODE_PARTITION depends on !USE_DT_CODE_PARTITION
config FLASH_LOAD_SIZE
default 0xdf000
depends on !USE_DT_CODE_PARTITION
config USB_CDC_ACM config USB_CDC_ACM
default n if USB_DEVICE_BLUETOOTH default n if USB_DEVICE_BLUETOOTH