From 686c534391639ad48001329463221114f202808a Mon Sep 17 00:00:00 2001 From: Jakub Date: Wed, 25 May 2022 16:48:14 +0200 Subject: [PATCH] da1469x: Specify custom location of da1469x_flash_loader User may now use the mynewt value FLASH_LOADER_TARGET in bootloader target to specify the da1469x_flash_loader target location. --- hw/bsp/dialog_da1469x-dk-pro/syscfg.yml | 6 ++++++ .../dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml index 42d30461f9..48075c9d57 100644 --- a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml +++ b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml @@ -51,6 +51,12 @@ syscfg.defs: - 331_O7_B - 331_O7_C + FLASH_LOADER_TARGET: + description: > + Flash loader target name. Used when da1469x bootloader is placed + in other folder than /targets. + value: 'targets/da1469x_flash_loader' + syscfg.defs.BUS_DRIVER_PRESENT: BSP_FLASH_SPI_NAME: description: 'SPIFLASH device name' diff --git a/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh b/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh index 4feea8023c..63bee6a2a7 100755 --- a/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh +++ b/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh @@ -47,8 +47,8 @@ JLINK_LOG_FILE=.jlink_log # flash_loader build for this BSP if [ -z $FLASH_LOADER ]; then - FL_TGT=da1469x_flash_loader - FLASH_LOADER=$BIN_ROOT/targets/$FL_TGT/app/@apache-mynewt-core/apps/flash_loader/flash_loader.elf + FL_TGT=${MYNEWT_VAL_FLASH_LOADER_TARGET} + FLASH_LOADER=$BIN_ROOT/$FL_TGT/app/@apache-mynewt-core/apps/flash_loader/flash_loader.elf fi if [ ! -f $FLASH_LOADER ]; then FILE=${FLASH_LOADER##$(pwd)/}