Merge pull request #12101 from rajkan01/feature_crash_report_fix

Bare metal: Retrieve error context after crash
pull/12132/head
Anna Bridge 2019-12-17 16:27:59 +00:00 committed by GitHub
commit 806ad39648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -13,9 +13,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#if !defined(MBED_CONF_RTOS_PRESENT)
#error [NOT_SUPPORTED] crash_reporting test cases require a RTOS to run.
#else
#include "mbed.h" #include "mbed.h"
#include "mbed_error.h" #include "mbed_error.h"
#include "mbed_crash_data_offsets.h" #include "mbed_crash_data_offsets.h"
@ -83,4 +80,3 @@ int main(void)
} }
#endif // !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED #endif // !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED
#endif // !defined(MBED_CONF_RTOS_PRESENT)

View File

@ -76,6 +76,7 @@ int $Super$$main(void);
int $Sub$$main(void) int $Sub$$main(void)
{ {
mbed_main(); mbed_main();
mbed_error_initialize();
return $Super$$main(); return $Super$$main();
} }
@ -109,6 +110,7 @@ void software_init_hook(void)
int __wrap_main(void) int __wrap_main(void)
{ {
mbed_main(); mbed_main();
mbed_error_initialize();
return __real_main(); return __real_main();
} }