[meta-intel] conf:machine: Use weak reference for SERIAL_CONSOLES variable

Submitted by Belisko Marek on April 14, 2020, 6:25 a.m. | Patch ID: 171905

Details

Message ID 1586845526-19650-1-git-send-email-marek.belisko@open-nandra.com
State New
Headers show

Commit Message

Belisko Marek April 14, 2020, 6:25 a.m.
This add possibility to override in custom layer.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 conf/machine/intel-core2-32.conf   | 2 +-
 conf/machine/intel-corei7-64.conf  | 2 +-
 conf/machine/intel-skylake-64.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 20c9872..384ad1e 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -27,7 +27,7 @@  XSERVER ?= "${XSERVER_X86_BASE} \
            "
 
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
 APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 6164bf3..2009537 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -32,7 +32,7 @@  XSERVER ?= "${XSERVER_X86_BASE} \
            "
 
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index e367951..503a982 100644
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@@ -25,7 +25,7 @@  XSERVER ?= "${XSERVER_X86_BASE} \
            "
 
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"

Comments

Anuj Mittal April 14, 2020, 6:50 a.m.
On Tue, 2020-04-14 at 08:25 +0200, Marek Belisko wrote:
> This add possibility to override in custom layer.

> 

> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>

> ---

>  conf/machine/intel-core2-32.conf   | 2 +-

>  conf/machine/intel-corei7-64.conf  | 2 +-

>  conf/machine/intel-skylake-64.conf | 2 +-

>  3 files changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-

> core2-32.conf

> index 20c9872..384ad1e 100644

> --- a/conf/machine/intel-core2-32.conf

> +++ b/conf/machine/intel-core2-32.conf

> @@ -27,7 +27,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \

>             "

>  

>  SYSLINUX_OPTS = "serial 0 115200"

> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"

> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"


I think having just this would make this statement not do anything as
these machine files includes x86-base.inc which also sets this variable
using a ?=. 

This would probably also need a ??= in x86-base.inc.

Thanks,

Anuj

>  APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200

> console=tty0"

>  

>  IMAGE_FSTYPES += "wic"

> diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-

> corei7-64.conf

> index 6164bf3..2009537 100644

> --- a/conf/machine/intel-corei7-64.conf

> +++ b/conf/machine/intel-corei7-64.conf

> @@ -32,7 +32,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \

>             "

>  

>  SYSLINUX_OPTS = "serial 0 115200"

> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"

> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"

>  APPEND += "rootwait console=ttyS0,115200 console=tty0"

>  

>  IMAGE_FSTYPES += "wic"

> diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-

> skylake-64.conf

> index e367951..503a982 100644

> --- a/conf/machine/intel-skylake-64.conf

> +++ b/conf/machine/intel-skylake-64.conf

> @@ -25,7 +25,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \

>             "

>  

>  SYSLINUX_OPTS = "serial 0 115200"

> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"

> +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"

>  APPEND += "rootwait console=ttyS0,115200 console=tty0"

>  

>  IMAGE_FSTYPES += "wic"

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#49133): https://lists.yoctoproject.org/g/yocto/message/49133
Mute This Topic: https://lists.yoctoproject.org/mt/73005096/3617530
Group Owner: yocto+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-