summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-04-16 16:47:48 +0800
committerBernard Xiong <[email protected]>2015-04-24 11:48:24 +0800
commit9339c2d96eb3070428e091984f514686e80e080a (patch)
tree394cf16609fc2cd61f8359efe378d3ba584d6d8d /src
parent1bf01f0d3861741f4b8a2c8e65c1fb3954a660cb (diff)
[Kernel] Fix main() issue in Keil MDK
Diffstat (limited to 'src')
-rw-r--r--src/init.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/init.c b/src/init.c
index 56b7e0bf8d..b697b73180 100644
--- a/src/init.c
+++ b/src/init.c
@@ -149,13 +149,14 @@ struct rt_thread main_thread;
void main_thread_entry(void *parameter)
{
extern int main(void);
+ extern int $Super$$main(void);
/* RT-Thread components initialization */
rt_components_init();
/* invoke system main function */
#ifdef __CC_ARM
- $Sub$$main();
+ $Super$$main(); /* for ARMCC. */
#else
main();
#endif
@@ -183,6 +184,8 @@ void rt_application_init(void)
int rtthread_startup(void)
{
+ rt_hw_interrupt_disable();
+
/* board level initalization
* NOTE: please initialize heap inside board initialization.
*/