[meta-xilinx] [PATCH] conf/machine/*.conf: Add serial consoles check

Nathan Rossi nathan at nathanrossi.com
Sun Aug 27 02:04:34 PDT 2017


On 27 August 2017 at 11:02, Manjukumar Matha
<manjukumar.harthikote-matha at xilinx.com> wrote:
> There are instances when serial console check if required to disable
> consoles when it is not defined by SERIAL_CONSOLES.

Is it necessary to set this for all the machines? Since they are all
pretty much guaranteed to have the serial devices except in the case
of zcu102-zynqmp (which might be a virtual serial with xen/etc).

Since this does add a overhead to the boot process since the checking
is done with a postinst package step in sysvinit-inittab.

Regards,
Nathan

>
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
> ---
>  conf/machine/kc705-microblazeel.conf           | 1 +
>  conf/machine/microzed-zynq7.conf               | 1 +
>  conf/machine/picozed-zynq7.conf                | 1 +
>  conf/machine/qemu-zynq7.conf                   | 1 +
>  conf/machine/s3adsp1800-qemu-microblazeeb.conf | 1 +
>  conf/machine/zc702-zynq7.conf                  | 1 +
>  conf/machine/zcu102-zynqmp.conf                | 1 +
>  conf/machine/zedboard-zynq7.conf               | 1 +
>  conf/machine/zybo-linux-bd-zynq7.conf          | 1 +
>  conf/machine/zybo-zynq7.conf                   | 1 +
>  10 files changed, 10 insertions(+)
>
> diff --git a/conf/machine/kc705-microblazeel.conf b/conf/machine/kc705-microblazeel.conf
> index 39cb3c2..7cfc094 100644
> --- a/conf/machine/kc705-microblazeel.conf
> +++ b/conf/machine/kc705-microblazeel.conf
> @@ -21,3 +21,4 @@ EXTRA_IMAGEDEPENDS += "virtual/bitstream"
>  PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
>  PREFERRED_VERSION_u-boot-xlnx ?= "v2016.07-xilinx-v2016.4%"
>
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
> index aaca1ca..0c68f7d 100644
> --- a/conf/machine/microzed-zynq7.conf
> +++ b/conf/machine/microzed-zynq7.conf
> @@ -16,6 +16,7 @@ SPL_BINARY = "spl/boot.bin"
>  EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
>
> diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
> index 9f8a37e..479534b 100644
> --- a/conf/machine/picozed-zynq7.conf
> +++ b/conf/machine/picozed-zynq7.conf
> @@ -20,6 +20,7 @@ SPL_BINARY = "spl/boot.bin"
>  EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
>
> diff --git a/conf/machine/qemu-zynq7.conf b/conf/machine/qemu-zynq7.conf
> index 0fe99e2..8fc3a2c 100644
> --- a/conf/machine/qemu-zynq7.conf
> +++ b/conf/machine/qemu-zynq7.conf
> @@ -9,6 +9,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
>  MACHINE_FEATURES = "ext2 vfat"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
>  IMAGE_BOOT_FILES += "${MACHINE}.dtb"
> diff --git a/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
> index 6bd7541..87927f2 100644
> --- a/conf/machine/s3adsp1800-qemu-microblazeeb.conf
> +++ b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
> @@ -12,6 +12,7 @@ MACHINE_FEATURES = ""
>
>  USE_VT = ""
>  SERIAL_CONSOLE = "115200 ttyUL0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree"
>
> diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
> index ef42301..7d01cae 100644
> --- a/conf/machine/zc702-zynq7.conf
> +++ b/conf/machine/zc702-zynq7.conf
> @@ -22,6 +22,7 @@ SPL_BINARY = "spl/boot.bin"
>  EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  KERNEL_DEVICETREE = "zynq-zc702.dtb"
>  KERNEL_FEATURES += "features/rtc/rtc.scc"
> diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
> index 5e21e0d..914c89b 100644
> --- a/conf/machine/zcu102-zynqmp.conf
> +++ b/conf/machine/zcu102-zynqmp.conf
> @@ -13,6 +13,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
>  UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-revB.dtb xilinx/zynqmp-zcu102.dtb"
>
> diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
> index 58cee37..0677d49 100644
> --- a/conf/machine/zedboard-zynq7.conf
> +++ b/conf/machine/zedboard-zynq7.conf
> @@ -19,6 +19,7 @@ SPL_BINARY = "spl/boot.bin"
>  EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  KERNEL_DEVICETREE = "zynq-zed.dtb"
>
> diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf
> index d44575b..95b85e1 100644
> --- a/conf/machine/zybo-linux-bd-zynq7.conf
> +++ b/conf/machine/zybo-linux-bd-zynq7.conf
> @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
>
>  MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio"
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
>
> diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
> index a3e9c06..2bcb4f9 100644
> --- a/conf/machine/zybo-zynq7.conf
> +++ b/conf/machine/zybo-zynq7.conf
> @@ -20,6 +20,7 @@ SPL_BINARY = "spl/boot.bin"
>  EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
>
>  SERIAL_CONSOLE = "115200 ttyPS0"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>  KERNEL_DEVICETREE = "zynq-zybo.dtb"
>
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx



More information about the meta-xilinx mailing list