On x86_64 the size of the file u-boot loaded by the tftp test has grown in size such that when loading the file to 0x200000 it overwrites a memory area reserved for PCI.
If no load address is specified for tftp do not use the ram base address (or if zero 0x200000) but the default address.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- Currently there is a bug in net/tftp.c introduced by commit a156c47e39ad ("tftp: prevent overwriting reserved memory") which does not allow loading to the second DRAM bank. Simon Goldschmidt is working to fix it.
Due to this bug with the proposed patch we see a Travis CI error for vexpress_ca15_tc2_defconfig and vexpress_ca9x4_defconfig. --- test/py/tests/test_net.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index 9c395e69fa..9ca6743afd 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -145,11 +145,12 @@ def test_net_tftpboot(u_boot_console): pytest.skip('No TFTP readable file to read')
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)) + if not addr: + output = u_boot_console.run_command('tftpboot %s' % (fn)) + else: + output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) expected_text = 'Bytes transferred = ' sz = f.get('size', None) if sz: @@ -163,7 +164,7 @@ def test_net_tftpboot(u_boot_console): if u_boot_console.config.buildconfig.get('config_cmd_crc32', 'n') != 'y': return
- output = u_boot_console.run_command('crc32 %x $filesize' % addr) + output = u_boot_console.run_command('crc32 $fileaddr $filesize') assert expected_crc in output
@pytest.mark.buildconfigspec('cmd_nfs')