From 443d183e5338a195e583dd90bd1a7e331b42d707 Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Mon, 25 Nov 2024 10:19:02 +0000
Subject: SPEC-5293: Add final rpi5 template

This patchs adds the final raspberrypi5 machine template.
Remove un-needed raspberrypi5-64 as rpi5 is 64bit only.
Add an override of boot-method in templates since rpi5 start via PXE and
so need to boot in "minimal" boot mode.

Bug-AGL: SPEC-5293
Change-Id: Ided5312d25bee4b34ac3a5ea2d01b028664bcf73
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
---
 templates/boot/generic-uboot-tftp.jinja2  |  2 +-
 templates/machines/raspberrypi5-64.jinja2 |  1 -
 templates/machines/raspberrypi5.jinja2    | 26 +++++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)
 delete mode 100644 templates/machines/raspberrypi5-64.jinja2

diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2
index 8befb6d..d65b284 100644
--- a/templates/boot/generic-uboot-tftp.jinja2
+++ b/templates/boot/generic-uboot-tftp.jinja2
@@ -1,5 +1,5 @@
 {%- extends 'boot/generic-base-boot.jinja2' %}
-{%- set boot_method = "u-boot" %}
+{%- set boot_method = boot_method|default("u-boot") %}
 {%- block main %}
 {{ super() }}
 {%- if rootfs_type == 'nbd' %}
diff --git a/templates/machines/raspberrypi5-64.jinja2 b/templates/machines/raspberrypi5-64.jinja2
deleted file mode 100644
index 063ca3b..0000000
--- a/templates/machines/raspberrypi5-64.jinja2
+++ /dev/null
@@ -1 +0,0 @@
-{%- extends 'machines/raspberrypi4.jinja2' %}
diff --git a/templates/machines/raspberrypi5.jinja2 b/templates/machines/raspberrypi5.jinja2
index 063ca3b..d035084 100644
--- a/templates/machines/raspberrypi5.jinja2
+++ b/templates/machines/raspberrypi5.jinja2
@@ -1 +1,25 @@
-{%- extends 'machines/raspberrypi4.jinja2' %}
+{%- extends 'boot/generic-uboot-tftp.jinja2' %}
+{%- set device_arch = "arm64" %}
+{%- set sdk_arch = "arm64" %}
+{%- set device_mach = "broadcom" %}
+{%- set device_type = "bcm2712-rpi-5-b" %}
+{%- set rootfs_type = rootfs_type|default("nbd") %}
+{%- set kernel_image = kernel_image|default("Image") %}
+{%- set uboot_type = "booti" %}
+{%- if rootfs_type == 'nbd' %}
+    {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz" %}
+{%- endif %}
+{%- set dtb = dtb|default("bcm2712-rpi-5-b.dtb") %}
+{%- if (build_type == 'snapshot') or (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
+    {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-" + yocto_machine + ".ext4.xz") %}
+{%- else %}
+    {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-" + yocto_machine + ".ext4.xz") %}
+{%- endif %}
+{%- set boot_method = "minimal" %}
+
+{%- block main %}
+{{ super() }}
+context:
+  console_device: ttyAMA10
+  extra_kernel_args: " coherent_pool=1M rw fstab=no systemd.mask=systemd-network-generator.service"
+{% endblock %}
-- 
cgit 1.2.3-korg