From f4f05028f5ad72a81d6620340fe1c92ac6486890 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 17 Jun 2014 00:22:12 +0200 Subject: zaurus collie: remove hardcoded mem=64M Surely rare today, the SL-5000D has only 32MB ram. Remove historical setting used for mtd-ram. Signed-off-by: Andrea Adami --- 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 f74b987..1f1d28f 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 mem=64M fbcon=rotate:1" +CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 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 5238c69..323893e 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 mem=64M fbcon=rotate:1 loglevel=3" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 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 36ceadb..32877cd 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 mem=64M fbcon=rotate:1 loglevel=3" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 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 2903270..d57e807 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 mem=64M loglevel=3" +CONFIG_CMDLINE="console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 loglevel=3" CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y # CONFIG_BINFMT_SCRIPT is not set -- cgit 1.2.3-korg