[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2590/8267] directdisk*.wks: add serial console support

[Emmanuele Bassi <ebassi src gnome org>]

commit d6616a421f78128b2cca0c6bc4559b97cb0f75ac
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Sep 20 15:13:31 2016 +0300

    directdisk*.wks: add serial console support
    
    Added serial console to kernel command line to to make it
    easier to boot wic images on devices without display.
    
    Tested on MinnowBoard MAX.
    
    (From OE-Core rev: 9a774e3bcd5dc4c85d642acc7bf26095b8c620e4)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/canned-wks/directdisk-gpt.wks      |    2 +-
 .../lib/wic/canned-wks/directdisk-multi-rootfs.wks |    2 +-
 scripts/lib/wic/canned-wks/directdisk.wks          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/scripts/lib/wic/canned-wks/directdisk-gpt.wks
index ea01cf3..8d7d8de 100644
--- a/scripts/lib/wic/canned-wks/directdisk-gpt.wks
+++ b/scripts/lib/wic/canned-wks/directdisk-gpt.wks
@@ -6,5 +6,5 @@
 part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
 
-bootloader  --ptable gpt --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0"
+bootloader  --ptable gpt --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 
console=ttyS0,115200n8"
 
diff --git a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks 
b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
index 8a81f8f..f61d941 100644
--- a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
+++ b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
@@ -19,5 +19,5 @@ part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 10
 part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext4 --label platform --align 1024
 part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext4 --label secondary --align 1024
 
-bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0"
+bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 
console=ttyS0,115200n8"
 
diff --git a/scripts/lib/wic/canned-wks/directdisk.wks b/scripts/lib/wic/canned-wks/directdisk.wks
index 6db74a7..8c8e06b 100644
--- a/scripts/lib/wic/canned-wks/directdisk.wks
+++ b/scripts/lib/wic/canned-wks/directdisk.wks
@@ -4,5 +4,5 @@
 
 include common.wks.inc
 
-bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0"
+bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 
console=ttyS0,115200n8"