[oe] [meta-handheld][PATCH] Revert "zaurus collie: remove hardcoded mem=64M"

[Andrea Adami]

Unfortunately the default for sa1100/collie is 16M so for collie it is necessary
to specify mem=64M on cmdline.
The very rare 5000D users will have to change that to mem=32M.

This reverts commit f4f05028f5ad72a81d6620340fe1c92ac6486890.

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 conf/machine/include/zaurus.inc                                       | 2 +-
 recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg               | 2 +-
 recipes-kernel/linux/linux-yocto-3.14/collie/defconfig                | 2 +-
 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc
index 1f1d28f..f74b987 100644
--- a/conf/machine/include/zaurus.inc
+++ b/conf/machine/include/zaurus.inc
@@ -39,7 +39,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_c7x0 = "console=ttyS0,115200n8 console=tty1"
-CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 fbcon=rotate:1"
+CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1"
 CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1"
diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
index 323893e..5238c69 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
@@ -47,7 +47,7 @@ CONFIG_SPARSEMEM_EXTREME=y
 #
 # Boot options
 #
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
 
 #
 # RAM/ROM/Flash chip drivers
diff --git a/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig b/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
index 32877cd..36ceadb 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
@@ -50,7 +50,7 @@ CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
 CONFIG_KEXEC=y
 CONFIG_BINFMT_MISC=m
 CONFIG_PM_RUNTIME=y
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
index d57e807..2903270 100644
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
+++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
@@ -34,7 +34,7 @@ CONFIG_AEABI=y
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 loglevel=3"
+CONFIG_CMDLINE="console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M loglevel=3"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 # CONFIG_BINFMT_SCRIPT is not set
-- 
1.9.1