From d6dfb47f8b1cb2b9e345c1ca29aa2ed384ed087b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 10 Mar 2020 17:44:23 -0700 Subject: meta-xilinx-bsp: remove redundant PREFERRED_PROVIDER PREFERRED_PROVIDER_virtual/kernel and PREFERRED_PROVIDER_virtual/bootloader are normally set by machine-xilinx-default.inc. Only set these if necessary. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 2 -- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/v350-versal.conf | 3 --- meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | 2 -- meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 2 -- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 2 -- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 3 --- meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 1 - 17 files changed, 45 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index 918976c3..5ade9e20 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf @@ -16,8 +16,6 @@ SERIAL_CONSOLE = "115200 ttyS0" KERNEL_IMAGETYPE ?= "linux.bin.ub" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index bffb9dc6..eafe4f50 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -17,9 +17,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf index 54a490d1..270b3a90 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf @@ -12,9 +12,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" SERIAL_CONSOLE = "115200 ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ virtual/boot-bin \ 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 b7ef4620..d042245b 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 @@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" SERIAL_CONSOLE = "115200 ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" # Default SD image build onfiguration, use qemu-sd to pad diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf index 2be19edf..5fe98767 100644 --- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf @@ -14,9 +14,6 @@ SPL_BINARY ?= "spl/boot.bin" SERIAL_CONSOLE ?= "115200 ttyPS0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - # PMU instance args PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index b504ce25..67867535 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" SERIAL_CONSOLE = "115200 ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" # 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 aead7756..92977dc7 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" SERIAL_CONSOLE = "115200 ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" EXTRA_IMAGEDEPENDS += " \ diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index 77220e11..4f388350 100644 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf @@ -19,9 +19,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 89495ecd..8fda6bbd 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -21,9 +21,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ arm-trusted-firmware \ diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index 392d098e..271b8122 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -19,9 +19,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 622d229d..d620f6fe 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -17,9 +17,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index 0e1a78c2..3443fa79 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf @@ -19,9 +19,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 3254eb66..1d5de343 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf @@ -19,9 +19,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index 67203e5f..094d0311 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf @@ -19,9 +19,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index 2e29ae73..fae91fa1 100644 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf @@ -17,9 +17,6 @@ SERIAL_CONSOLE ?= "115200 ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 9d5c707d..35be4d79 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf @@ -17,9 +17,6 @@ SERIAL_CONSOLE ?= "115200 ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" - PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" 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 ae9a3b36..dedbaeba 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -8,7 +8,6 @@ require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-default.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio" -- cgit v1.2.3-54-g00ecf