utzig closed pull request #1092: Fix nucleo767 BSP naming convention
URL: https://github.com/apache/mynewt-core/pull/1092
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/bsp/stm32f767-nucleo/boot-stm32f767-nucleo.ld
b/hw/bsp/nucleo-f767zi/boot-nucleo-f767zi.ld
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/boot-stm32f767-nucleo.ld
rename to hw/bsp/nucleo-f767zi/boot-nucleo-f767zi.ld
diff --git a/hw/bsp/stm32f767-nucleo/bsp.yml b/hw/bsp/nucleo-f767zi/bsp.yml
similarity index 81%
rename from hw/bsp/stm32f767-nucleo/bsp.yml
rename to hw/bsp/nucleo-f767zi/bsp.yml
index 50a9a6bd22..65766c94aa 100644
--- a/hw/bsp/stm32f767-nucleo/bsp.yml
+++ b/hw/bsp/nucleo-f767zi/bsp.yml
@@ -20,15 +20,15 @@
bsp.arch: cortex_m7
bsp.compiler: compiler/arm-none-eabi-m7
bsp.linkerscript:
- - "hw/bsp/stm32f767-nucleo/stm32f767-nucleo.ld"
+ - "hw/bsp/nucleo-f767zi/nucleo-f767zi.ld"
- "hw/mcu/stm/stm32f7xx/stm32f767.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "hw/bsp/stm32f767-nucleo/boot-stm32f767-nucleo.ld"
+ - "hw/bsp/nucleo-f767zi/boot-nucleo-f767zi.ld"
- "hw/mcu/stm/stm32f7xx/stm32f767.ld"
-bsp.downloadscript: "hw/bsp/stm32f767-nucleo/nucleo767_download.sh"
-bsp.debugscript: "hw/bsp/stm32f767-nucleo/nucleo767_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE:
"hw/bsp/stm32f767-nucleo/nucleo767_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE:
"hw/bsp/stm32f767-nucleo/nucleo767_debug.cmd"
+bsp.downloadscript: "hw/bsp/nucleo-f767zi/nucleo-f767zi_download.sh"
+bsp.debugscript: "hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.sh"
+bsp.downloadscript.WINDOWS.OVERWRITE:
"hw/bsp/nucleo-f767zi/nucleo-f767zi_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE:
"hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.cmd"
bsp.flash_map:
areas:
diff --git a/hw/bsp/stm32f767-nucleo/include/bsp/bsp.h
b/hw/bsp/nucleo-f767zi/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/include/bsp/bsp.h
rename to hw/bsp/nucleo-f767zi/include/bsp/bsp.h
diff --git a/hw/bsp/stm32f767-nucleo/include/bsp/stm32f7xx_hal_conf.h
b/hw/bsp/nucleo-f767zi/include/bsp/stm32f7xx_hal_conf.h
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/include/bsp/stm32f7xx_hal_conf.h
rename to hw/bsp/nucleo-f767zi/include/bsp/stm32f7xx_hal_conf.h
diff --git a/hw/bsp/stm32f767-nucleo/nucleo767.cfg
b/hw/bsp/nucleo-f767zi/nucleo-f767zi.cfg
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/nucleo767.cfg
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi.cfg
diff --git a/hw/bsp/stm32f767-nucleo/stm32f767-nucleo.ld
b/hw/bsp/nucleo-f767zi/nucleo-f767zi.ld
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/stm32f767-nucleo.ld
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi.ld
diff --git a/hw/bsp/stm32f767-nucleo/nucleo767_debug.cmd
b/hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.cmd
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/nucleo767_debug.cmd
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.cmd
diff --git a/hw/bsp/stm32f767-nucleo/nucleo767_debug.sh
b/hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.sh
similarity index 96%
rename from hw/bsp/stm32f767-nucleo/nucleo767_debug.sh
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.sh
index 5e548be6f7..3ee5cb494d 100755
--- a/hw/bsp/stm32f767-nucleo/nucleo767_debug.sh
+++ b/hw/bsp/nucleo-f767zi/nucleo-f767zi_debug.sh
@@ -30,7 +30,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
FILE_NAME=$BIN_BASENAME.elf
-CFG="-s $BSP_PATH -f $BSP_PATH/nucleo767.cfg"
+CFG="-s $BSP_PATH -f $BSP_PATH/nucleo-f767zi.cfg"
# Exit openocd when gdb detaches.
EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; stm32f7x.cpu configure -event gdb-detach {if
{[stm32f7x.cpu curstate] eq \"halted\"} resume;shutdown}"
diff --git a/hw/bsp/stm32f767-nucleo/nucleo767_download.cmd
b/hw/bsp/nucleo-f767zi/nucleo-f767zi_download.cmd
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/nucleo767_download.cmd
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi_download.cmd
diff --git a/hw/bsp/stm32f767-nucleo/nucleo767_download.sh
b/hw/bsp/nucleo-f767zi/nucleo-f767zi_download.sh
similarity index 97%
rename from hw/bsp/stm32f767-nucleo/nucleo767_download.sh
rename to hw/bsp/nucleo-f767zi/nucleo-f767zi_download.sh
index 74532fbc9f..c4c4c2a363 100755
--- a/hw/bsp/stm32f767-nucleo/nucleo767_download.sh
+++ b/hw/bsp/nucleo-f767zi/nucleo-f767zi_download.sh
@@ -30,7 +30,7 @@
# - BOOT_LOADER is set if downloading a bootloader
. $CORE_PATH/hw/scripts/openocd.sh
-CFG="-s $BSP_PATH -f nucleo767.cfg"
+CFG="-s $BSP_PATH -f nucleo-f767zi.cfg"
if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x08000000
diff --git a/hw/bsp/stm32f767-nucleo/pkg.yml b/hw/bsp/nucleo-f767zi/pkg.yml
similarity index 97%
rename from hw/bsp/stm32f767-nucleo/pkg.yml
rename to hw/bsp/nucleo-f767zi/pkg.yml
index 9944be5fc8..c246547f3a 100644
--- a/hw/bsp/stm32f767-nucleo/pkg.yml
+++ b/hw/bsp/nucleo-f767zi/pkg.yml
@@ -17,7 +17,7 @@
# under the License.
#
-pkg.name: hw/bsp/stm32f767-nucleo
+pkg.name: hw/bsp/nucleo-f767zi
pkg.type: bsp
pkg.description: BSP definition for the stm32f767-nucleo board.
pkg.author: "Apache Mynewt <d...@mynewt.apache.org>"
diff --git a/hw/bsp/stm32f767-nucleo/src/arch/cortex_m7/startup_stm32f767xx.s
b/hw/bsp/nucleo-f767zi/src/arch/cortex_m7/startup_stm32f767xx.s
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/src/arch/cortex_m7/startup_stm32f767xx.s
rename to hw/bsp/nucleo-f767zi/src/arch/cortex_m7/startup_stm32f767xx.s
diff --git a/hw/bsp/stm32f767-nucleo/src/hal_bsp.c
b/hw/bsp/nucleo-f767zi/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/src/hal_bsp.c
rename to hw/bsp/nucleo-f767zi/src/hal_bsp.c
diff --git a/hw/bsp/stm32f767-nucleo/src/system_stm32f7xx.c
b/hw/bsp/nucleo-f767zi/src/system_stm32f7xx.c
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/src/system_stm32f7xx.c
rename to hw/bsp/nucleo-f767zi/src/system_stm32f7xx.c
diff --git a/hw/bsp/stm32f767-nucleo/syscfg.yml
b/hw/bsp/nucleo-f767zi/syscfg.yml
similarity index 100%
rename from hw/bsp/stm32f767-nucleo/syscfg.yml
rename to hw/bsp/nucleo-f767zi/syscfg.yml
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
