summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2017-09-21 20:07:46 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-09-21 20:07:46 +0000
commit2fecbc0916bae86505375c49a3bc82ae9354b928 (patch)
treebdd4e63ea9e6a9077441afe9d0f141e4044391c6 /templates
parentbab5b166526f66d409eff09e12ac7f5db97b93b6 (diff)
parent6d8721a6c24bb6b681d9c369e0032a05e54db26a (diff)
Merge "rfs-image: provide command line options to setup the image name"
Diffstat (limited to 'templates')
-rw-r--r--templates/base/agl-base-defaults.jinja24
-rw-r--r--templates/machines/dra7xx-evm.jinja21
-rw-r--r--templates/machines/qemux86-64.jinja21
3 files changed, 2 insertions, 4 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index c8b18b4..af82379 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -21,13 +21,13 @@
{%- if rootfs_type == 'nbd' %}
{%- set deploy_to = "nbd" %}
{%- set boot_commands = "nbd" %}
-{%- set nbdroot = nbdroot|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %}
+{%- set nbdroot = rfs_image|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %}
{%- set nbdroot_url = nbdroot_url|default(baseurl(nbdroot)) %}
{%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %}
{%- set nbdinitrd = nbdinitrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %}
{%- set nbdinitrd_url = nbdinitrd_url|default(baseurl(nbdinitrd)) %}
{%- elif rootfs_type == 'ramdisk' %}
-{%- set initrd = initrd|default("initramfs-boot-image-" + yocto_machine +".gz") %}
+{%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %}
{%- set initrd_compression = initrd_compression|default(initrd|get_extension) %}
{%- endif %}
{%- if initrd %}
diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index 502ac56..e092530 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -4,4 +4,3 @@
{%- set dtb = "zImage-dra7-evm-lcd-lg.dtb" %}
{%- set kernel_image = "zImage" %}
{%- set uboot_type = "bootz" %}
-{%- set nbdroot = "agl-demo-platform-" + yocto_machine + ".ext4.xz" %}
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index 7361c0d..905136e 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -6,4 +6,3 @@
{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -m 1048 -soundhw hda" %}
{%- set qemu_arch = "x86_64" %}
{%- set deploy_to = "tmpfs" %}
-{%- set initrd = "agl-demo-platform-" + yocto_machine + ".ext4.xz" %}