From b6a3e6531f05120ab360199de827c34107d1188d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 13 Mar 2011 02:37:51 +0100 Subject: linux.inc: fix CMDLINE_DEBUG injection. * CMDLINE_append = " ${CMDLINE_DEBUG} " was not the way Signed-off-by: Andrea Adami --- recipes/linux/linux.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'recipes/linux/linux.inc') diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index bae0cb41b1..24e3406e96 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -20,9 +20,8 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs #CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0" # Set the verbosity of kernel messages during runtime -# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour +# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}' -CMDLINE_append = " ${CMDLINE_DEBUG} " # Kernel bootlogo is distro-specific (default is OE logo). # Logo resolution (qvga, vga, ...) is machine-specific. @@ -130,7 +129,7 @@ do_configure_prepend() { echo "CONFIG_CPU_BIG_ENDIAN=y" >> ${S}/.config fi - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + echo "CONFIG_CMDLINE=\"${CMDLINE} ${CMDLINE_DEBUG}\"" >> ${S}/.config sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ @@ -220,7 +219,7 @@ do_configure_prepend() { echo "CONFIG_USB_ETH=y" >> ${S}/.config echo "CONFIG_NFS_FS=y" >> ${S}/.config echo "CONFIG_ROOT_NFS=y" >> ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config + echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"" >> ${S}/.config fi yes '' | oe_runmake oldconfig } -- cgit 1.2.3-korg