diff options
author | Kevin Hilman <khilman@baylibre.com> | 2017-10-06 19:12:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2017-10-06 19:12:05 +0000 |
commit | 5bef8f20fbac8224d391ee3bea296f6e3b38c58d (patch) | |
tree | d6cd554ca621a61be3b08b089907c47a1848582f /templates/boot/generic-uboot-tftp.jinja2 | |
parent | 340d74fbed6c216b82099129c5a7e9f9facba9b2 (diff) | |
parent | 815a04ffeefc4ac1b1c6009f02901cbd3fdbd26e (diff) |
Merge "Revert "Move boot type to kernel type""
Diffstat (limited to 'templates/boot/generic-uboot-tftp.jinja2')
-rw-r--r-- | templates/boot/generic-uboot-tftp.jinja2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 }} |