From patchwork Thu Jun 14 21:38:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 929714 X-Patchwork-Delegate: yorksun@freescale.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=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MqXDCdQW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 416H9d6jr9z9s19 for ; Fri, 15 Jun 2018 07:40:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AAC67C21DA2; Thu, 14 Jun 2018 21:40:11 +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=BAD_ENC_HEADER, SPF_HELO_PASS, 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 0ABF1C21DDC; Thu, 14 Jun 2018 21:39:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5A70EC21DB5; Thu, 14 Jun 2018 21:39:31 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0067.outbound.protection.outlook.com [104.47.2.67]) by lists.denx.de (Postfix) with ESMTPS id B4500C21DCA for ; Thu, 14 Jun 2018 21:39:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vV7nTWYEAln+Lvhmw3ibu+1NInDhUQxNVbkGfdiRa40=; b=MqXDCdQW+5JvQVdEk20BL0/wQ/+Md33ZnEwh51kOocU0oFlGNzJJAMvNENVKJ1sXu7ZOgdoc81EOvTTgNlERP0nMV9qsIcLk6K2oCfButN3Y0mKjlOgAkHoKrZoE3FREzXtiTGvzPB2LYygf7zqbF+uN4bpGvtOu9QBsZn+w0ZA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=york.sun@nxp.com; Received: from localhost.localdomain (66.235.47.252) by AM4PR04MB2067.eurprd04.prod.outlook.com (2603:10a6:200:11::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Thu, 14 Jun 2018 21:39:20 +0000 From: York Sun To: u-boot@lists.denx.de Date: Thu, 14 Jun 2018 14:38:48 -0700 Message-Id: <1529012329-25181-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [66.235.47.252] X-ClientProxiedBy: MWHPR15CA0028.namprd15.prod.outlook.com (2603:10b6:300:ad::14) To AM4PR04MB2067.eurprd04.prod.outlook.com (2603:10a6:200:11::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4df1c99f-046b-4896-963b-08d5d23f4b94 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB2067; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB2067; 3:yjIzCJ1nP7G1vPfBiS1ui43QaVYT3Jm2tvgamsG3ns7+pV3IYnnxfL7nX6B8aP62b9eRp4BE5qA7IjCOjnRQrkUjWRDJoucinm7a6ahX22MECu7GShFeEmz3kAYkONabOv3VL04Y7M5PktjveQnm53jMgcx49i9mg4Nb1D7rpxfB7BsMVWu2MoM3vzT+HJRkeb048R93JzBTQJYi3A/xdZrPiL9uk3SKdzkrH10YkSksJyjSAFgSQzYV7IYeEMyG; 25:Rih5SN6A9YfoyKGbag3sucYQ/gFSveH6UVuV1kFlBnAX1GZVJIXEKVXI0V7qGia6H3uE/UJ5RJhbcM3O00T+tx2Gp4tQfWeScKPGHxpqBCHirDpQ9KIDKBKh1qTYU6fWM+gGL47MOqX57qNmTayvCVHUeuJDNu0EO/wI7UHVk30eUg2ON2jReyTv1KocHRRVGFraHXf1/yueptbLNhOsyysnrtRAvGl9053SkCuzo+uMzgVZp3eM/bYU6pSCuCub2DHEvZT0jDwSRe4wl5DmSFCHNmmD0906DKbUQuW9LBtjYIy1s4Mz5881YSNfTQYxUAD+89XyIGFa0b4drDjTfw==; 31:eKqZk7ARv9VDOZ99cmh1U4rfPUkjpcmp4INMQmtjRJsc5qQcyq2mHuUFXS3tLPkY2du+1bGgyyfFk3aE/TfJOIiMVCCXVPqVvD81FWnb5g3BeRbC7HsL1u5OHlViq2jCZHvUIH8w2eja2404a/B3kFBLAHELz5iu/ky80ef/r98m2LQ79C3777zId3Vw3XxVzpKpN172U0XVLdkXIQxMMPSm9Ak//CpYvVXCKLetW6s= X-MS-TrafficTypeDiagnostic: AM4PR04MB2067: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB2067; 20:WcngPemX5RD257Y09cVz7AApisXOvT7Pd1wNVywfC2Um6BkiO+C89sMarTQepu/3IjrjFHaEItm0MeJ/sLDncTOHN9vuAh11gFd4IIDei+EvJPvxknABkuRcml68ccBkwT43Iy1/VBwIeXKAdRLJoatMSHP+9vOp9jjZFXuWmX01vD8duKhB0crI6xzCn+5kiwT2MjpI+uYppSwqF/L5it0wBktrwwh3XEOLn1BcRbrEqZiekC3hmquqJUBABOCT4DD6XfJudMcCBq7OwQqKrq4MSPl0MIMWAOGbiXmGIJJmskMxfr+A6+MfkCO+C2441a3V5rMNfBkIKGASDhH0Kd4iRcNsolf4Wpuesmg7ZKexLm7P5Mlzid8VCBq2uj297YLpgiyybnvYQiIdWZTInhUa9QvH3zevxs3ikp74lJ/oaKqtD+Ty/a633lRLxvQZjK/9fP7jNG7NdYKS3fJohE04iF5TEjP3N0StV93skEDPDyw7E6zrzZNiDj45+JmY; 4:DLHoaO3a8T7AHiqzw+MbXGk3+sF/lq3ZH9Vz2XaFCRdJTP1b2guxRCR8yiQevuj6NmsPXSBTHCS2AMgVhh+1kpQ6RBYfOq8gUw+KCid4G2E0tv2x8L9lKvbCDmCYUipaHBFaU9SlxqGlE5B2+r2Hge3fPeflFJ7ReqkFNY4EIA/QcJp91lCLirw8pBqme32uzi5rO2TXoSVG6615Nq7UL84PK0pjy8C1jR2SAvthfupfsgFGKYmk09oTVeYRQwQMyLcnM8Hg/PP26Dv/mbFVXufXT4PE72JXJEYBV30Il2N0XDUlySeKW443ANFccpqI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB2067; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB2067; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(346002)(39860400002)(376002)(366004)(39380400002)(189003)(199004)(48376002)(476003)(956004)(486006)(6666003)(51416003)(6916009)(44832011)(386003)(106356001)(6506007)(105586002)(52116002)(2616005)(6486002)(50466002)(7416002)(68736007)(5660300001)(2361001)(2906002)(86362001)(478600001)(53936002)(4326008)(8936002)(2351001)(6116002)(16526019)(3846002)(36756003)(47776003)(8666007)(186003)(26005)(54906003)(16586007)(81166006)(97736004)(316002)(6512007)(305945005)(81156014)(7736002)(50226002)(39060400002)(25786009)(66066001)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB2067; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR04MB2067; 23:VW4WcjJVy62ClxG6Epi47EityNr8DRayyXitccmx7?= eRQsv7yc0ZinJl2X7hZivdKfrS7zoo4RP6JQjdQE1V3Ls/vu2Di7lovvZ3Bd2kovGQpLRSOAHffkOFviYWggQpS2q5JyHAsDD1DInB6if1ydN9WAeNnQnGGDHpxP/QF8gTsvtz2z264dB1bh7K+2EqBnxU6J9PuDOPsRRMHLTDWQmxnj4zEWF61HxFFW5xxtaQtxPtFbqkvX9hyDwJbIh4WoB3w48MLVW4GixqTQLHgD8Rukcy3YnjSVSlJAYL1x6Rbu8x5qendJ1639Qq7oH4B7D3yLpK7+GtFoP/Mx2PXJoOO4R5WAY64gfx0AMFfWrIKAa6NuweFT2LYmAjwFFe4xOk2dHJKdUqnTJyBSHmNkcst6ZxlvbFsjZbqAwZ8sKWoszeYK/GC0tY5gP+TA1xNt5rVH4acDxBqksNLW2LDpPXygO8H3GdLLgm9D4cLNdZeCTs9MvT7wMmVOgzKRYtYJ4u6ZlQ9X0lftPAlhYQx+cg2t3kROq/iZyI5TCCRkJJRSjhYqAEkGOEq3TbHw+z1Mi7TDmfWHS38mKtYGEpgg6p/t51xQJ1r4FcGOUQR0DtTRUqVTmpYGpIMB5TqS8x2iQhilMeH8PUjnzUjiWgIoFE6nTk3YynHr8BJRANExCuoNHP/ePWS4sOzZKYrAGHjnI82EbLtXi4mlVG9UTbAq62qvFXheHPeWJPMM8hTq2+a9G/ZH8rVfnfEoiC+6azY/HY79Cf1SFQHv1Ep5XC1i9a/WgeEXVUstkeYBHSAsAqwo4T31H2mkCQT7WdfPMo6Bbsrv2yvIksygiAeaRlqBbL5Ife3xDXbUfuJAW4SgpMrvIpvN9dIK71btNccH48Cx/+wg8E0zX/zgx5ZGNPxswd1BQuPNGLW/8df3N/kwGeFgzsmQX1vxC6BtMTlYbXAsb0U/1pMPhr0JptpctRYWW1RYNqCrTceVGOm6nb1rjX0aBJuHB4Mx3NRd2J6eKX01q4QVDx39Nzz5o1eudD+jVTM74AgA26HybIQ64KCblL+pyhIoVY4MGh92jzfQJWUi+gmcje0rTfOax+FsQioy44NNYAqerZtH52f2wmXWapbYcNRh4kXfol9dZO3Basl/J11o6YDSrWe6W2hz7qUrxoDg8+sJpP3cMWA0F0I2AI3k9+TikswZYsQq40KUb7KMbHx4mE0Yemk72vqQoWBm/CnjV5otseji84eybXsp5imi6hFMfG7fQ4aH7guCtpkSwNmSa5hwIwXQRmbQQ7gIg== X-Microsoft-Antispam-Message-Info: qeT2X0LgkIinOW5hwuyG3evNMgOzsxqrqw6IjB0bkxZFLnwQLOQ+pTnWoKVrlGH5dEPj7YejEZlc/JVBfwmr01jDL1fdkCV9a73dNlGdujYwdEzryRmIYfN7WyRe+PWSoCo5IXw/Vmsz1HGNq7Gg/BxGJ0DzVo7txD7Yf3qH705ldGC0TVYEG1i4oQq/7ocq X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB2067; 6:TOGcqP1wAxXWH5rLoLvAojQuWS01Amrx63Ez4F5f5YJVWMucNGCdLe+mRJv5xsUU3zaQ8x3kZdAacv97loJuYTgzO4UMZVG0kaCdu0ELckrS36X8XPFL8hFkVFc4ay9W+VGfORKRkUXSETiTBFFPwWYZTdrntIK4rYkZP6uHvfAHIABpgFKC9N9AeNlA8UoFoYH/d4vY6LXnULBv365M6vK1wUkKYlRSG7Zs4GCG0Ik/AeRJnbB1T8x1VazaXIXGEi3GuptoC3oLkIPpD/mRdm/PZWolNlrTLrl6hGTz/866TjC+Qqh0KWUKyl+uj5x5wBGjoGFpnBf6Wlu85tAdnM+5lqMIL9dBeuGVQWh9UeNSWeRVaS42Ppwo1Naz2lfVRbd6ZChACTPXM2hk0YO0hFk5y5YwOOtesdEwoV/1bKvKJl3IXBW32mgQdNrbhvrmGpWyb1pDsvUKwyue14NPSg==; 5:H+AJpJMQGmBdwqATbIvvUxcry4L81slOvmo1wrXorZ2zEfKblaFs9ZmdsYDdC9Pip+cpET8kjoacvpFi60nB086J4Uhc/Hnez9HKCTQEq5zgAfTtUd+fQvexa55ZE6YfwAG6WB8OKFREloW5lzJ7cHtqesbfTntsWzYI3KVG0NE=; 24:o4sOC8MlqfgNIjXl8OSVorngPavYfbpAWuEQr4aNAGvTGLbydo+OVK0q1VjaT2dlm8GQyxMmOdFhf9lAiMXqOlxw4JRCq6HmRrYdnCHWC7E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB2067; 7:ftfPOx/G/EVSJOSmfly//Rza2UZhte8MikXuQ1OegFm3cuIcPtJMI2FYufdXc/Ce3mSt9DWparQSAYlMf9iqdDaSlEKPgXOmtAMDCUiKh1NWq/eUvNGSpixl8UuNOT73lwkzqDunntM2IA1uQPLvMlTQr8j44buLrFpzC525fJdwDaNxI26NJAEG+zeznHDH+0vOXuklwtPU6qo+NejRhXI/vzowsW3SAxRpLuwFlFZWCM8Yo5bk8i3wttcLDag3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2018 21:39:20.9656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4df1c99f-046b-4896-963b-08d5d23f4b94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB2067 Cc: Stephen Warren , Heinrich Schuchardt , "Cooper Jr. Franklin" , Marek Vasut Subject: [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD 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" Some legacy boards use RAW image for SPL boot. Add Kconfig option SPL_PAYLOAD to set alternative image. Signed-off-by: York Sun Reviewed-by: Tom Rini --- Makefile | 4 ++-- common/spl/Kconfig | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6a190e7..36459f1 100644 --- a/Makefile +++ b/Makefile @@ -1115,8 +1115,8 @@ u-boot.sha1: u-boot.bin u-boot.dis: u-boot $(OBJDUMP) -d $< > $@ -ifdef CONFIG_TPL -SPL_PAYLOAD := tpl/u-boot-with-tpl.bin +ifneq ($(CONFIG_SPL_PAYLOAD),) +SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%) else SPL_PAYLOAD := u-boot.bin endif diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 1f14797..72b77d7 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -552,6 +552,16 @@ config SYS_OS_BASE endif # SPL_OS_BOOT +config SPL_PAYLOAD + string "SPL payload" + default "tpl/u-boot-with-tpl.bin" if TPL + default "u-boot.bin" + help + Payload for SPL boot. For backward compability, default to + u-boot.bin, i.e. RAW image without any header. In case of + TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to + use u-boot.img. + config SPL_PCI_SUPPORT bool "Support PCI drivers" help