[PATCH 0/2] use single variable to set baud rate

[PATCH 0/2] use single variable to set baud rate

[Chong Lu]

The following changes since commit b813bdebb36501500e86fea5f7e15b4b15ea0902:

  qemu/libc-package: Fix qemu option handling (2014-12-05 18:01:08 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib chonglu/baudrate
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/baudrate

Chong Lu (2):
  syslinux.bbclass: use single variable to set baud rate
  grub-efi.bbclass: use single variable to set baud rate

 meta/classes/grub-efi.bbclass | 5 +++--
 meta/classes/syslinux.bbclass | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

-- 
1.9.1

[PATCH 1/2] syslinux.bbclass: use single variable to set baud rate

[Chong Lu]

Use SERIAL_CONSOLE to set baud rate in syslinux.cfg file.

[YOCTO #6331]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/classes/syslinux.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index d6498d9..b5eea07 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -27,8 +27,8 @@ SYSLINUXDIR = "/"
 # The kernel has an internal default console, which you can override with
 # a console=...some_tty...
 SYSLINUX_DEFAULT_CONSOLE ?= ""
-SYSLINUX_SERIAL ?= "0 115200"
-SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
+SYSLINUX_SERIAL ?= "${@filter(str.isdigit, d.getVar('SERIAL_CONSOLE', True).split()[1])} ${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
+SYSLINUX_SERIAL_TTY ?= "console=${@d.getVar('SERIAL_CONSOLE', True).split()[1]},${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
 ISO_BOOTIMG = "isolinux/isolinux.bin"
 ISO_BOOTCAT = "isolinux/boot.cat"
 MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
-- 
1.9.1

[PATCH 2/2] grub-efi.bbclass: use single variable to set baud rate

[Chong Lu]

Use SERIAL_CONSOLE to set baud rate in grub.cfg file.

[YOCTO #6331]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/classes/grub-efi.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 47bd35e..37c21f9 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -18,11 +18,12 @@
 do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
 do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
 
-GRUB_SERIAL ?= "console=ttyS0,115200"
+GRUB_SERIAL ?= "console=${@d.getVar('SERIAL_CONSOLE', True).split()[1]},${@d.getVar('SERIAL_CONSOLE', True).split()[0]}"
 GRUBCFG = "${S}/grub.cfg"
 GRUB_TIMEOUT ?= "10"
 #FIXME: build this from the machine config
-GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
+GRUB_OPTS ?= "serial --unit=${@filter(str.isdigit, d.getVar('SERIAL_CONSOLE', True).split()[1])} \
+--speed=${@d.getVar('SERIAL_CONSOLE', True).split()[0]} --word=8 --parity=no --stop=1"
 
 EFIDIR = "/EFI/BOOT"
 
-- 
1.9.1

Re: [PATCH 0/2] use single variable to set baud rate

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

On 8 December 2014 at 05:47, Chong Lu <Chong.Lu@windriver.com> wrote:

> Chong Lu (2):
>   syslinux.bbclass: use single variable to set baud rate
>   grub-efi.bbclass: use single variable to set baud rate
>

ERROR: ExpansionError during parsing
/home/ross/Yocto/poky/meta/recipes-core/images/
core-image-minimal-mtdutils.bb: Failure expanding variable GRUB_OPTS:
ExpansionError: Failure expanding variable GRUB_OPTS, expression was serial
--unit=${@filter(str.isdigit, d.getVar('SERIAL_CONSOLE', True).split()[1])}
--speed=${@d.getVar('SERIAL_CONSOLE', True).split()[0]} --word=8
--parity=no --stop=1 which triggered exception IndexError: list index out
of range

SERIAL_CONSOLE doesn't have to be set.

Ross

[-- Attachment #2: Type: text/html, Size: 1323 bytes --]

Re: [PATCH 0/2] use single variable to set baud rate

[Chong Lu]

On 12/08/2014 09:44 PM, Burton, Ross wrote:
> On 8 December 2014 at 05:47, Chong Lu <Chong.Lu@windriver.com 
> <mailto:Chong.Lu@windriver.com>> wrote:
>
>     Chong Lu (2):
>       syslinux.bbclass: use single variable to set baud rate
>       grub-efi.bbclass: use single variable to set baud rate
>
>
> ERROR: ExpansionError during parsing 
> /home/ross/Yocto/poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb 
> <http://core-image-minimal-mtdutils.bb>: Failure expanding variable 
> GRUB_OPTS: ExpansionError: Failure expanding variable GRUB_OPTS, 
> expression was serial --unit=${@filter(str.isdigit, 
> d.getVar('SERIAL_CONSOLE', True).split()[1])} 
> --speed=${@d.getVar('SERIAL_CONSOLE', True).split()[0]} --word=8 
> --parity=no --stop=1 which triggered exception IndexError: list index 
> out of range
>
> SERIAL_CONSOLE doesn't have to be set.

Hi Ross,

Thanks for your reply. V2 incoming.

Best Regards
Chong

>
> Ross