Remove reference to MERGEHEX as it's not needed anymore.

This commit is contained in:
JF 2020-06-16 20:44:55 +02:00
parent f133d1e9ea
commit 5faa68ba1a

View file

@ -92,14 +92,14 @@ GDB (Back Magic Probe)
``` ```
$ mkdir build $ mkdir build
$ cd build $ cd build
$ cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=... -DUSE_GDB_CLIENT=1 -DGDB_CLIENT_BIN_PATH=... -DGDB_CLIENT_TARGET_REMOTE=... -DMERGEHEX=... ../ $ cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=... -DUSE_GDB_CLIENT=1 -DGDB_CLIENT_BIN_PATH=... -DGDB_CLIENT_TARGET_REMOTE=... ../
``` ```
OpenOCD (STlink v2 clones) OpenOCD (STlink v2 clones)
``` ```
$ mkdir build $ mkdir build
$ cd build $ cd build
$ cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=... -DUSE_OPENOCD=1 -DGDB_CLIENT_BIN_PATH=[optional] -DMERGEHEX=... ../ $ cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=... -DUSE_OPENOCD=1 -DGDB_CLIENT_BIN_PATH=[optional] ../
``` ```
* Make * Make