Merge tag 'xilinx-for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / test / py / tests / test_fpga.py

diff --git a/test/py/tests/test_fpga.py b/test/py/tests/test_fpga.py
index 798f6eed3dc941b7451f0bdcdcf2414d5d0c8d7f..ca7ef8ea40d66a747950ee91b36dfd3d3bff4a0f 100644 (file)
--- a/test/py/tests/test_fpga.py
+++ b/test/py/tests/test_fpga.py
@@ -175,29 +175,29 @@ def test_fpga_load_fail(u_boot_console):
     f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_load')
 
     for cmd in ['dump', 'load', 'loadb']:
-       # missing dev parameter
-       expected = 'fpga: incorrect parameters passed'
-       output = u_boot_console.run_command('fpga %s %x $filesize' % (cmd, addr))
-       #assert expected in output
-       assert expected_usage in output
-
-       # more parameters - 0 at the end
-       expected = 'fpga: more parameters passed'
-       output = u_boot_console.run_command('fpga %s %x %x $filesize 0' % (cmd, dev, addr))
-       #assert expected in output
-       assert expected_usage in output
-
-       # 0 address
-       expected = 'fpga: zero fpga_data address'
-       output = u_boot_console.run_command('fpga %s %x 0 $filesize' % (cmd, dev))
-       #assert expected in output
-       assert expected_usage in output
-
-       # 0 filesize
-       expected = 'fpga: zero size'
-       output = u_boot_console.run_command('fpga %s %x %x 0' % (cmd, dev, addr))
-       #assert expected in output
-       assert expected_usage in output
+        # missing dev parameter
+        expected = 'fpga: incorrect parameters passed'
+        output = u_boot_console.run_command('fpga %s %x $filesize' % (cmd, addr))
+        #assert expected in output
+        assert expected_usage in output
+
+        # more parameters - 0 at the end
+        expected = 'fpga: more parameters passed'
+        output = u_boot_console.run_command('fpga %s %x %x $filesize 0' % (cmd, dev, addr))
+        #assert expected in output
+        assert expected_usage in output
+
+        # 0 address
+        expected = 'fpga: zero fpga_data address'
+        output = u_boot_console.run_command('fpga %s %x 0 $filesize' % (cmd, dev))
+        #assert expected in output
+        assert expected_usage in output
+
+        # 0 filesize
+        expected = 'fpga: zero size'
+        output = u_boot_console.run_command('fpga %s %x %x 0' % (cmd, dev, addr))
+        #assert expected in output
+        assert expected_usage in output
 
 @pytest.mark.buildconfigspec('cmd_fpga')
 @pytest.mark.buildconfigspec('cmd_echo')
@@ -353,6 +353,19 @@ def test_fpga_loadmk_legacy_gz(u_boot_console):
     output = u_boot_console.run_command('fpga loadmk %x %x && echo %s' % (dev, addr, expected_text))
     assert expected_text in output
 
+@pytest.mark.buildconfigspec('cmd_fpga')
+@pytest.mark.buildconfigspec('cmd_fpga_loadmk')
+@pytest.mark.buildconfigspec('fit')
+@pytest.mark.buildconfigspec('cmd_echo')
+def test_fpga_loadmk_fit_external(u_boot_console):
+    f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit_external')
+
+    u_boot_console.run_command('imi %x' % (addr))
+
+    expected_text = 'FPGA loaded successfully'
+    output = u_boot_console.run_command('fpga loadmk %x %x:fpga && echo %s' % (dev, addr, expected_text))
+    assert expected_text in output
+
 @pytest.mark.buildconfigspec('cmd_fpga')
 @pytest.mark.buildconfigspec('cmd_fpga_loadmk')
 @pytest.mark.buildconfigspec('fit')