From patchwork Sat Jan 26 14:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1031448 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43myq86NkGz9sD9 for ; Sun, 27 Jan 2019 01:25:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 051B9C21E07; Sat, 26 Jan 2019 14:25:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 32814C21C8B; Sat, 26 Jan 2019 14:25:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4373DC21C51; Sat, 26 Jan 2019 14:25:28 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lists.denx.de (Postfix) with ESMTPS id C9C5AC21C51 for ; Sat, 26 Jan 2019 14:25:27 +0000 (UTC) Received: from workstation4.fritz.box ([84.118.159.3]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MM0bQ-1goVMC2pUS-007ntI; Sat, 26 Jan 2019 15:25:20 +0100 From: Heinrich Schuchardt To: Tom Rini Date: Sat, 26 Jan 2019 15:25:12 +0100 Message-Id: <20190126142512.22498-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:79LYMXGDbYRuorpfnB3vRBVuN6HII16myJwOVmUCezXO/TfXUjU yMH1ugwG1tSkjt/3TS8TpnDMuYINew87JhgF8mcv14FLHYd1zHJY4LGCTthe9xfMyX3rJrY IX/PJ4188bCn3v55aBRTLSb/97FVavyhA4iox+41x1BghJ0g/IUSFRd3SJ0KCWYGoeYDPql jW3/z/gJLscTE/lNwWCxQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:YIZF9zg3Sqw=:yDXwHhMB8KOOVkGl/f9FYc IvEUUGlkYaLl79Kc3JhcXFXt31uC1bIC+XjZEny/zdYX4zcTAJEciBixjij/gw48rei4g1Q+A cUsV8PZ4ewYREXWvQ028l6W+9/6c2yLZUvFpaAQE1xYsIn3yRITMgKnN1+r+OTf+2J3aRYSu0 8ozYyrF/YndMZoEbSY60hcxwEgoDuFtGrSQFZ+VGsp2WZHo+Ida/vkks0VvJbvT9HSNvQOyWb RwiVTkyHcc/5qTLeErPnv5vd3d4O2LQM8hgv9oeU2SSGqyAzEXjvxNvjWSjiYc8fU1BWeWuur XjcdOSzic72DpT7G36UbViNlJKW+yFSBFCYG1IisorO2uG0ixVfBwdruJ6z9IU2pVTezaAdsm 711FMB1/WbVzJdSfFThU/FgpiAgv/hIieWyGDUVVBZV3odf9vlr9ujEddP4hET0wPIscqg5m2 DJrBp1d4S00wc5yLwnTN5Dln2wsSSco1dGUykOqzcJFsqcLG70rFOBWg0kkCKzf7RUB18YOrw xgRfyn1674xBLnnDeC424vWP7mKS1akVQZ+UIgbTseCS1PayWhL/Zdh5fTvnU+H9/DBAezSFb 65NFSBOKn0ASGvjAs8YtGF6YDkzz3yKiHMtU4KbnMa1aiLzkx2puhfuB9p2+fBEEpTSesl7cM 8gpqjkYu8UPrZWQgFubocl5O71vQPMTQDmjhm0KnnZBy2P4onNPWhuKYkAz6pHJBU0ImwZN67 Th7p99nCgA5FamA15m2893owcO4dMjxm0ZXBJejKUMhyu33cAwYLG1ZuNSyy95VRNTK/zpOi8 ssAKJxQaZb13OWMdWK61EZ89JGwJsa5Z8or17MltW2bfhbaMq+0JBi41zGjvra8dW8mi9ZmKc wQ9bwwGzUhuNTmUn7BiFSyWcgvsBwUb6Aeydc9FjdVAEpNRca7mytTsyerJUZQ Cc: Stephen Warren , Heinrich Schuchardt , Alexander Graf , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/1] test/py: use default load address for tftp X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 --- 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')