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 4411709bfc520719d1bb7675587e85f427d1d7db Author: Jerzy Kasenberg <[email protected]> AuthorDate: Mon May 22 11:04:14 2023 +0200 hw/bsp: nucleo-f411re add syscfg selectable download script Signed-off-by: Jerzy Kasenberg <[email protected]> --- hw/bsp/nucleo-f411re/bsp.yml | 4 +--- hw/bsp/nucleo-f411re/nucleo-f411re_debug.cmd | 22 ---------------------- hw/bsp/nucleo-f411re/nucleo-f411re_download.cmd | 22 ---------------------- hw/bsp/nucleo-f411re/pkg.yml | 1 + hw/bsp/nucleo-f411re/syscfg.yml | 4 ++++ 5 files changed, 6 insertions(+), 47 deletions(-) diff --git a/hw/bsp/nucleo-f411re/bsp.yml b/hw/bsp/nucleo-f411re/bsp.yml index 69f66430b..2d564dfa3 100644 --- a/hw/bsp/nucleo-f411re/bsp.yml +++ b/hw/bsp/nucleo-f411re/bsp.yml @@ -28,10 +28,8 @@ bsp.linkerscript: bsp.linkerscript.BOOT_LOADER.OVERWRITE: - "hw/bsp/nucleo-f411re/boot-nucleo-f411re.ld" - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f411.ld" -bsp.downloadscript: "hw/bsp/nucleo-f411re/nucleo-f411re_download.sh" +bsp.downloadscript: "hw/scripts/download.sh" bsp.debugscript: "hw/bsp/nucleo-f411re/nucleo-f411re_debug.sh" -bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nucleo-f411re/nucleo-f411re_download.cmd" -bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nucleo-f411re/nucleo-f411re_debug.cmd" bsp.flash_map: areas: diff --git a/hw/bsp/nucleo-f411re/nucleo-f411re_debug.cmd b/hw/bsp/nucleo-f411re/nucleo-f411re_debug.cmd deleted file mode 100644 index 96f0b2605..000000000 --- a/hw/bsp/nucleo-f411re/nucleo-f411re_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-f411re/nucleo-f411re_download.cmd b/hw/bsp/nucleo-f411re/nucleo-f411re_download.cmd deleted file mode 100644 index 96f0b2605..000000000 --- a/hw/bsp/nucleo-f411re/nucleo-f411re_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-f411re/pkg.yml b/hw/bsp/nucleo-f411re/pkg.yml index c0eb1732c..84138e843 100644 --- a/hw/bsp/nucleo-f411re/pkg.yml +++ b/hw/bsp/nucleo-f411re/pkg.yml @@ -37,3 +37,4 @@ pkg.cflags.HARDFLOAT: pkg.deps: - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx" - "@apache-mynewt-core/libc/baselibc" + - "@apache-mynewt-core/hw/scripts" diff --git a/hw/bsp/nucleo-f411re/syscfg.yml b/hw/bsp/nucleo-f411re/syscfg.yml index 280993d88..3a550e280 100644 --- a/hw/bsp/nucleo-f411re/syscfg.yml +++ b/hw/bsp/nucleo-f411re/syscfg.yml @@ -64,3 +64,7 @@ syscfg.vals: I2C_2_PIN_SCL: 'MCU_GPIO_PORTA(8)' I2C_2_PIN_SDA: 'MCU_GPIO_PORTC(9)' TIMER_0_TIM: 'TIM9' + MYNEWT_DOWNLOADER: stflash + MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x08000000 + PYOCD_TARGET: stm32f412xe + JLINK_TARGET: STM32F411RE
