From 815a04ffeefc4ac1b1c6009f02901cbd3fdbd26e Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 6 Oct 2017 19:11:24 +0000 Subject: 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 --- templates/machines/dra7xx-evm.jinja2 | 1 + templates/machines/m3ulcb.jinja2 | 1 + 2 files changed, 2 insertions(+) (limited to 'templates/machines') 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" %} -- cgit 1.2.3-korg