diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-02-13 21:54:46 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-02-13 21:54:46 -0700 |
| commit | e77c24aaaff12669ca6970dfcca770671387f59c (patch) | |
| tree | c8929f4a71290e3a3c3b6d717788ae1837b2dffa /src/stm/ao_flash_loader_stm.c | |
| parent | 85974eadfde6103d297498ee8c4268e28ab008ba (diff) | |
| parent | bf268354535a3a7b2e093235e5347ed2a6d809ff (diff) | |
Merge branch 'branch-1.3' into debian
Diffstat (limited to 'src/stm/ao_flash_loader_stm.c')
| -rw-r--r-- | src/stm/ao_flash_loader_stm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/stm/ao_flash_loader_stm.c b/src/stm/ao_flash_loader_stm.c index 2ab548cf..6bf89234 100644 --- a/src/stm/ao_flash_loader_stm.c +++ b/src/stm/ao_flash_loader_stm.c @@ -27,6 +27,13 @@ main(void) ao_usb_init(); +#if HAS_TICK + ao_timer_init(); +#endif + +#ifdef AO_FLASH_LOADER_INIT + AO_FLASH_LOADER_INIT; +#endif ao_flash_task(); return 0; } |