diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2017-10-06 19:11:24 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-10-06 19:11:24 +0000 |
| commit | 815a04ffeefc4ac1b1c6009f02901cbd3fdbd26e (patch) | |
| tree | 3e485affca826d1449be4bfaa7d1a9a148c6e444 /templates/boot | |
| parent | 364641197bfe95512555abc36b7b62ac48166aaf (diff) | |
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>
Diffstat (limited to 'templates/boot')
| -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 }} |