aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
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 /recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
parent0f30cecdf7338d9a0ea6aa8fb9c597d0d75933ca (diff)
downloadmeta-handheld-fb82eb24df4f2f67ca5e122dc1d65eab4b7ab9aa.tar.gz
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 'recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig')
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig2
1 files changed, 1 insertions, 1 deletions
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