lava: Fix NFS tests on Renesas boards

After commit 45dae71b fixed the boot on Renesas boards with
linux >= 5.7 due to the change of the dtb name, the tests exercising
the NFS boot of the current release as the first stage broke since
they do not use `boot_commands` and thus didn't get the override.

To fix that, rather than constructing the path to the DTB from the
LAVA device name, which no longer match the board type with
linux >= 5.7, explicitly pass the DTB path for the first stage and the
release under test separately.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

lava/common-boot-tpl.yaml

@@ -63,7 +63,7 @@ actions:
       os: debian
       {% if needs_dtb -%}
       dtb:
-        url: {{firststageurl}}/{{arch}}/nfs/dtbs/{{dtb_root}}{{device_type}}.dtb
+        url: {{firststageurl}}/{{arch}}/nfs/dtbs/{{firststagedtb}}
       {%- endif %}
 
   - boot:

lava/group-nfs-tpl.yaml

@@ -65,7 +65,7 @@ actions:
       os: ubuntu
       {% if needs_dtb -%}
       dtb:
-        url: {{baseurl}}/{{imgpath}}/{{image_date}}/{{arch}}/nfs/dtbs/{{dtb_root}}{{device_type}}.dtb
+        url: {{baseurl}}/{{imgpath}}/{{image_date}}/{{arch}}/nfs/dtbs/{{dtb}}
       {%- endif %}
 
   - boot:

lava/profiles.yaml

@@ -8,7 +8,6 @@
       - chainloader /efi/boot/bootx64.efi
       - boot
     device_type: minnowboard-turbot-E3826
-    dtb_root: ""
     needs_dtb: false
   - &device-armhf-imx6-sabrelite
     arch: armhf
@@ -17,6 +16,8 @@
     boot_commands:
       - run bootcmd_mmc0
     device_type: imx6q-sabrelite
+    firststagedtb: imx6q-sabrelite.dtb
+    dtb: imx6q-sabrelite.dtb
     needs_dtb: true
   - &device-armhf-imx6-internal-sabrelite
     <<: *device-armhf-imx6-sabrelite
@@ -32,7 +33,8 @@
       - setenv fdtfile renesas/r8a77960-ulcb.dtb
       - run bootcmd_mmc0
     device_type: r8a7796-m3ulcb
-    dtb_root: "renesas/"
+    firststagedtb: renesas/r8a7796-m3ulcb.dtb
+    dtb: renesas/r8a77960-ulcb.dtb
     needs_dtb: true
 
 .templates:
@@ -65,7 +67,6 @@ main-profile:
     imgpath: "daily/v2021pre"
     baseurl: "https://images.apertis.org"
     firststageurl: "https://images.apertis.org/release/v2019/v2019.1" # use a known good release for the first stage
-    dtb_root: ""
     arch: amd64
     visibility: public
     source_project: ''