From 25bccfd28a51d1dda8a84700dbcae166eef35036 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 7 Feb 2018 09:52:51 -0800 Subject: templates/machines: rpi3: switch to upstream device-type Switch the rpi3 to use the upstream LAVA device-type. Note that the the default kernel-command line arguments in the upstream device-type are suited for the upstream kernel. When building with an yocto/AGL kernel, those need to be overridden, so also update the machine template to use the correct kernel command-line. Change-Id: I823a1946bf761aa1019a9ec808fa99594337f4f4 Signed-off-by: Kevin Hilman --- templates/machines/raspberrypi3.jinja2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'templates/machines/raspberrypi3.jinja2') diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index 8123586..2380254 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -1,7 +1,7 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_arch = "arm" %} {%- set device_mach = "broadcom" %} -{%- set device_type = "raspberrypi3-uboot" %} +{%- set device_type = "bcm2837-rpi-3-b-32" %} {# Default boot method if not specified #} {%- set rootfs_type = rootfs_type|default("nbd") %} {# Defaults image names dependng on boot method #} @@ -14,3 +14,9 @@ {%- else %} {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi3.ext4.xz") %} {%- endif %} + +{%- block main %} +{{ super() }} +context: + custom_kernel_args: "8250.nr_uarts=1 bcm2709.uart_clock=48000000 smsc95xx.macaddr=AA:BB:CC:DD:EE:AA" +{% endblock %} -- cgit 1.2.3-korg