From 364641197bfe95512555abc36b7b62ac48166aaf Mon Sep 17 00:00:00 2001
From: Loys Ollivier <lollivier@baylibre.com>
Date: Fri, 6 Oct 2017 11:10:54 +0200
Subject: Move boot type to kernel type

Boot type is deprecated in lava v2.
Replaced by kernel_type and define it from the kernel image name.

Change-Id: I6bcb326b5fb8b0230a9d519485741209bfab8ef2
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
---
 templates/base/agl-base-defaults.jinja2  | 10 ++++++++++
 templates/boot/generic-uboot-tftp.jinja2 |  2 +-
 templates/machines/dra7xx-evm.jinja2     |  1 -
 templates/machines/m3ulcb.jinja2         |  1 -
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index f426211..462fb86 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -19,6 +19,16 @@
 {%- 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 0f0f9e2..4baa405 100644
--- a/templates/boot/generic-uboot-tftp.jinja2
+++ b/templates/boot/generic-uboot-tftp.jinja2
@@ -10,7 +10,6 @@ protocols:
 {% endblock %}
 {%- block boot %}
 {{ super() }}
-    type: {{ uboot_type|default("bootm") }}
     commands: {{ boot_commands|default("ramdisk") }}
 {%- if rootfs_type == 'nbd' %}
     transfer_overlay:
@@ -22,6 +21,7 @@ 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 ae3d97b..98ce0ed 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -3,4 +3,3 @@
 {%- 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 16a3e76..9118deb 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -6,4 +6,3 @@
 {%- 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" %}
-- 
cgit 1.2.3-korg