aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2014-07-14 22:40:38 +0200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-07-15 08:28:34 +0100
commitfb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa (patch)
tree3babf13ce7abd54c8b7a5f1a46fde07cea7ce2af /conf
parent0f30cecdf7338d9a0ea6aa8fb9c597d0d75933ca (diff)
downloadmeta-handheld-fb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa.tar.gz
meta-handheld-fb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa.tar.bz2
meta-handheld-fb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa.zip
Revert "zaurus collie: remove hardcoded mem=64M"
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@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/zaurus.inc2
1 files changed, 1 insertions, 1 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"