From 276d6c3df765d1fa17031fa68530d430462eb701 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 08:43:43 +0100 Subject: linux-kexecboot.inc: fix CMDLINE_DEBUG tag * bump INC_PR Signed-off-by: Andrea Adami --- recipes/linux/linux-kexecboot.inc | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc index 90ee7c28ce..ec78848dbe 100644 --- a/recipes/linux/linux-kexecboot.inc +++ b/recipes/linux/linux-kexecboot.inc @@ -1,5 +1,5 @@ # We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -INC_PR = "r30" +INC_PR = "r31" inherit kernel siteinfo @@ -12,21 +12,19 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" LOGO_SIZE ?= "." SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" -# Note how we set master console on serial to protect bootlogo. -CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8" -CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8" -CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M" -CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_ben-nanonote = "console=tty0 console=ttyS0,57600n8 mem=32M" - - # Set the verbosity of kernel messages during runtime # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour.. CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "loglevel=3", "debug", d)}' -CMDLINE += "${CMDLINE_DEBUG}" + +# Note how we set master console on serial to protect bootlogo. +CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" +CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" +CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M ${CMDLINE_DEBUG}" +CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_ben-nanonote = "console=tty0 console=ttyS0,57600n8 mem=32M ${CMDLINE_DEBUG}" PACKAGES = "" PROVIDES = "" -- cgit 1.2.3-korg