summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 17:42:47 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 17:43:14 +0200
commit99f8e91d6641505e85528ca6e85b88a36888f9e6 (patch)
treebfc017447250564bc1d0ceae1a428759ecfaf587 /templates
parenta0681f63447c682e506203847e6c5fe12b11cba9 (diff)
Support the rewitten rpi4 machine file layout
The reworked rpi4 board support will build with MACHINE = raspberrypi4-64 to match upstream. This leads to some paths being different on the download server. Thus we need to adapt the scripts. Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Iac1e2bb8c80bb751138969653a5548c6133a665a
Diffstat (limited to 'templates')
-rw-r--r--templates/machines/raspberrypi4-64.jinja21
-rw-r--r--templates/machines/raspberrypi4.jinja24
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/machines/raspberrypi4-64.jinja2 b/templates/machines/raspberrypi4-64.jinja2
new file mode 100644
index 0000000..063ca3b
--- /dev/null
+++ b/templates/machines/raspberrypi4-64.jinja2
@@ -0,0 +1 @@
+{%- extends 'machines/raspberrypi4.jinja2' %}
diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2
index 2a96b43..efa3e11 100644
--- a/templates/machines/raspberrypi4.jinja2
+++ b/templates/machines/raspberrypi4.jinja2
@@ -11,9 +11,9 @@
{%- endif %}
{%- set dtb = dtb|default("bcm2711-rpi-4-b.dtb") %}
{%- if (build_type == 'daily') or (build_type == 'release') %}
- {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-raspberrypi4.ext4.xz") %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-" + yocto_machine + ".ext4.xz") %}
{%- else %}
- {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi4.ext4.xz") %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-" + yocto_machine + ".ext4.xz") %}
{%- endif %}
{%- block main %}