summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2015-01-21 04:02:39 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-21 10:42:24 +0100
commitf8ba8d687de8e7de0e0c1997dd4357b246ab9e47 (patch)
tree647aa8855b22540e991615861f7e58584ac9c000 /arch
parentad3c55fbf27a134dc678a9c40922a04d1c697064 (diff)
downloadbarebox-f8ba8d687de8e7de0e0c1997dd4357b246ab9e47.tar.gz
barebox-f8ba8d687de8e7de0e0c1997dd4357b246ab9e47.tar.xz
sandbox: get malloc_size from .config
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/os/Makefile2
-rw-r--r--arch/sandbox/os/common.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 2e65be5eed..537f848e06 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -8,6 +8,8 @@ else
CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs))
endif
+CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE)
+
CFLAGS := -Wall
NOSTDINC_FLAGS :=
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 412393811e..0854fb5d80 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
{
void *ram;
int opt, ret, fd;
- int malloc_size = 8 * 1024 * 1024;
+ int malloc_size = CONFIG_MALLOC_SIZE;
char str[6];
int fdno = 0, envno = 0, option_index = 0;