[oe-commits] Andrea Adami : kexecboot-cfg: inherit CMDLINE from machine.conf. Cleaning.
git version control
git at git.openembedded.org
Sun Mar 13 13:49:31 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8d9a93029c0171874f801fbafc2162e128488058
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8d9a93029c0171874f801fbafc2162e128488058
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sun Mar 13 01:25:02 2011 +0100
kexecboot-cfg: inherit CMDLINE from machine.conf. Cleaning.
Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
recipes/kexecboot/kexecboot-cfg_0.1.bb | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb
index de9d38c..3f9be23 100644
--- a/recipes/kexecboot/kexecboot-cfg_0.1.bb
+++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb
@@ -5,16 +5,8 @@ PR = "r11"
SRC_URI = "file://icon.xpm"
-CMDLINE_DEBUG = "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}"
-
-CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}"
-CMDLINE_ben-nanonote = "console=ttyS0,57600n8 console=tty0 mem=32M ${CMDLINE_DEBUG}"
-CMDLINE_c7x0 = "console=ttyS0,115200n8 console=tty1 ${CMDLINE_DEBUG}"
-CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M ${CMDLINE_DEBUG}"
-CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}"
-CMDLINE_qemuarm = "console=ttyAMA0,115200n8 console=tty1 ${CMDLINE_DEBUG}"
-CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 ${CMDLINE_DEBUG}"
-CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1 ${CMDLINE_DEBUG}"
+CMDLINE ?= ""
+CMDLINE_DEBUG ?= "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}"
do_configure_prepend () {
install -m 0644 ${WORKDIR}/icon.xpm ${S}
@@ -29,7 +21,7 @@ KERNEL=/boot/${KERNEL_IMAGETYPE}
LABEL=${DISTRO}-${MACHINE}
#
# Append this tags to the kernel cmdline.
-APPEND=${CMDLINE}
+APPEND=${CMDLINE} ${CMDLINE_DEBUG}
#
# Specify optional initrd/initramfs.
# INITRD=/boot/initramfs.cpio.gz
More information about the Openembedded-commits
mailing list