conf/machine/*zynqmp.conf: Update to use tune-zynqmp.inc

* Remove duplication of arch and soc settings
* Clean up some comments

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

2 files changed, 9 insertions, 16 deletions

diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 74436f1b..45f20dcb 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -2,20 +2,15 @@
 #@NAME: ep108-zynqmp
 #@DESCRIPTION: Xilinx EP108 ZynqMP Emulation Platform
 
-require conf/machine/include/arm/arch-armv8.inc
-
-IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
-IMAGE_CLASSES += "image_types_uboot"
+require conf/machine/include/tune-zynqmp.inc
+require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/machine-xilinx-board.inc
 
 MACHINE_FEATURES = ""
 
-EXTRA_IMAGEDEPENDS += "u-boot-zynqmp-mainline"
-
-KERNEL_IMAGETYPE = "Image"
-
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-# Use the internal ronaldo kernel
+# Use ZynqMP recipes for Kernal and U-Boot
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynqmp-mainline"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline"
@@ -23,3 +18,4 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline"
 UBOOT_MACHINE = "xilinx_zynqmp_config"
 UBOOT_LOADADDRESS = "0x80000"
 UBOOT_ENTRYPOINT = "0x80000"
+
diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf
index 2e60c2af..8cbb5b13 100644
--- a/conf/machine/qemuzynqmp.conf
+++ b/conf/machine/qemuzynqmp.conf
@@ -2,10 +2,8 @@
 #@NAME: qemuzynqmp
 #@DESCRIPTION: QEMU Zynq MP model
 
-require conf/machine/include/arm/arch-armv8.inc
-
-IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
-IMAGE_CLASSES += "image_types_uboot"
+require conf/machine/include/tune-zynqmp.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = ""
 
@@ -15,11 +13,9 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 PREFERRED_VERSION_qemu-native ?= "2.2.0+master+zynqmp%"
 PREFERRED_VERSION_nativesdk-qemu ?= "2.2.0+master+zynqmp%"
 
-KERNEL_IMAGETYPE = "Image"
-
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-# Use the internal ronaldo kernel
+# Use ZynqMP recipes for Kernal and U-Boot
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynqmp-mainline"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline"
@@ -27,3 +23,4 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline"
 UBOOT_MACHINE = "xilinx_zynqmp_config"
 UBOOT_LOADADDRESS = "0x80000"
 UBOOT_ENTRYPOINT = "0x80000"
+