From b516553ebf08c2aec03b840d618fafd548656706 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 7 Sep 2017 10:41:02 +0200
Subject: rootfs_type: add default rootfs type for each device

Add a default rootfs type for each device. the type can still be
overridden from the command line. The 'boot' parameter is no longer
required with this change

Change-Id: I666287d83652bcd81d9619eee75bf9be292d936a
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 templates/base/agl-base-defaults.jinja2 | 1 +
 templates/machines/dra7xx-evm.jinja2    | 1 +
 templates/machines/m3ulcb.jinja2        | 1 +
 templates/machines/porter.jinja2        | 1 +
 templates/machines/qemux86-64.jinja2    | 1 +
 templates/machines/raspberrypi3.jinja2  | 1 +
 6 files changed, 6 insertions(+)

(limited to 'templates')

diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index ff70116..92ef06e 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -10,6 +10,7 @@
 {%- set device_type = device_type|default(yocto_machine+"-uboot") %}
 {%- set kernel_image = kernel_image|default('uImage') %}
 {%- set kernel_url = kernel_url|default(baseurl(kernel_image)) %}
+{%- set rootfs_type = rootfs_type|default("ramdisk") %}
 {%- if dtb %}
 {%- set dtb_url = dtb_url|default(baseurl(dtb)) %}
 {%- endif %}
diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index 3e16590..502ac56 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -1,5 +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 uboot_type = "bootz" %}
diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2
index e9bf6a3..b6e789b 100644
--- a/templates/machines/m3ulcb.jinja2
+++ b/templates/machines/m3ulcb.jinja2
@@ -1,5 +1,6 @@
 {%- extends 'boot/generic-uboot-tftp.jinja2' %}
 {%- set device_type = "r8a7796-m3ulcb" %}
+{%- set rootfs_type = rootfs_type|default("nbd") %}
 {%- set kernel_image = "Image" %}
 {%- set dtb = "Image-r8a7796-m3ulcb.dtb" %}
 {%- set uboot_type = "booti" %}
diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2
index 36dd96a..62a2255 100644
--- a/templates/machines/porter.jinja2
+++ b/templates/machines/porter.jinja2
@@ -1,5 +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" %}
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index d76106c..7361c0d 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -1,5 +1,6 @@
 {%- extends 'boot/generic-qemu-tmpfs.jinja2' %}
 {%- 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" %}
diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2
index ed36889..543b6c3 100644
--- a/templates/machines/raspberrypi3.jinja2
+++ b/templates/machines/raspberrypi3.jinja2
@@ -1,4 +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" %}
-- 
cgit 1.2.3-korg