Commit 20758fd7 authored by Guillaume Tucker's avatar Guillaume Tucker

Use base_kernel_args for Depthcharge device types

In order to be able to define some extra kernel arguments in each
Depthcharge device type and still enable each job to add extra ones,
use base_kernel_args in Depthcharge device types and join the string
with extra_kernel_args.

So the rule is: use base_kernel_args in device types and
extra_kernel_args in job definitions.
Signed-off-by: Guillaume Tucker's avatarGuillaume Tucker <guillaume.tucker@collabora.com>
parent b9ec8161
......@@ -2,7 +2,7 @@
{% set console_device = console_device | default('ttyS0') %}
{% set baud_rate = baud_rate | default(115200) %}
{% set kernel_args = extra_kernel_args | default(base_kernel_args) %}
{% set kernel_args = [base_kernel_args, extra_kernel_args] | join(" ") %}
{% set base_depthcharge_commands = depthcharge_tftp_commands | default(
" - tftpboot {SERVER_IP} {FIT} {CMDLINE}
......
......@@ -4,4 +4,4 @@
{% set mkimage_fit_arch = 'arm' %}
{% set start_message = start_message | default('Starting netboot on veyron_jaq...') %}
{% set console_device = console_device | default('ttyS2') %}
{% set extra_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
{% set base_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
......@@ -5,4 +5,4 @@
{% set start_message = start_message | default('Starting depthcharge on gru...') %}
{% set bootloader_prompt = bootloader_prompt | default('gru:') %}
{% set console_device = console_device | default('ttyS2') %}
{% set extra_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
{% set base_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
......@@ -5,4 +5,4 @@
{% set start_message = start_message | default('Starting depthcharge on nyan_big...') %}
{% set bootloader_prompt = bootloader_prompt | default('nyan_big:') %}
{% set console_device = console_device | default('ttyS0') %}
{% set extra_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
{% set base_kernel_args = base_kernel_args | default('earlyprintk=ttyS2,115200n8 console=tty1') %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment