Revert "Move boot type to kernel type"

This reverts commit 364641197bfe95512555abc36b7b62ac48166aaf.

Unfortunately, NBD jobs do not work with the new kernel type, so we can't remove the old boot type (at least until NBD is fixed.)

Change-Id: If9a64135ef75771a90655fdc4c6429d9b494fcf0
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

4 files changed, 3 insertions, 11 deletions

diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index 462fb86..f426211 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -19,16 +19,6 @@
 {%- set vcs_branch = vcs_branch|default("agl-branch") %}
 {%- set vcs_url = vcs_url|default(baseurl()) %}
 
-{# Kernel type definition #}
-{%- if kernel_image|first|lower == "i" %}
-    {%- set kernel_type = "image" %}
-{%- elif kernel_image|first|lower == "z" %}
-    {%- set kernel_type = "zimage" %}
-{%- else %}
-    {%- set kernel_type = "uimage" %}
-{%- endif %}
-
-{# Image names definitions #}
 {%- if rootfs_type == 'nbd' %}
     {%- set initrd = initrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %}
     {%- set boot_commands = "nbd" %}
diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2
index 4baa405..0f0f9e2 100644
--- a/templates/boot/generic-uboot-tftp.jinja2
+++ b/templates/boot/generic-uboot-tftp.jinja2
@@ -10,6 +10,7 @@ protocols:
 {% endblock %}
 {%- block boot %}
 {{ super() }}
+    type: {{ uboot_type|default("bootm") }}
     commands: {{ boot_commands|default("ramdisk") }}
 {%- if rootfs_type == 'nbd' %}
     transfer_overlay:
@@ -21,7 +22,6 @@ protocols:
 {{ super() }}
     kernel:
       url: {{ kernel_url }}
-      type: {{ kernel_type }}
 {%- if rootfs_type == 'nbd' %}
     initrd:
       url: {{ initrd_url }}
diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index 98ce0ed..ae3d97b 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -3,3 +3,4 @@
 {%- set dtb = dtb|default("zImage-dra7-evm-lcd-lg.dtb") %}
 {%- set kernel_image = kernel_image|default("zImage") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
+{%- set uboot_type = "bootz" %}
diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2
index 9118deb..16a3e76 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -6,3 +6,4 @@
 {%- set dtb = dtb|default("Image-r8a7796-m3ulcb.dtb") %}
 {%- set kernel_image = kernel_image|default("Image") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
+{%- set uboot_type = "booti" %}