diff options
| author | Tim Newsome <tim@sifive.com> | 2017-12-22 13:03:58 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-12-22 13:03:58 -0800 |
| commit | d2c92be73f05e7e6aab5d3d88172e9768f2301d9 (patch) | |
| tree | 9fbf82d9d4332f67831cfb098e21b6085da7f497 /src/flash/nor/Makefile.am | |
| parent | 6c719f0ab838e6804500fa8ac6917b34a78ecf3e (diff) | |
| parent | 1c2e3d41de30c5e47d3fc8eda3de0a0a8229895a (diff) | |
| download | riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.zip riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.tar.gz riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.tar.bz2 | |
Merge branch 'master' into update
Change-Id: Icec244b174cc0c67ab58961649a369db7f344824
Diffstat (limited to 'src/flash/nor/Makefile.am')
| -rw-r--r-- | src/flash/nor/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index c647cbb..8a57f4f 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -37,7 +37,7 @@ NOR_DRIVERS = \ %D%/mrvlqspi.c \ %D%/niietcm4.c \ %D%/non_cfi.c \ - %D%/nrf51.c \ + %D%/nrf5.c \ %D%/numicro.c \ %D%/ocl.c \ %D%/pic32mx.c \ @@ -50,6 +50,7 @@ NOR_DRIVERS = \ %D%/stm32f2x.c \ %D%/stm32lx.c \ %D%/stm32l4x.c \ + %D%/stm32h7x.c \ %D%/str7x.c \ %D%/str9x.c \ %D%/str9xpec.c \ |