Commit a9ec9728 authored by Dean Birch's avatar Dean Birch
Browse files

Vexpress uboot command changes after uboot changes



Previously vexpress would use setenv to define tftp commands, then setup
the dispatcher ip, common uboot commands, and then boot, which triggered
tftp commands.

Now that tftp commands are used directly prior to the boot command,
ensure that the correct network settings are in place prior to any tftp
commands are run.

Change-Id: I6b9a4622792060cacf0d7c3b65cce10801c3b369
Signed-off-by: default avatarDean Birch <dean.birch@arm.com>
parent 4c5246a2
......@@ -7,7 +7,6 @@
{% set base_high_limits = base_high_limits|default(true) %}
{% set base_uboot_commands = [
"setenv autoload no",
"setenv bootdelay 1",
"setenv ethact smc911x-0"]
-%}
......@@ -28,18 +27,6 @@
uboot_bootx_cmd|default('{BOOTX}')])
-%}
{% set base_uboot_tftp_bootcmd = uboot_tftp_bootcmd|default([
uboot_ipaddr_cmd|default('dhcp'),
"setenv serverip {SERVER_IP}",
uboot_bootx_cmd|default('{BOOTX}')])
-%}
{% set base_uboot_nfs_bootcmd = uboot_nfs_bootcmd|default([
uboot_ipaddr_cmd|default('dhcp'),
"setenv serverip {SERVER_IP}",
uboot_bootx_cmd|default('{BOOTX}')])
-%}
{% set base_uboot_usb_commands = uboot_usb_commands|default(["usb start"]) -%}
{% set uboot_needs_usb = uboot_needs_usb|default(false) %}
......@@ -362,18 +349,24 @@ actions:
- "boot"
nfs:
commands:
- "setenv serverip {SERVER_IP}"
- "setenv autoload no"
- "{{ uboot_ipaddr_cmd|default('dhcp') }}"
- "{{ uboot_common_cmds|join('"\n - "') }}"
- "setenv bootargs console={{ console_device }},{{ baud_rate }}n8 root=/dev/nfs rw {{ base_nfsroot_args }} {{ base_kernel_args }} {{ base_ip_args }}"
- "{{ base_uboot_nfs_bootcmd|join('"\n - "') }}"
- "{{ uboot_bootx_cmd|default('{BOOTX}') }}"
norflash:
commands:
- "setenv bootargs 'console={{ console_device }},{{ baud_rate }}n8 root=/dev/nfs rw {{ base_nfsroot_args }} {{ base_kernel_args }} {{ base_ip_args }}'"
- "boot"
ramdisk:
commands:
- "setenv serverip {SERVER_IP}"
- "setenv autoload no"
- "{{ uboot_ipaddr_cmd|default('dhcp') }}"
- "{{ uboot_common_cmds|join('"\n - "') }}"
- "setenv bootargs 'console={{ console_device }},{{ baud_rate }}n8 root=/dev/ram0 {{ base_kernel_args }} {{ base_ip_args }}'"
- "{{ base_uboot_tftp_bootcmd|join('"\n - "') }}"
- "{{ uboot_bootx_cmd|default('{BOOTX}') }}"
sata:
commands:
- scsi scan
......
Supports Markdown
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