From patchwork Mon Nov 13 04:52:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 837349 X-Patchwork-Delegate: sjg@chromium.org 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="B3l1UO+Z"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yZzBB0nwrz9t2c for ; Mon, 13 Nov 2017 16:06:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DD350C21DCA; Mon, 13 Nov 2017 04:58:07 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 EC60BC21ED9; Mon, 13 Nov 2017 04:54:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4CA1EC21E77; Mon, 13 Nov 2017 04:53:28 +0000 (UTC) Received: from mail-ot0-f195.google.com (mail-ot0-f195.google.com [74.125.82.195]) by lists.denx.de (Postfix) with ESMTPS id 5373DC21E70 for ; Mon, 13 Nov 2017 04:53:25 +0000 (UTC) Received: by mail-ot0-f195.google.com with SMTP id o9so12683402ota.3 for ; Sun, 12 Nov 2017 20:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/GIzSL4ynbq3lI3bagk0BbpLHVX8SFmGtyJOK2n2d8E=; b=B3l1UO+ZeMnt8NFNxymTHKOHXLk3j3jALOkE5FkVysNj03g1MhDN03EOjoM6x7qKK4 qgvCd/KWNoAz6F9NGOvXMytyuGlOg1aOZ5R1JvtWS0FqZ0LxIrrszImDulzmEP5CQM2u r8QIHeAQCFCGIZI6IwFTkaNloNFxiIXM9QykNeGXmYf3eNdFFTgzZcd7DuxklGV4LENK oLHzMJPHU9Se1E87jO8cW5Oq2i+pgbKgLMJ2DFydYg0IZGdC2BehCURHJ1M+KFNgRluc ocRRlYAJll7vvlFZXNDI8bX3YcN0Q91Fg0OX1R4mddj5M9M+Qa/GKo+vYeNGdj5YZ7Y1 qU7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/GIzSL4ynbq3lI3bagk0BbpLHVX8SFmGtyJOK2n2d8E=; b=lXcecGO+jinWzrLMx5HyCjNEVlPtcOSbyppTzywM+sYGoiL3qm60IxkeU2+DYspr4h UweVYaFG52DLiTBO3okDOl8PPYdjZryIFIU1kWRW9H2wSuC3AWuPJwsq14FXGMpMQHZV iZCMevmuoctNISzPKFB8keYbemToqzEtvOaF8/KnZ72hPVcZLj2lamW/pPTqMRtTwoBG /H6cYihNfStr1VKb0vpzqifYu6ojckwR5GABs4I5lBGd/It2NIN/f8Esp/7PhHM9jJpz gCMsjIavu6o9f4KnW2onGsOVbayuUHNdMUWSZdwK4IRGfnKEpB2p3O6fsHgr4LhayTis a81Q== X-Gm-Message-State: AJaThX6uayloo56rjNvITGJnkKwC8hOKY0+HGiofsas/khoRDPejz2dH WzlXpFD5EK7JKYI6AWGJkmltEg== X-Google-Smtp-Source: AGs4zMZtegHkqYx1zr3tSL5+hKsiREtdAWAb1eH8TBv9K4cv0jwarACHG8GaesXxrDfuzcp1oOYWvA== X-Received: by 10.157.13.161 with SMTP id 30mr5154795ots.340.1510548803863; Sun, 12 Nov 2017 20:53:23 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:0:10f2:0:78e6:d28d:f9bb:2b9c]) by smtp.gmail.com with ESMTPSA id r8sm6772691oih.34.2017.11.12.20.53.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 20:53:23 -0800 (PST) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 7E5B5142417; Sun, 12 Nov 2017 21:53:22 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 12 Nov 2017 21:52:26 -0700 Message-Id: <20171113045231.15911-23-sjg@chromium.org> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: <20171113045231.15911-1-sjg@chromium.org> References: <20171113045231.15911-1-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH 22/26] binman: Add a test for x86-start16-spl 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This allows us to put the 16-bit x86 start-up code in SPL. Add a test for it. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- tools/binman/ftest.py | 10 +++++++++- tools/binman/test/48_x86-start16-spl.dts | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tools/binman/test/48_x86-start16-spl.dts diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 4e6aaad9d6b..c381a700311 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -34,6 +34,7 @@ ME_DATA = '0abcd' VGA_DATA = 'vga' U_BOOT_DTB_DATA = 'udtb' X86_START16_DATA = 'start16' +X86_START16_SPL_DATA = 'start16spl' U_BOOT_NODTB_DATA = 'nodtb with microcode pointer somewhere in here' FSP_DATA = 'fsp' CMC_DATA = 'cmc' @@ -74,6 +75,8 @@ class TestFunctional(unittest.TestCase): TestFunctional._MakeInputFile('vga.bin', VGA_DATA) TestFunctional._MakeInputFile('u-boot.dtb', U_BOOT_DTB_DATA) TestFunctional._MakeInputFile('u-boot-x86-16bit.bin', X86_START16_DATA) + TestFunctional._MakeInputFile('spl/u-boot-x86-16bit-spl.bin', + X86_START16_SPL_DATA) TestFunctional._MakeInputFile('u-boot-nodtb.bin', U_BOOT_NODTB_DATA) TestFunctional._MakeInputFile('fsp.bin', FSP_DATA) TestFunctional._MakeInputFile('cmc.bin', CMC_DATA) @@ -677,7 +680,7 @@ class TestFunctional(unittest.TestCase): # Check that the microcode appears immediately after the Fdt # This matches the concatenation of the data properties in - # the /microcode/update@xxx nodes in x86_ucode.dts. + # the /microcode/update@xxx nodes in 34_x86_ucode.dts. ucode_data = struct.pack('>4L', 0x12345678, 0x12345679, 0xabcd0000, 0x78235609) self.assertEqual(ucode_data, third[:len(ucode_data)]) @@ -823,6 +826,11 @@ class TestFunctional(unittest.TestCase): data = self._DoReadFile('47_spl_bss_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0) * 10) + U_BOOT_DATA, data) + def testPackStart16Spl(self): + """Test that an image with an x86 start16 region can be created""" + data = self._DoReadFile('48_x86-start16-spl.dts') + self.assertEqual(X86_START16_SPL_DATA, data[:len(X86_START16_SPL_DATA)]) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/48_x86-start16-spl.dts b/tools/binman/test/48_x86-start16-spl.dts new file mode 100644 index 00000000000..e2009f15f05 --- /dev/null +++ b/tools/binman/test/48_x86-start16-spl.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + x86-start16-spl { + }; + }; +};