diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-04-12 11:55:07 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-04-13 09:30:56 +0200 |
| commit | 9b618eb08b00cf6a84b157c462025b22c951a4b2 (patch) | |
| tree | 0ba1ff05554c130f966dde7dc389cafb25cfaa8e | |
| parent | 018f10b1c57760071fd20cd052b1eff5ec32ecd7 (diff) | |
Rename macaddr to uboot_macaddr
For clarify the use of macaddr, rename it to uboot_macaddr.
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | boards.yaml.example | 2 | ||||
| -rwxr-xr-x | lavalab-gen.py | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -221,7 +221,7 @@ lab-slave-XX: The name of the slave (where XX is a number) devicename: Each board must be named by their device-type as "device-type-XX" (where XX is a number) type: the LAVA device-type of this device uboot_ipaddr: (optional) a static IP to set in uboot - macaddr: (Optional) the MAC address to set in uboot + uboot_macaddr: (Optional) the MAC address to set in uboot # One of uart or connection_command must be choosen uart: idvendor: The VID of the UART (Formated as 0xXXXX) diff --git a/boards.yaml.example b/boards.yaml.example index 1e485a4..5737a48 100644 --- a/boards.yaml.example +++ b/boards.yaml.example @@ -33,7 +33,7 @@ lab-slave-0: idvendor: 0x067b idproduct: 0x2303 devpath: 1.1.4 - macaddr: "00:FA:E0:DE:AD:78" + uboot_macaddr: "00:FA:E0:DE:AD:78" dragonboard-410c-01: type: dragonboard-410c pdu_generic: diff --git a/lavalab-gen.py b/lavalab-gen.py index d01ccb1..08e2649 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -119,9 +119,9 @@ def main(): device_line += template_device_connection_command.substitute(connection_command=connection_command) if "uboot_ipaddr" in b: device_line += "{%% set uboot_ipaddr_cmd = 'setenv ipaddr %s' %%}\n" % b["uboot_ipaddr"] - if "macaddr" in b: + if "uboot_macaddr" in b: device_line += '{% set uboot_set_mac = true %}' - device_line += "{%% set uboot_mac_addr = '%s' %%}" % b["macaddr"] + device_line += "{%% set uboot_mac_addr = '%s' %%}\n" % b["uboot_macaddr"] if "fastboot_serial_number" in b: fserial = b["fastboot_serial_number"] device_line += "{%% set fastboot_serial_number = '%s' %%}" % fserial |