This is an automated email from the ASF dual-hosted git repository. jerzy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 66c4d77c5d36a2ead95bf0bde1de36d8ea0e8675 Author: Wojciech Pietraszewski <[email protected]> AuthorDate: Mon May 29 14:41:22 2023 +0200 hw/bsp: nordic_pca10040 add syscfg selectable download script --- hw/bsp/nordic_pca10040/bsp.yml | 4 +-- hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd | 22 ------------ .../nordic_pca10040/nordic_pca10040_download.cmd | 22 ------------ hw/bsp/nordic_pca10040/nordic_pca10040_download.sh | 40 ---------------------- hw/bsp/nordic_pca10040/pkg.yml | 2 +- hw/bsp/nordic_pca10040/syscfg.yml | 6 ++++ 6 files changed, 8 insertions(+), 88 deletions(-) diff --git a/hw/bsp/nordic_pca10040/bsp.yml b/hw/bsp/nordic_pca10040/bsp.yml index 4e72502a9..a69e260cc 100644 --- a/hw/bsp/nordic_pca10040/bsp.yml +++ b/hw/bsp/nordic_pca10040/bsp.yml @@ -32,10 +32,8 @@ bsp.linkerscript.RAM_RESIDENT.OVERWRITE: - "hw/bsp/nordic_pca10040/boot-nrf52xxaa.ld" - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52_ram_resident.ld" bsp.part2linkerscript: "hw/bsp/nordic_pca10040/split-nordic_pca10040.ld" -bsp.downloadscript: "hw/bsp/nordic_pca10040/nordic_pca10040_download.sh" +bsp.downloadscript: "hw/scripts/download.sh" bsp.debugscript: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh" -bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd" -bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd" bsp.flash_map: areas: diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd deleted file mode 100755 index 96f0b2605..000000000 --- a/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd +++ /dev/null @@ -1,22 +0,0 @@ -@rem -@rem Licensed to the Apache Software Foundation (ASF) under one -@rem or more contributor license agreements. See the NOTICE file -@rem distributed with this work for additional information -@rem regarding copyright ownership. The ASF licenses this file -@rem to you under the Apache License, Version 2.0 (the -@rem "License"); you may not use this file except in compliance -@rem with the License. You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, -@rem software distributed under the License is distributed on an -@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@rem KIND, either express or implied. See the License for the -@rem specific language governing permissions and limitations -@rem under the License. -@rem - -@rem Execute a shell with a script of the same name and .sh extension - -@bash "%~dp0%~n0.sh" diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd deleted file mode 100755 index 96f0b2605..000000000 --- a/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd +++ /dev/null @@ -1,22 +0,0 @@ -@rem -@rem Licensed to the Apache Software Foundation (ASF) under one -@rem or more contributor license agreements. See the NOTICE file -@rem distributed with this work for additional information -@rem regarding copyright ownership. The ASF licenses this file -@rem to you under the Apache License, Version 2.0 (the -@rem "License"); you may not use this file except in compliance -@rem with the License. You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, -@rem software distributed under the License is distributed on an -@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@rem KIND, either express or implied. See the License for the -@rem specific language governing permissions and limitations -@rem under the License. -@rem - -@rem Execute a shell with a script of the same name and .sh extension - -@bash "%~dp0%~n0.sh" diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh b/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh deleted file mode 100755 index 08d45b464..000000000 --- a/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. - -# Called with following variables set: -# - CORE_PATH is absolute path to @apache-mynewt-core -# - BSP_PATH is absolute path to hw/bsp/bsp_name -# - BIN_BASENAME is the path to prefix to target binary, -# .elf appended to name is the ELF file -# - IMAGE_SLOT is the image slot to download to (for non-mfg-image, non-boot) -# - FEATURES holds the target features string -# - EXTRA_JTAG_CMD holds extra parameters to pass to jtag software -# - MFG_IMAGE is "1" if this is a manufacturing image -# - FLASH_OFFSET contains the flash offset to download to -# - BOOT_LOADER is set if downloading a bootloader - -. $CORE_PATH/hw/scripts/jlink.sh - -if [ "$MFG_IMAGE" ]; then - FLASH_OFFSET=0x0 -fi - -JLINK_DEV="nRF52" - -common_file_to_load -jlink_load diff --git a/hw/bsp/nordic_pca10040/pkg.yml b/hw/bsp/nordic_pca10040/pkg.yml index 3354359d8..62ff97fdf 100644 --- a/hw/bsp/nordic_pca10040/pkg.yml +++ b/hw/bsp/nordic_pca10040/pkg.yml @@ -37,6 +37,7 @@ pkg.cflags.HARDFLOAT: pkg.deps: - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx" - "@apache-mynewt-core/libc/baselibc" + - "@apache-mynewt-core/hw/scripts" pkg.deps.ENC_FLASH_DEV: - "@apache-mynewt-core/hw/drivers/flash/enc_flash/ef_nrf5x" @@ -46,4 +47,3 @@ pkg.deps.SOFT_PWM: pkg.deps.UARTBB_0: - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang" - diff --git a/hw/bsp/nordic_pca10040/syscfg.yml b/hw/bsp/nordic_pca10040/syscfg.yml index 61ba10f95..9bf07fb6a 100644 --- a/hw/bsp/nordic_pca10040/syscfg.yml +++ b/hw/bsp/nordic_pca10040/syscfg.yml @@ -61,6 +61,12 @@ syscfg.vals: MCU_LFCLK_SOURCE: LFXO BOOT_SERIAL_DETECT_PIN: 13 # Button 1 + # Flasher parameters + MYNEWT_DOWNLOADER: jlink + MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0 + PYOCD_TARGET: nrf52 + JLINK_TARGET: nRF52832_xxAA + syscfg.vals.BLE_CONTROLLER: TIMER_0: 0 TIMER_5: 1
