From d06d3f5e42254a9e9aee9d36f08d63dbe3abb9e4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 3 Apr 2020 15:05:28 -0700 Subject: machines: Allow the user to override SERIAL_CONSOLES Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 2 +- .../conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf | 2 +- meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf | 2 +- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/v350-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/versal-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zynq-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index ba7e2329..73f5b046 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf @@ -11,7 +11,7 @@ TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift reorder pattern-compare mul MACHINE_FEATURES = "" USE_VT = "" -SERIAL_CONSOLES = "115200;ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" KERNEL_IMAGETYPE ?= "linux.bin.ub" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf index e89f8b7b..ed4e2acb 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf @@ -12,6 +12,6 @@ MACHINE_FEATURES = "" KERNEL_IMAGETYPE = "linux.bin.ub" KERNEL_IMAGETYPES = "" -SERIAL_CONSOLES = "115200;ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf index 0e828c50..f154197a 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf @@ -12,6 +12,6 @@ MACHINE_FEATURES = "" KERNEL_IMAGETYPE = "linux.bin.ub" KERNEL_IMAGETYPES = "" -SERIAL_CONSOLES = "115200;ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index 5937f25a..c531dbb2 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -20,7 +20,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" KERNEL_DEVICETREE = "zynq-microzed.dtb" diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf index 86c65df2..5f9d604b 100644 --- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf @@ -11,7 +11,7 @@ TUNE_FEATURES_tune-microblaze += "v8.50 barrel-shift reorder pattern-compare div MACHINE_FEATURES = "" USE_VT = "" -SERIAL_CONSOLES = "115200;ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" KERNEL_IMAGETYPE ?= "linux.bin.ub" diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index d665f35b..17e83334 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -24,7 +24,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf index e2b78a82..3700e57b 100644 --- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf @@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc MACHINE_FEATURES = "ext2 vfat" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf index fb226e5b..1ce63291 100644 --- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf +++ b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf @@ -11,7 +11,7 @@ TUNE_FEATURES_tune-microblaze += "v8.00 bigendian barrel-shift pattern-compare m MACHINE_FEATURES = "" USE_VT = "" -SERIAL_CONSOLES = "115200;ttyUL0" +SERIAL_CONSOLES ?= "115200;ttyUL0" KERNEL_IMAGETYPE ?= "linux.bin.ub" diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index cc792b49..6a0babfa 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -11,7 +11,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf index fac46a9d..ea60f9a2 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf @@ -9,7 +9,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" EXTRA_IMAGEDEPENDS += " \ diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf index 8cd72d3a..9fec0686 100644 --- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # Default SD image build onfiguration, use qemu-sd to pad diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 8985ea93..d90d7e7c 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # Default SD image build onfiguration, use qemu-sd to pad diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf index 64b171b5..4f8bc6ab 100644 --- a/meta-xilinx-bsp/conf/machine/versal-generic.conf +++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf @@ -12,7 +12,7 @@ EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-nativ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # Default SD image build onfiguration, use qemu-sd to pad diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 2d090745..5c24d2fe 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyAMA0" +SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" EXTRA_IMAGEDEPENDS += " \ diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index a3cd1ecc..edd3cb2d 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -26,7 +26,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" KERNEL_DEVICETREE = "zynq-zc702.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index afb56875..10b5e29c 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -26,7 +26,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" KERNEL_DEVICETREE = "zynq-zc706.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 31f06fc8..41f8dc8a 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -16,7 +16,7 @@ IMAGE_CLASSES += "image-types-xilinx-qemu" IMAGE_FSTYPES += "wic.qemu-sd" WKS_FILES ?= "sdimage-bootpart.wks" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index a5d66a94..5de3004b 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -12,7 +12,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index 8e604509..d731b6bb 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -22,7 +22,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" KERNEL_DEVICETREE = "zynq-zed.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf index 09734138..b6a21e4f 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index 1e4b24ee..d7af056a 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -24,7 +24,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" KERNEL_DEVICETREE = "zynq-zybo.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf index 2910eb76..f7e372c4 100644 --- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf @@ -12,7 +12,7 @@ EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-nativ UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index 398830fd..d53f7e70 100644 --- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf @@ -21,7 +21,7 @@ IMAGE_CLASSES += "image-types-xilinx-qemu" IMAGE_FSTYPES += "wic.qemu-sd" WKS_FILES ?= "sdimage-bootpart.wks" -SERIAL_CONSOLES = "115200;ttyPS0" +SERIAL_CONSOLES ?= "115200;ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # We need a generic one that works with QEMU... -- cgit v1.2.3-54-g00ecf