]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/trax' into 'master'
authorJeroen Domburg <jeroen@espressif.com>
Fri, 21 Oct 2016 10:16:12 +0000 (18:16 +0800)
committerJeroen Domburg <jeroen@espressif.com>
Fri, 21 Oct 2016 10:16:12 +0000 (18:16 +0800)
Feature/trax

Add Trax support to esp-idf. OpenOCD already has trax support, this allows an esp-idf program to also trigger this when needed. Also included: some more logic to correctly reserve memory blocks for Trax.

See merge request !73


Trivial merge