diff options
| author | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
| commit | 1c6d52cd88076cf22e55e0294cbb9751a3492470 (patch) | |
| tree | aaa36ec90b01caccadfe2c07932f2a22e3967d0c /src/rtos/rtos.c | |
| parent | 80ef54dba2411f9354b3793d5832c5d8ad871b4b (diff) | |
| parent | 6c2020eb48803b941a94d600e2a96728d05a7da9 (diff) | |
| download | riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.zip riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.gz riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
README
contrib/loaders/flash/fespi/Makefile
src/flash/nor/fespi.c
src/flash/nor/spi.c
Change-Id: I78a4e73685cc95daace95e9d16066a6fb51034fb
Diffstat (limited to 'src/rtos/rtos.c')
| -rw-r--r-- | src/rtos/rtos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index a7c28f9..d4eff5b 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -32,6 +32,7 @@ extern struct rtos_type ThreadX_rtos; extern struct rtos_type eCos_rtos; extern struct rtos_type Linux_os; extern struct rtos_type ChibiOS_rtos; +extern struct rtos_type chromium_ec_rtos; extern struct rtos_type embKernel_rtos; extern struct rtos_type mqx_rtos; extern struct rtos_type uCOS_III_rtos; @@ -45,6 +46,7 @@ static struct rtos_type *rtos_types[] = { &eCos_rtos, &Linux_os, &ChibiOS_rtos, + &chromium_ec_rtos, &embKernel_rtos, &mqx_rtos, &uCOS_III_rtos, |