summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-02-05 14:50:44 -0800
committerPixel <pixel@nobis-crew.org>2011-02-05 14:50:44 -0800
commit7531908ecb0e2b97e912ef9d779abe37a95632d7 (patch)
tree7792c7726583e18cb9d5ae9bea3c72c2690cdb3c
parentdf0cc5d42c6b6ce77b28b19415a2d25e41fb0b97 (diff)
Having the main demo using acorn.
-rw-r--r--Makefile2
-rw-r--r--demo.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b1294f8..d0580c0 100644
--- a/Makefile
+++ b/Makefile
@@ -83,4 +83,6 @@ include FreeRTOS/config.mk
include arch/config.mk
include os/config.mk
include libc/config.mk
+include libm/config.mk
+include acorn/config.mk
include target-rules.mk
diff --git a/demo.c b/demo.c
index d106f63..79e253c 100644
--- a/demo.c
+++ b/demo.c
@@ -8,6 +8,7 @@
#include <fio.h>
#include <romfs.h>
#include <semifs.h>
+#include <malloc_wrapper.h>
#define LED1_wire 18
#define LED2_wire 20
@@ -67,6 +68,7 @@ static const char msg[] = "Hello world - from fwrite!\r\n";
extern uint8_t _binary_test_romfs_bin_start[];
int main() {
+ init_malloc_wrapper();
FILE * f1, * f2, * f3;
char buf[32];
int c;