From 0b427702e5f32f8573620a6770cb234bc31e2415 Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Thu, 5 Oct 2017 18:41:07 +0200 Subject: New arguments to specify build artifacts names Added new command line arguments to specifiy build artifacts names: - "--rootfs-img": for the rootfs file name - "--kernel-img": for the kernel name - "--dtb-img": for the dtb file name - "--modules-img": for the modules file name Change-Id: I665dee2b326aeaaf35148345f0501e49950ba9aa Signed-off-by: Loys Ollivier --- templates/machines/dra7xx-evm.jinja2 | 4 ++-- templates/machines/m3ulcb.jinja2 | 4 ++-- templates/machines/porter.jinja2 | 4 ++-- templates/machines/raspberrypi3.jinja2 | 11 ++++++++--- 4 files changed, 14 insertions(+), 9 deletions(-) (limited to 'templates/machines') diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2 index b4f4f34..ae3d97b 100644 --- a/templates/machines/dra7xx-evm.jinja2 +++ b/templates/machines/dra7xx-evm.jinja2 @@ -1,6 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "ti-vayu-uboot" %} -{%- set dtb = "zImage-dra7-evm-lcd-lg.dtb" %} -{%- set kernel_image = "zImage" %} +{%- set dtb = dtb|default("zImage-dra7-evm-lcd-lg.dtb") %} +{%- set kernel_image = kernel_image|default("zImage") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "bootz" %} diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2 index 568706e..16a3e76 100644 --- a/templates/machines/m3ulcb.jinja2 +++ b/templates/machines/m3ulcb.jinja2 @@ -3,7 +3,7 @@ {%- set device_mach = "renesas" %} {%- set device_type = "r8a7796-m3ulcb" %} {%- set dl_dir = "m3ulcb-nogfx" %} -{%- set dtb = "Image-r8a7796-m3ulcb.dtb" %} -{%- set kernel_image = "Image" %} +{%- set dtb = dtb|default("Image-r8a7796-m3ulcb.dtb") %} +{%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2 index f5d3aeb..1ad6e7b 100644 --- a/templates/machines/porter.jinja2 +++ b/templates/machines/porter.jinja2 @@ -1,6 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "renesas-porter-uboot" %} {%- set dl_dir = "porter-nogfx" %} -{%- set dtb = "uImage-r8a7791-porter.dtb" %} -{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} +{%- set dtb = dtb|default("uImage-r8a7791-porter.dtb") %} +{%- set initrd = initrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot") %} {%- set rootfs_type = rootfs_type|default("nbd") %} diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index c4a7086..2d96110 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -1,7 +1,12 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} -{%- set device_type = "bcm2837-rpi-3-b" %} -{%- set dtb = "uImage-bcm2710-rpi-3-b.dtb" %} -{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} {%- set device_arch = "arm64" %} {%- set device_mach = "broadcom" %} +{%- set device_type = "bcm2837-rpi-3-b" %} +{# Default boot method if not specified #} {%- set rootfs_type = rootfs_type|default("nbd") %} +{# Defaults image names dependng on boot method #} +{%- if rootfs_type == 'nbd' %} + {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} +{%- elif rootfs_type == 'ramdisk' %} + {%- set dtb = dtb|default("uImage-bcm2710-rpi-3-b.dtb") %} +{%- endif %} \ No newline at end of file -- cgit 1.2.3-korg