qemuboot-xilinx:machine-xilinx-default: Update kernel images

For zynq,microblaze qemu supports direct kernel boot by specifying
kernel image name to QB_DEFAULT_KERNEL.
Adjusting the kernel image based on the bundle image selection.

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 5 insertions, 0 deletions

diff --git a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
index 48dfa6e2..59d3f0ab 100644
--- a/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
@@ -12,6 +12,10 @@ QB_MACHINE_XILINX:microblaze = "-M microblaze-fdt-plnx"
 
 # defaults
 QB_DEFAULT_KERNEL ?= "none"
+QB_DEFAULT_KERNEL:zynq ?= "${@'zImage' if \
+                d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else 'zImage-initramfs-${MACHINE}.bin'}"
+QB_DEFAULT_KERNEL:microblaze ?= "${@'simpleImage.mb' if \
+                d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else 'simpleImage.mb-initramfs-${MACHINE}.bin'}"
 
 inherit qemuboot
 
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index a15e92c6..a4b0c59a 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -46,6 +46,7 @@ def get_default_image_boot_files(d):
     # kernel images
     kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split())
     kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split())
+    kerneltypes |= set((d.getVar("KERNEL_ALT_IMAGETYPE") or "").split())
     for i in kerneltypes:
         files.append(i)