diff options
| author | Tim Newsome <tim@sifive.com> | 2018-04-09 12:17:08 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2018-04-09 12:17:08 -0700 |
| commit | c73e06809d6db1bc9264ac94459d55ed62aea39c (patch) | |
| tree | 4c0d85f4bbf564583e2c3bacd0eb053b89116325 /src/flash/nor/ocl.c | |
| parent | 11445b298a23e93dcd886bed611e68ad37c0ea6d (diff) | |
| parent | be87994d60457ac846740dd9e5df3c8f63cf646e (diff) | |
| download | riscv-openocd-c73e06809d6db1bc9264ac94459d55ed62aea39c.zip riscv-openocd-c73e06809d6db1bc9264ac94459d55ed62aea39c.tar.gz riscv-openocd-c73e06809d6db1bc9264ac94459d55ed62aea39c.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/rtos/rtos.c
src/rtos/rtos.h
src/server/gdb_server.c
Change-Id: Icd5a8165fe111f699542530c9cb034faf30e09b2
Diffstat (limited to 'src/flash/nor/ocl.c')
| -rw-r--r-- | src/flash/nor/ocl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c index 4ae5652..895c4af 100644 --- a/src/flash/nor/ocl.c +++ b/src/flash/nor/ocl.c @@ -340,4 +340,5 @@ struct flash_driver ocl_flash = { .erase_check = ocl_erase_check, .protect_check = ocl_protect_check, .auto_probe = ocl_auto_probe, + .free_driver_priv = default_flash_free_driver_priv, }; |