From 5f973d214a9a82b8532818b7dbc73097a064ba0b Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 18 Jul 2023 16:13:41 -0600 Subject: machine: Add SERIAL_CONSOLES_CHECK for sysvinit only SERIAL_CONSOLES_CHECK is supported only for sysvinit and default INIT Manager is systemd, hence move this variable from machine conf files to machine-xilinx-default inclusion and set only if DISTRO_FEATURES is sysvinit. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 3 +++ meta-xilinx-core/conf/machine/microblaze-generic.conf | 1 - meta-xilinx-core/conf/machine/versal-generic.conf | 1 - meta-xilinx-core/conf/machine/zynq-generic.conf | 1 - meta-xilinx-core/conf/machine/zynqmp-generic.conf | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) (limited to 'meta-xilinx-core/conf') diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index 4a4384a1..16aa1316 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -128,3 +128,6 @@ def get_default_image_boot_files(d): XSERVER_EXT ?= "" FPGA_MNGR_RECONFIG_ENABLE ?= "1" + +# This variable is supported only with SysVinit. +SERIAL_CONSOLES_CHECK = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SERIAL_CONSOLES}', '', d)}" diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index 9b811aa5..ac785a17 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -45,7 +45,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" # Microblaze Serial Console settings SERIAL_CONSOLES ?= "115200;ttyUL0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-tune-include.inc diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index 3bf38b23..f87dc140 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -33,7 +33,6 @@ UBOOT_LOADADDRESS ?= "0x200000" # Versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-versal.inc diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index 0409e4ba..e97be2ff 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf @@ -32,7 +32,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" # Zynq-7000 Serial Console settings SERIAL_CONSOLES ?= "115200;ttyPS0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-zynq.inc diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 5faa3095..b60014df 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -44,7 +44,6 @@ UBOOT_LOADADDRESS ?= "0x200000" # ZynqMP Serial Console SERIAL_CONSOLES ?= "115200;ttyPS0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-zynqmp.inc -- cgit v1.2.3-54-g00ecf