summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/base/agl-base-defaults.jinja22
-rw-r--r--templates/boot/generic-qemu-tmpfs.jinja26
-rw-r--r--templates/machines/qemuarm.jinja22
-rw-r--r--templates/machines/qemuarm64.jinja22
-rw-r--r--templates/machines/qemux86-64.jinja22
5 files changed, 8 insertions, 6 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index 87a5a89..01589e1 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -40,6 +40,8 @@
{%- set rootfs_url = rootfs_url|default(baseurl(rootfs)) %}
{%- elif rootfs_type == 'ramdisk' %}
{%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %}
+{%- elif rootfs_type == 'rootvd' %}
+ {%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %}
{%- endif %}
{%- set initrd_compression = (initrd|get_extension) %}
diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2
index e39802d..b89ac60 100644
--- a/templates/boot/generic-qemu-tmpfs.jinja2
+++ b/templates/boot/generic-qemu-tmpfs.jinja2
@@ -32,9 +32,9 @@ context:
kernel:
image_arg: '-kernel {kernel} -append "{{ qemu_cmdline }}"'
url: {{ kernel_url }}
-{%- if initrd_url and rootfs_type == 'ramdisk' %}
- ramdisk:
- image_arg: '-drive format=raw,file={ramdisk}'
+{%- if initrd_url and rootfs_type == 'rootvd' %}
+ rootvd:
+ image_arg: '-drive format=raw,file={rootvd}'
url: {{ initrd_url }}
compression: {{ initrd_compression }}
{%- endif %}
diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2
index 7e0b904..0c83380 100644
--- a/templates/machines/qemuarm.jinja2
+++ b/templates/machines/qemuarm.jinja2
@@ -12,7 +12,7 @@
{%- set qemu_args = "-soundhw hda -device usb-ehci -device virtio-rng-pci" %}
{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %}
{%- set guestfs_interface = "virtio" %}
-{%- set rootfs_type = rootfs_type|default("ramdisk") %}
+{%- set rootfs_type = rootfs_type|default("rootvd") %}
{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm.ext4.xz") %}
{%- else %}
diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2
index 0ef5a78..c29a667 100644
--- a/templates/machines/qemuarm64.jinja2
+++ b/templates/machines/qemuarm64.jinja2
@@ -12,7 +12,7 @@
{%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci" %}
{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %}
{%- set guestfs_interface = "virtio" %}
-{%- set rootfs_type = rootfs_type|default("ramdisk") %}
+{%- set rootfs_type = rootfs_type|default("rootvd") %}
{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm64.ext4.xz") %}
{%- else %}
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index fb82011..a1e3f5c 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -8,7 +8,7 @@
{%- set qemu_arch = "x86_64" %}
{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci" %}
{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false rw fstab=no no_timer_check" %}
-{%- set rootfs_type = rootfs_type|default("ramdisk") %}
+{%- set rootfs_type = rootfs_type|default("rootvd") %}
{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %}
{%- else %}