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 125e6f22ff0a5af5bfeb13fd6174209b80c6b177
Author: Wojciech Pietraszewski <wojciech.pietraszew...@codecoup.pl>
AuthorDate: Fri May 26 14:43:18 2023 +0200
hw/bsp: nucleo-f103rb add syscfg selectable download script
---
hw/bsp/nucleo-f103rb/bsp.yml | 4 +--
hw/bsp/nucleo-f103rb/nucleo_f103rb_debug.cmd | 22 --------------
hw/bsp/nucleo-f103rb/nucleo_f103rb_download.cmd | 22 --------------
hw/bsp/nucleo-f103rb/nucleo_f103rb_download.sh | 39 -------------------------
hw/bsp/nucleo-f103rb/pkg.yml | 1 +
hw/bsp/nucleo-f103rb/syscfg.yml | 6 ++++
6 files changed, 8 insertions(+), 86 deletions(-)
diff --git a/hw/bsp/nucleo-f103rb/bsp.yml b/hw/bsp/nucleo-f103rb/bsp.yml
index 2e13b5afb..d124973da 100644
--- a/hw/bsp/nucleo-f103rb/bsp.yml
+++ b/hw/bsp/nucleo-f103rb/bsp.yml
@@ -28,10 +28,8 @@ bsp.linkerscript:
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- "hw/bsp/nucleo-f103rb/boot-nucleo_f103rb.ld"
- "@apache-mynewt-core/hw/mcu/stm/stm32f1xx/stm32f103.ld"
-bsp.downloadscript: "hw/bsp/nucleo-f103rb/nucleo_f103rb_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
bsp.debugscript: "hw/bsp/nucleo-f103rb/nucleo_f103rb_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE:
"hw/bsp/nucleo-f103rb/nucleo_f103rb_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE:
"hw/bsp/nucleo-f103rb/nucleo_f103rb_debug.cmd"
bsp.flash_map:
areas:
diff --git a/hw/bsp/nucleo-f103rb/nucleo_f103rb_debug.cmd
b/hw/bsp/nucleo-f103rb/nucleo_f103rb_debug.cmd
deleted file mode 100755
index 96f0b2605..000000000
--- a/hw/bsp/nucleo-f103rb/nucleo_f103rb_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/nucleo-f103rb/nucleo_f103rb_download.cmd
b/hw/bsp/nucleo-f103rb/nucleo_f103rb_download.cmd
deleted file mode 100755
index 96f0b2605..000000000
--- a/hw/bsp/nucleo-f103rb/nucleo_f103rb_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/nucleo-f103rb/nucleo_f103rb_download.sh
b/hw/bsp/nucleo-f103rb/nucleo_f103rb_download.sh
deleted file mode 100755
index 5d6d649ab..000000000
--- a/hw/bsp/nucleo-f103rb/nucleo_f103rb_download.sh
+++ /dev/null
@@ -1,39 +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/stlink.sh
-
-if [ "$MFG_IMAGE" ]; then
- FLASH_OFFSET=0x08000000
-fi
-
-common_file_to_load
-stlink_load
diff --git a/hw/bsp/nucleo-f103rb/pkg.yml b/hw/bsp/nucleo-f103rb/pkg.yml
index 0e98deb41..8e97bb21d 100644
--- a/hw/bsp/nucleo-f103rb/pkg.yml
+++ b/hw/bsp/nucleo-f103rb/pkg.yml
@@ -31,3 +31,4 @@ pkg.cflags: -DSTM32F103xB
pkg.deps:
- "@apache-mynewt-core/hw/mcu/stm/stm32f1xx"
- "@apache-mynewt-core/libc/baselibc"
+ - "@apache-mynewt-core/hw/scripts"
diff --git a/hw/bsp/nucleo-f103rb/syscfg.yml b/hw/bsp/nucleo-f103rb/syscfg.yml
index 41f8273a9..73b2fa62e 100644
--- a/hw/bsp/nucleo-f103rb/syscfg.yml
+++ b/hw/bsp/nucleo-f103rb/syscfg.yml
@@ -56,3 +56,9 @@ syscfg.vals:
TIMER_0_TIM: 'TIM2'
TIMER_1_TIM: 'TIM3'
TIMER_2_TIM: 'TIM4'
+
+ # Flasher parameters
+ MYNEWT_DOWNLOADER: stflash
+ MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x08000000
+ PYOCD_TARGET: stm32f103rc
+ JLINK_TARGET: STM32F103RB
