summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-07-05 18:01:53 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-07-05 18:01:53 +0200
commita9526a6237422027476588422b2bac34967581e2 (patch)
tree7dc56d8c5b98e136b9417b6ca6a918a510bd64db
parent07045831cdff78eb39fe9a1a830cd91cc02178f8 (diff)
downloadbarebox-a9526a6237422027476588422b2bac34967581e2.tar.gz
barebox-a9526a6237422027476588422b2bac34967581e2.tar.xz
svn_rev_431
-rw-r--r--arch/arm/lib/arm.c4
-rw-r--r--arch/arm/lib/armlinux.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c
index adfc4d2dd7..a71f19db40 100644
--- a/arch/arm/lib/arm.c
+++ b/arch/arm/lib/arm.c
@@ -4,8 +4,8 @@
int arm_mem_malloc_init(void)
{
- mem_malloc_init(_armboot_start - CFG_MALLOC_LEN,
- _armboot_start);
+ mem_malloc_init((void *)(_armboot_start - CFG_MALLOC_LEN),
+ (void *)_armboot_start);
return 0;
}
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 323948f204..760a7fb56a 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -27,6 +27,7 @@
#include <image.h>
#include <zlib.h>
#include <asm/byteorder.h>
+#include <environment.h>
DECLARE_GLOBAL_DATA_PTR;