From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 4 Apr 2016 18:06:14 +0000 (+0200)
Subject: test/py: Add support for loading image via tftp to specified location
X-Git-Tag: v2016.05-rc1~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ba1352b97999546610cc9b8708281b60d660e48;p=u-boot

test/py: Add support for loading image via tftp to specified location

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>
Acked-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
index 07393eb1fd..4ab58b4424 100644
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -43,6 +43,7 @@ env__net_static_env_vars = [
 # may be omitted or set to None if TFTP testing is not possible or desired.
 env__net_tftp_readable_file = {
     "fn": "ubtest-readable.bin",
+    "addr": 0x10000000,
     "size": 5058624,
     "crc32": "c2244b26",
 }
@@ -135,7 +136,10 @@ 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 not addr:
+        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 = '