[meta-xilinx] [PATCH 3/5] machine/*-microblaze*: Add linux.bin.ub KERNEL_IMAGETYPE

[Nathan Rossi]

The tune-microblaze.inc is currently providing this configuration,
however since this is not a tune specific configuration it should be set
by the machine itself. Additionally with the perspective change to
remove tune-microblaze.inc the reliance on this includes configuration
needs to be removed.

Also remove the superfluous '_remove = "device-tree"' for
s3adsp1800-qemu-microblazeeb.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc       | 3 ---
 meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf           | 2 ++
 meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf      | 2 ++
 meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
index 835de41b44..84b3832552 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
+++ b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
@@ -6,9 +6,6 @@ AVAILTUNES += "microblaze"
 TUNE_FEATURES_tune-microblaze = "microblaze"
 PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
 
-# Linux Configuration
-KERNEL_IMAGETYPE ?= "linux.bin.ub"
-
 # U-Boot Configuration
 UBOOT_MACHINE ?= "microblaze-generic_config"
 
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index 658b75be70..a73ce9ca7d 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -14,6 +14,8 @@ MACHINE_FEATURES = ""
 USE_VT = ""
 SERIAL_CONSOLE = "115200 ttyS0"
 
+KERNEL_IMAGETYPE ?= "linux.bin.ub"
+
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
 EXTRA_IMAGEDEPENDS += "virtual/bitstream"
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
index 2092801eb2..f4ddb6dfdd 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
@@ -13,6 +13,8 @@ MACHINE_FEATURES = ""
 USE_VT = ""
 SERIAL_CONSOLE = "115200 ttyS0"
 
+KERNEL_IMAGETYPE ?= "linux.bin.ub"
+
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index 6bd7541701..3a21eb78e9 100644
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = ""
 USE_VT = ""
 SERIAL_CONSOLE = "115200 ttyUL0"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree"
+KERNEL_IMAGETYPE ?= "linux.bin.ub"
 
 # This machine is a targeting a QEMU model, runqemu setup:
 IMAGE_CLASSES += "qemuboot"
-- 
2.15.1