summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/main.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/apps/main.c b/apps/main.c
index 44a218ac77..dc36ce63fb 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -27,6 +27,9 @@
27#include "tree.h" 27#include "tree.h"
28#include "panic.h" 28#include "panic.h"
29#include "menu.h" 29#include "menu.h"
30#include "dmalloc.h"
31#include "bmalloc.h"
32#include "mpeg.h"
30 33
31void app_main(void) 34void app_main(void)
32{ 35{
@@ -35,9 +38,18 @@ void app_main(void)
35} 38}
36 39
37#ifndef SIMULATOR 40#ifndef SIMULATOR
41
42/* defined in linker script */
43extern int poolstart[];
44extern int poolend[];
45
38int init(void) 46int init(void)
39{ 47{
40 int rc; 48 int rc;
49
50 dmalloc_initialize();
51 bmalloc_add_pool(poolstart, poolend-poolstart);
52
41 debug_init(); 53 debug_init();
42 kernel_init(); 54 kernel_init();
43 set_irq_level(0); 55 set_irq_level(0);
@@ -55,6 +67,7 @@ int init(void)
55 panicf("mount: %d",rc); 67 panicf("mount: %d",rc);
56 68
57 button_init(); 69 button_init();
70 mpeg_init();
58 71
59 return 0; 72 return 0;
60} 73}