From fb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 14 Jul 2014 22:40:38 +0200 Subject: 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 --- conf/machine/include/zaurus.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine') 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" -- cgit 1.2.3-korg