RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Revert "boards/nucleo-f767zi: add correct flash bank openocd config"

Browse Source 
This reverts commits:
    - 1dec5ba61b
    - 53f60db66f
This commit is contained in:
Karl Fessel 2020-02-28 13:51:58 +01:00
parent ad7c19d584
commit 979b4d5cf7
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/common/stm32/dist/stm32f7.cfg vendored
View File

@ -1,9 +1,3 @@
source [find target/stm32f7x.cfg] source [find target/stm32f7x.cfg]
# specify flash start address: since target/stm32f7x.cfg doesn't, this
# can be used as backup in case probing fails. When correct address is
# given, the flash size is obtained from hardware so no need to specify.
flash bank $_FLASHNAME.riot stm32f2x 0x08000000 0 0 0 $_TARGETNAME
reset_config srst_only reset_config srst_only
$_TARGETNAME configure -rtos auto $_TARGETNAME configure -rtos auto

10
boards/nucleo-f767zi/Makefile.include
View File

@ -1,12 +1,2 @@
# load the common Makefile.include for Nucleo boards # load the common Makefile.include for Nucleo boards
include $(RIOTBOARD)/common/nucleo144/Makefile.include include $(RIOTBOARD)/common/nucleo144/Makefile.include
# openocd configuration file for `stm32f7` relies on probing to find out
# FLASH_ADDR. On this board probing (`flash probe 0`) fails when `srst` is
# asserted, but `srst` needs to be asserted to be able to flash the `BOARD`
# when sleeping or after a hardfault.
# To circumvent this in boards/common/stm32/dist/stm32f7.cfg we define a new
# flash bank with the appropriate flash start address and specify that this is
# the flash bank to be used as default configuration instead of the default (1)
FLASH_BANK ?= 4
$(call target-export-variables,flash flash-only,FLASH_BANK)

7
dist/tools/openocd/openocd.sh vendored
View File

@ -109,10 +109,6 @@
# Valid values: elf, hex, s19, bin (see OpenOCD manual for more information) # Valid values: elf, hex, s19, bin (see OpenOCD manual for more information)
: ${IMAGE_TYPE:=} : ${IMAGE_TYPE:=}
# flash bank to read default configuration when probing fails, default to first
# bank
: ${FLASH_BANK:=1}
# #
# Examples of alternative debugger configurations # Examples of alternative debugger configurations
# #
@ -273,7 +269,8 @@ do_flash() {
# In case of binary file, IMAGE_OFFSET should include the flash base address # In case of binary file, IMAGE_OFFSET should include the flash base address
# This allows flashing normal binary files without env configuration # This allows flashing normal binary files without env configuration
if _is_binfile "${IMAGE_FILE}" "${IMAGE_TYPE}"; then if _is_binfile "${IMAGE_FILE}" "${IMAGE_TYPE}"; then
FLASH_ADDR=$(_flash_address ${FLASH_BANK}) # hardwritten to use the first bank
FLASH_ADDR=$(_flash_address 1)
echo "Binfile detected, adding ROM base address: ${FLASH_ADDR}" echo "Binfile detected, adding ROM base address: ${FLASH_ADDR}"
IMAGE_TYPE=bin IMAGE_TYPE=bin
IMAGE_OFFSET=$(printf "0x%08x\n" "$((${IMAGE_OFFSET} + ${FLASH_ADDR}))") IMAGE_OFFSET=$(printf "0x%08x\n" "$((${IMAGE_OFFSET} + ${FLASH_ADDR}))")