[PATCH 1/2] ARM: pxa: RAM and console fixes for zylonite

[Robert Jarzmik]

There is at least one zylonite variant with a PXA311 and only 64 MB of
memory, while the other variants have at least 128 MB.
As 64 MB is the smallest common denominator, tell barebox to use only
the 64 MB bytes.

At the same time, fix the kernel command line to use only these 64 MB,
and output log on the console.

Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
---
 arch/arm/boards/zylonite/board.c    | 2 +-
 arch/arm/boards/zylonite/env/config | 2 +-
 arch/arm/boards/zylonite/lowlevel.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boards/zylonite/board.c b/arch/arm/boards/zylonite/board.c
index 96357a5..dabc6ff 100644
--- a/arch/arm/boards/zylonite/board.c
+++ b/arch/arm/boards/zylonite/board.c
@@ -95,7 +95,7 @@ coredevice_initcall(zylonite_coredevice_init);
 
 static int zylonite_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 128 * 1024 * 1024);
+	arm_add_mem_device("ram0", 0x80000000, 64 * 1024 * 1024);
 	return 0;
 }
 mem_initcall(zylonite_mem_init);
diff --git a/arch/arm/boards/zylonite/env/config b/arch/arm/boards/zylonite/env/config
index 56ee90f..ee66e37 100644
--- a/arch/arm/boards/zylonite/env/config
+++ b/arch/arm/boards/zylonite/env/config
@@ -3,4 +3,4 @@
 autoboot_timeout=3
 
 mtdparts="128k at 0(TIMH)ro,128k at 128k(OBMI)ro,768k at 256k(barebox),256k at 1024k(barebox-env),12M at 1280k(kernel),38016k at 13568k(root)"
-bootargs="$bootargs mtdparts=pxa3xx-nand.0:$mtdparts ubi.mtd=6 rootfstype=ubifs root=ubi0:linux_root ro"
+bootargs="$bootargs mtdparts=pxa3xx_nand-0:$mtdparts ubi.mtd=5 rootfstype=ubifs root=ubi0:root ro ram=64M console=ttyS0,115200"
diff --git a/arch/arm/boards/zylonite/lowlevel.c b/arch/arm/boards/zylonite/lowlevel.c
index 5c43679..9f1aa66 100644
--- a/arch/arm/boards/zylonite/lowlevel.c
+++ b/arch/arm/boards/zylonite/lowlevel.c
@@ -6,5 +6,5 @@
 void __naked barebox_arm_reset_vector(void)
 {
 	arm_cpu_lowlevel_init();
-	barebox_arm_entry(0x80000000, SZ_128M, NULL);
+	barebox_arm_entry(0x80000000, SZ_64M, NULL);
 }
-- 
2.1.0