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/drivers.c | |
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/drivers.c')
-rw-r--r-- | src/flash/nor/drivers.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c index 56b451c..3f0c3c7 100644 --- a/src/flash/nor/drivers.c +++ b/src/flash/nor/drivers.c @@ -49,6 +49,7 @@ extern struct flash_driver lpcspifi_flash; extern struct flash_driver mdr_flash; extern struct flash_driver mrvlqspi_flash; extern struct flash_driver niietcm4_flash; +extern struct flash_driver nrf5_flash; extern struct flash_driver nrf51_flash; extern struct flash_driver numicro_flash; extern struct flash_driver ocl_flash; @@ -60,6 +61,7 @@ extern struct flash_driver stm32f1x_flash; extern struct flash_driver stm32f2x_flash; extern struct flash_driver stm32lx_flash; extern struct flash_driver stm32l4x_flash; +extern struct flash_driver stm32h7x_flash; extern struct flash_driver stmsmi_flash; extern struct flash_driver str7x_flash; extern struct flash_driver str9x_flash; @@ -103,6 +105,7 @@ static struct flash_driver *flash_drivers[] = { &mdr_flash, &mrvlqspi_flash, &niietcm4_flash, + &nrf5_flash, &nrf51_flash, &numicro_flash, &ocl_flash, @@ -114,6 +117,7 @@ static struct flash_driver *flash_drivers[] = { &stm32f2x_flash, &stm32lx_flash, &stm32l4x_flash, + &stm32h7x_flash, &stmsmi_flash, &str7x_flash, &str9x_flash, |