diff mbox

[U-Boot] test/py: Add support for loading image via tftp to specified location

Message ID ad3f296ba92c0721312cc59933c38eda795f33c5.1459413126.git.michal.simek@xilinx.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Michal Simek March 31, 2016, 8:32 a.m. UTC
For example this setting:

env__net_tftp_readable_file = {
    "fn": "ep108/image.ub",
    "addr": "0x10000000",
    "size": 25846296,
    "crc32": "b726f9de",
}

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 test/py/tests/test_net.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Stephen Warren March 31, 2016, 4:31 p.m. UTC | #1
On 03/31/2016 02:32 AM, Michal Simek wrote:
> For example this setting:
>
> env__net_tftp_readable_file = {
>      "fn": "ep108/image.ub",
>      "addr": "0x10000000",

Why not remove the quotes, so the value is an integer already...

Could you please add the "addr" field into the example at the top of 
test_net.py too?

> diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py

> +        addr = int(addr,16)

There should be a space after the comma.

... but removing the quotes as I mentioned above would allow removing 
this int() call altogether.
Michal Simek April 4, 2016, 6:06 p.m. UTC | #2
On 31.3.2016 18:31, Stephen Warren wrote:
> On 03/31/2016 02:32 AM, Michal Simek wrote:
>> For example this setting:
>>
>> env__net_tftp_readable_file = {
>>      "fn": "ep108/image.ub",
>>      "addr": "0x10000000",
> 
> Why not remove the quotes, so the value is an integer already...
> 
> Could you please add the "addr" field into the example at the top of
> test_net.py too?
> 
>> diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
> 
>> +        addr = int(addr,16)
> 
> There should be a space after the comma.
> 
> ... but removing the quotes as I mentioned above would allow removing
> this int() call altogether.

All added to v2 and sent.

Thanks,
Michal
diff mbox

Patch

diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
index 07393eb1fdf8..4c578273aee3 100644
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -135,7 +135,12 @@  def test_net_tftpboot(u_boot_console):
     if not f:
         pytest.skip('No TFTP readable file to read')
 
-    addr = u_boot_utils.find_ram_base(u_boot_console)
+    addr = f.get('addr', None)
+    if addr:
+        addr = int(addr,16)
+    else:
+        addr = u_boot_utils.find_ram_base(u_boot_console)
+
     fn = f['fn']
     output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
     expected_text = 'Bytes transferred = '