summaryrefslogtreecommitdiffstats
path: root/common/memory.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-12-07 13:04:25 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-07 13:04:25 +0100
commit7e3a33198aa1637952cc68b7aee8c2a324c88506 (patch)
treea161106a0c7ae18c49cd7ad0a1862845150282f2 /common/memory.c
parent249a1ba06eb1ae4eedcf043ad1c3086110204f67 (diff)
downloadbarebox-7e3a33198aa1637952cc68b7aee8c2a324c88506.tar.gz
memory: do not try to reserve iomem on sandbox
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/memory.c')
-rw-r--r--common/memory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/memory.c b/common/memory.c
index 7d0f4ca..1d72888 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -53,6 +53,7 @@ void mem_malloc_init(void *start, void *end)
malloc_brk = malloc_start;
}
+#ifndef __SANDBOX__
static int mem_malloc_resource(void)
{
/*
@@ -75,10 +76,10 @@ static int mem_malloc_resource(void)
#ifdef STACK_BASE
request_sdram_region("stack", STACK_BASE, STACK_SIZE);
#endif
-
return 0;
}
coredevice_initcall(mem_malloc_resource);
+#endif
static void *sbrk_no_zero(ptrdiff_t increment)
{