linux-zynqmp-mainline: Drop custom ZynqMP kernel recipe

* The features of this kernel are available upstream and in the
  linux-yocto 4.1 kernel
* Default ZynqMP machines to use linux-yocto as the default kernel

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 85975617..8283fe15 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -13,8 +13,7 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-# Use ZynqMP recipes for Kernal and U-Boot
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynqmp-mainline"
+# Use ZynqMP recipes for U-Boot
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline"
 
 KERNEL_DEVICETREE = "xilinx/zynqmp-ep108.dtb"
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index e5d6584b..d654a2a2 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -9,6 +9,7 @@ IMAGE_CLASSES += "image_types_uboot"
 # Kernel Configuration
 XILINX_DEFAULT_KERNEL := "linux-xlnx"
 XILINX_DEFAULT_KERNEL_microblaze := "linux-yocto"
+XILINX_DEFAULT_KERNEL_zynqmp := "linux-yocto"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}"
 PREFERRED_VERSION_linux-xlnx ?= "3.19%"