diff options
| author |   Loys Ollivier <lollivier@baylibre.com> | 2017-10-06 11:10:54 +0200 |
|---|---|---|
| committer | Loys Ollivier <lollivier@baylibre.com> | 2017-10-06 11:57:42 +0200 |
| commit | 364641197bfe95512555abc36b7b62ac48166aaf (patch) | |
| tree | 9293b4dddb9eea8a080e057a1922507a63404d9d | |
| parent | 0b427702e5f32f8573620a6770cb234bc31e2415 (diff) | |
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>
| -rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 10 | ||||
| -rw-r--r-- | templates/boot/generic-uboot-tftp.jinja2 | 2 | ||||
| -rw-r--r-- | templates/machines/dra7xx-evm.jinja2 | 1 | ||||
| -rw-r--r-- | templates/machines/m3ulcb.jinja2 | 1 |
4 files changed, 11 insertions, 3 deletions
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" %} |