From a304159599ee9c42e417dfec84798ea4c3ccb174 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 13 Oct 2021 17:10:33 +0200 Subject: Prepare devicetree changes for R-Car BSP 5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The devicetree scheme was evolved. Adapt releng-scripts for use in CI. Bug-AGL: SPEC-4081 Signed-off-by: Jan-Simon Möller Change-Id: I273a26004e8bdcd81655be8565601ca9cfecf953 --- templates/machines/h3ulcb-kf.jinja2 | 5 +--- templates/machines/m3ulcb-kf.jinja2 | 2 +- templates/machines/m3ulcb.jinja2 | 2 +- .../machines-branch/h3ulcb-kf-lamprey.jinja2 | 28 ++++++++++++++++++++++ .../machines-branch/m3ulcb-kf-lamprey.jinja | 10 ++++++++ .../machines/machines-branch/m3ulcb-lamprey.jinja | 10 ++++++++ 6 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 create mode 100644 templates/machines/machines-branch/m3ulcb-kf-lamprey.jinja create mode 100644 templates/machines/machines-branch/m3ulcb-lamprey.jinja diff --git a/templates/machines/h3ulcb-kf.jinja2 b/templates/machines/h3ulcb-kf.jinja2 index a82cd12..7b3e31c 100644 --- a/templates/machines/h3ulcb-kf.jinja2 +++ b/templates/machines/h3ulcb-kf.jinja2 @@ -3,10 +3,7 @@ {%- set sdk_arch = "aarch64" %} {%- set device_mach = "renesas" %} {%- set device_type = "r8a7795-h3ulcb-kf" %} -# this DTB is on linux-renesas only, not mainlined -#{#- set dtb = dtb|default("r8a7795-h3ulcb-4x2g-kf.dtb") #} -# temporary use plain h3 and no KF -{%- set dtb = dtb|default("r8a7795-h3ulcb-4x2g.dtb") %} +{%- set dtb = dtb|default("r8a77951-ulcb.dtb") %} {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} diff --git a/templates/machines/m3ulcb-kf.jinja2 b/templates/machines/m3ulcb-kf.jinja2 index 03f70aa..c6bc33e 100644 --- a/templates/machines/m3ulcb-kf.jinja2 +++ b/templates/machines/m3ulcb-kf.jinja2 @@ -3,7 +3,7 @@ {%- set sdk_arch = "aarch64" %} {%- set device_mach = "renesas" %} {%- set device_type = "r8a7796-m3ulcb-kf" %} -{%- set dtb = dtb|default("r8a7796-m3ulcb-kf.dtb") %} +{%- set dtb = dtb|default("r8a77960-ulcb-kf.dtb") %} {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2 index 9bbaecd..7e4e766 100644 --- a/templates/machines/m3ulcb.jinja2 +++ b/templates/machines/m3ulcb.jinja2 @@ -3,7 +3,7 @@ {%- set sdk_arch = "aarch64" %} {%- set device_mach = "renesas" %} {%- set device_type = "r8a7796-m3ulcb" %} -{%- set dtb = dtb|default("r8a7796-m3ulcb.dtb") %} +{%- set dtb = dtb|default("r8a77960-ulcb.dtb") %} {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} diff --git a/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 b/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 new file mode 100644 index 0000000..79b071a --- /dev/null +++ b/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 @@ -0,0 +1,28 @@ +{%- extends 'boot/generic-uboot-tftp.jinja2' %} +{%- set device_arch = "arm64" %} +{%- set sdk_arch = "aarch64" %} +{%- set device_mach = "renesas" %} +{%- set device_type = "r8a7795-h3ulcb-kf" %} +{%- set dtb = dtb|default("r8a7795-h3ulcb-4x2g.dtb") %} +{%- 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") %} + {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} + {%- set rfs_image = "agl-image-ivi-crosssdk-h3ulcb.ext4.xz" %} + {%- else %} + {%- set rfs_image = "agl-image-ivi-h3ulcb.ext4.xz" %} + {%- endif %} +{% else %} +#{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %} + {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} + {%- set rfs_image = "agl-demo-platform-crosssdk-h3ulcb.ext4.xz" %} + {%- else %} + {%- set rfs_image = "agl-demo-platform-h3ulcb.ext4.xz" %} + {%- endif %} +{% endif %} + +{%- set initrd = "initramfs-netboot-image-h3ulcb.ext4.gz" %} +{%- set yocto_machine = "h3ulcb" %} diff --git a/templates/machines/machines-branch/m3ulcb-kf-lamprey.jinja b/templates/machines/machines-branch/m3ulcb-kf-lamprey.jinja new file mode 100644 index 0000000..03f70aa --- /dev/null +++ b/templates/machines/machines-branch/m3ulcb-kf-lamprey.jinja @@ -0,0 +1,10 @@ +{%- extends 'boot/generic-uboot-tftp.jinja2' %} +{%- set device_arch = "arm64" %} +{%- set sdk_arch = "aarch64" %} +{%- set device_mach = "renesas" %} +{%- set device_type = "r8a7796-m3ulcb-kf" %} +{%- set dtb = dtb|default("r8a7796-m3ulcb-kf.dtb") %} +{%- set kernel_image = kernel_image|default("Image") %} +{%- set rootfs_type = rootfs_type|default("nbd") %} +{%- set uboot_type = "booti" %} +{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-m3ulcb.ext4.xz") %} diff --git a/templates/machines/machines-branch/m3ulcb-lamprey.jinja b/templates/machines/machines-branch/m3ulcb-lamprey.jinja new file mode 100644 index 0000000..9bbaecd --- /dev/null +++ b/templates/machines/machines-branch/m3ulcb-lamprey.jinja @@ -0,0 +1,10 @@ +{%- extends 'boot/generic-uboot-tftp.jinja2' %} +{%- set device_arch = "arm64" %} +{%- set sdk_arch = "aarch64" %} +{%- set device_mach = "renesas" %} +{%- set device_type = "r8a7796-m3ulcb" %} +{%- set dtb = dtb|default("r8a7796-m3ulcb.dtb") %} +{%- set kernel_image = kernel_image|default("Image") %} +{%- set rootfs_type = rootfs_type|default("nbd") %} +{%- set uboot_type = "booti" %} +{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-m3ulcb.ext4.xz") %} -- cgit 1.2.3-korg