aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2021-02-19 12:06:20 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-03-09 11:04:29 +0000
commit8f9b21f2ae6280142bc22a1443fd6b041910c8d1 (patch)
treed24b26fe2b1b787489108104d8f683620e015fc4
parent9d3066c0bb299414ea7c67390b7629f3cf95fe4f (diff)
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 <clabbe@baylibre.com>
-rw-r--r--templates/machines/h3ulcb-kf.jinja24
-rw-r--r--templates/machines/r8a7795-agl-refhw.jinja24
2 files changed, 8 insertions, 0 deletions
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" %}