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 c2631062b0005897f3a72b77dbea4af193711eca
Author: Wojciech Pietraszewski <wojciech.pietraszew...@codecoup.pl>
AuthorDate: Mon May 29 14:35:47 2023 +0200
hw/bsp: bluepill add syscfg selectable download script
---
hw/bsp/bluepill/bluepill_debug.cmd | 22 ----------------------
hw/bsp/bluepill/bluepill_download.cmd | 22 ----------------------
hw/bsp/bluepill/bsp.yml | 5 +----
hw/bsp/bluepill/pkg.yml | 1 +
hw/bsp/bluepill/syscfg.yml | 7 +++++++
5 files changed, 9 insertions(+), 48 deletions(-)
diff --git a/hw/bsp/bluepill/bluepill_debug.cmd
b/hw/bsp/bluepill/bluepill_debug.cmd
deleted file mode 100755
index 96f0b2605..000000000
--- a/hw/bsp/bluepill/bluepill_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/bluepill/bluepill_download.cmd
b/hw/bsp/bluepill/bluepill_download.cmd
deleted file mode 100755
index 96f0b2605..000000000
--- a/hw/bsp/bluepill/bluepill_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/bluepill/bsp.yml b/hw/bsp/bluepill/bsp.yml
index 52566d98a..74334b1fe 100644
--- a/hw/bsp/bluepill/bsp.yml
+++ b/hw/bsp/bluepill/bsp.yml
@@ -29,10 +29,8 @@ bsp.linkerscript:
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- 'hw/bsp/bluepill/boot-bluepill.ld'
- '@apache-mynewt-core/hw/mcu/stm/stm32f1xx/stm32f103.ld'
-bsp.downloadscript: "hw/bsp/bluepill/bluepill_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
bsp.debugscript: "hw/bsp/bluepill/bluepill_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/bluepill/bluepill_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/bluepill/bluepill_debug.cmd"
bsp.flash_map:
areas:
@@ -65,4 +63,3 @@ bsp.flash_map:
device: 0
offset: 0x08006000
size: 8kB
-
diff --git a/hw/bsp/bluepill/pkg.yml b/hw/bsp/bluepill/pkg.yml
index 81cd1905b..e896576d5 100644
--- a/hw/bsp/bluepill/pkg.yml
+++ b/hw/bsp/bluepill/pkg.yml
@@ -33,3 +33,4 @@ pkg.deps:
- '@apache-mynewt-core/hw/mcu/stm/stm32f1xx'
- '@apache-mynewt-core/kernel/os'
- '@apache-mynewt-core/libc/baselibc'
+ - "@apache-mynewt-core/hw/scripts"
diff --git a/hw/bsp/bluepill/syscfg.yml b/hw/bsp/bluepill/syscfg.yml
index 0b83d06a7..1bb32bdd8 100644
--- a/hw/bsp/bluepill/syscfg.yml
+++ b/hw/bsp/bluepill/syscfg.yml
@@ -52,3 +52,10 @@ syscfg.vals:
TIMER_0_TIM: 'TIM2'
TIMER_1_TIM: 'TIM3'
TIMER_2_TIM: 'TIM4'
+
+ # Flasher parameters
+ MYNEWT_DOWNLOADER: openocd
+ MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x08000000
+ MYNEWT_DOWNLOADER_OPENOCD_CFG:
'repos/apache-mynewt-core/hw/bsp/bluepill/bluepill.cfg'
+ JLINK_TARGET: STM32F103C8
+ PYOCD_TARGET: stm32f103rc
