From f6c3c2ac82de2948d8c02d4321b3f841a4676617 Mon Sep 17 00:00:00 2001
From: Loys Ollivier <lollivier@baylibre.com>
Date: Fri, 22 Sep 2017 10:51:48 +0200
Subject: Sort machine and metadata definition fields

Sort the machine fields, metadata fields.
Easier to go through them and search for fields.

Change-Id: I657717fda116d78c5733bd1be4000645a3694713
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
---
 templates/machines/dra7xx-evm.jinja2   | 2 +-
 templates/machines/m3ulcb.jinja2       | 6 +++---
 templates/machines/porter.jinja2       | 6 +++---
 templates/machines/qemux86-64.jinja2   | 8 ++++----
 templates/machines/raspberrypi3.jinja2 | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'templates/machines')

diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index e092530..b4f4f34 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 rootfs_type = rootfs_type|default("nbd") %}
 {%- set dtb = "zImage-dra7-evm-lcd-lg.dtb" %}
 {%- set kernel_image = "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 b6e789b..5ed39cd 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -1,7 +1,7 @@
 {%- extends 'boot/generic-uboot-tftp.jinja2' %}
 {%- set device_type = "r8a7796-m3ulcb" %}
-{%- set rootfs_type = rootfs_type|default("nbd") %}
-{%- set kernel_image = "Image" %}
+{%- set dl_dir = "m3ulcb-nogfx" %}
 {%- set dtb = "Image-r8a7796-m3ulcb.dtb" %}
+{%- set kernel_image = "Image" %}
+{%- set rootfs_type = rootfs_type|default("nbd") %}
 {%- set uboot_type = "booti" %}
-{%- set dl_dir = "m3ulcb-nogfx" %}
diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2
index 62a2255..f5d3aeb 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 rootfs_type = rootfs_type|default("nbd") %}
-{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %}
-{%- set dtb = "uImage-r8a7791-porter.dtb" %}
 {%- set dl_dir = "porter-nogfx" %}
+{%- set dtb = "uImage-r8a7791-porter.dtb" %}
+{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %}
+{%- set rootfs_type = rootfs_type|default("nbd") %}
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index 905136e..1c4d44d 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -1,8 +1,8 @@
 {%- extends 'boot/generic-qemu-tmpfs.jinja2' %}
+{%- set deploy_to = "tmpfs" %}
 {%- set device_type = "qemu" %}
-{%- set rootfs_type = rootfs_type|default("ramdisk") %}
 {%- set kernel_image = "bzImage" %}
-{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda debug verbose" %}
-{%- 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 qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -m 1048 -soundhw hda" %}
+{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda debug verbose" %}
+{%- set rootfs_type = rootfs_type|default("ramdisk") %}
diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2
index 543b6c3..f1e1454 100644
--- a/templates/machines/raspberrypi3.jinja2
+++ b/templates/machines/raspberrypi3.jinja2
@@ -1,5 +1,5 @@
 {%- extends 'boot/generic-uboot-tftp.jinja2' %}
 {%- set device_type = "bcm2837-rpi-3-b" %}
-{%- set rootfs_type = rootfs_type|default("nbd") %}
 {%- set dtb = "uImage-bcm2710-rpi-3-b.dtb" %}
 {%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %}
+{%- set rootfs_type = rootfs_type|default("nbd") %}
-- 
cgit 1.2.3-korg