diff options
author | Tim Newsome <tim@sifive.com> | 2022-05-03 13:41:55 -0700 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2022-05-03 13:41:55 -0700 |
commit | 9460f43dc356829858bcb0057c7fe0dd7153c0c6 (patch) | |
tree | 51fa5e6f157caeffeec27d0dba117c01389f6d66 /tcl/target/gd32vf103.cfg | |
parent | b6dddfacc05ea981aabcf76ed155f68b677950a1 (diff) | |
parent | 66335683fec62ac89da48d64932fd9d082314225 (diff) | |
download | riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.zip riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.tar.gz riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.tar.bz2 |
Merge branch 'master' into from_upstream
Conflicts:
tcl/target/gd32vf103.cfg
I kept our version, except I changed the flash device as happened in
mainline. Once this file settles down in mainline, we can copy it
wholesale into this fork.
Change-Id: I4c5b21fec0734b5e08eba392883e006a46386b1c
Diffstat (limited to 'tcl/target/gd32vf103.cfg')
-rw-r--r-- | tcl/target/gd32vf103.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcl/target/gd32vf103.cfg b/tcl/target/gd32vf103.cfg index c7af88d..b00e5e9 100644 --- a/tcl/target/gd32vf103.cfg +++ b/tcl/target/gd32vf103.cfg @@ -22,7 +22,7 @@ default_mem_access $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x1000 -work-area-backup 1 set _FLASHNAME $_CHIPNAME.flash -flash bank $_FLASHNAME gd32vf103 0x08000000 0 0 0 $_TARGETNAME +flash bank $_FLASHNAME stm32f1x 0x08000000 0 0 0 $_TARGETNAME # Address 0 is only aliased to main flash when the chip is not running its # built-in bootloader. When it is, it's instead aliased to a read only section |