From 8f9b21f2ae6280142bc22a1443fd6b041910c8d1 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Fri, 19 Feb 2021 12:06:20 +0000 Subject: SPEC-3811: Use a different rootfs image for h3ulcb-nogfx build For all branches (except jellyfish/halibut), h3ulcb-nogfx build based boards should now use the agl-demo-platform-crosssdk-h3ulcb.ext4.xz rootfs image. Change-Id: Idc8fafc32dcd598479d16798ffe077776432bd1e Bug-AGL: SPEC-3811 Signed-off-by: Corentin LABBE --- templates/machines/h3ulcb-kf.jinja2 | 4 ++++ templates/machines/r8a7795-agl-refhw.jinja2 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/templates/machines/h3ulcb-kf.jinja2 b/templates/machines/h3ulcb-kf.jinja2 index 948e3e0..7946ed4 100644 --- a/templates/machines/h3ulcb-kf.jinja2 +++ b/templates/machines/h3ulcb-kf.jinja2 @@ -10,6 +10,10 @@ {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} +{%- if branch == 'jellyfish' or branch == 'halibut' %} {%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %} +{% else %} +{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %} +{% endif %} {%- set initrd = "initramfs-netboot-image-h3ulcb.ext4.gz" %} {%- set yocto_machine = "h3ulcb" %} diff --git a/templates/machines/r8a7795-agl-refhw.jinja2 b/templates/machines/r8a7795-agl-refhw.jinja2 index 6ddeac2..3dfa463 100644 --- a/templates/machines/r8a7795-agl-refhw.jinja2 +++ b/templates/machines/r8a7795-agl-refhw.jinja2 @@ -8,6 +8,10 @@ {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} +{%- if branch == 'jellyfish' or branch == 'halibut' %} {%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %} +{% else %} +{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %} +{% endif %} {%- set initrd = "initramfs-netboot-image-h3ulcb.ext4.gz" %} {%- set yocto_machine = "h3ulcb" %} -- cgit 1.2.3-korg