From 04388618788b36246c78ff439acd1cd17bd6b4bf Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Fri, 12 Apr 2019 17:31:16 +0200
Subject: Change dtb file names to match the new convention names

As we are upgrading to a new branch we had to change dtb file names to
match the new convention names.

Change-Id: I6cda162056e6074c730d3ec64aa0e37b3eb8642f
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---
 templates/machines/dra7xx-evm.jinja2   | 2 +-
 templates/machines/m3ulcb.jinja2       | 2 +-
 templates/machines/porter.jinja2       | 2 +-
 templates/machines/raspberrypi3.jinja2 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index 2bf87df..f430059 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -2,7 +2,7 @@
 {%- set device_type = "dra7-evm" %}
 {%- set device_arch = "arm" %}
 {%- set device_mach = "omap2" %}
-{%- set dtb = dtb|default("zImage-dra7-evm.dtb") %}
+{%- set dtb = dtb|default("dra7-evm.dtb") %}
 {%- set kernel_image = kernel_image|default("zImage") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
 {%- if (build_type == 'daily') or (build_type == 'release') %}
diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2
index 1413f8b..72212d8 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -2,7 +2,7 @@
 {%- set device_arch = "arm64" %}
 {%- set device_mach = "renesas" %}
 {%- set device_type = "r8a7796-m3ulcb" %}
-{%- set dtb = dtb|default("Image-r8a7796-m3ulcb.dtb") %}
+{%- set dtb = dtb|default("r8a7796-m3ulcb.dtb") %}
 {%- set kernel_image = kernel_image|default("Image") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
 {%- set uboot_type = "booti" %}
diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2
index 1de7f2d..0a5de3d 100644
--- a/templates/machines/porter.jinja2
+++ b/templates/machines/porter.jinja2
@@ -2,6 +2,6 @@
 {%- set device_arch = "arm64" %}
 {%- set device_mach = "renesas" %}
 {%- set device_type = "renesas-porter-uboot" %}
-{%- set dtb = dtb|default("uImage-r8a7791-porter.dtb") %}
+{%- set dtb = dtb|default("r8a7791-porter.dtb") %}
 {%- set initrd = initrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2
index 2ebe84a..08affa7 100644
--- a/templates/machines/raspberrypi3.jinja2
+++ b/templates/machines/raspberrypi3.jinja2
@@ -8,7 +8,7 @@
 {%- if rootfs_type == 'nbd' %}
     {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %}
 {%- endif %}
-{%- set dtb = dtb|default("uImage-bcm2710-rpi-3-b+vc4+ft5406.dtb") %}
+{%- set dtb = dtb|default("bcm2710-rpi-3-b+vc4+ft5406.dtb") %}
 {%- if (build_type == 'daily') or (build_type == 'release') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-raspberrypi3.ext4.xz") %}
 {%- else %}
-- 
cgit 1.2.3-korg