From patchwork Thu Sep 14 19:01:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813913 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSZg5n31z9sCZ for ; Fri, 15 Sep 2017 05:02:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E7F1FC21DAC; Thu, 14 Sep 2017 19:02: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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 3E869C21C5C; Thu, 14 Sep 2017 19:02:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5F246C21C5C; Thu, 14 Sep 2017 19:02:06 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0083.outbound.protection.outlook.com [104.47.41.83]) by lists.denx.de (Postfix) with ESMTPS id 78316C21C5D for ; Thu, 14 Sep 2017 19:02:05 +0000 (UTC) Received: from BN6PR03CA0055.namprd03.prod.outlook.com (10.173.137.17) by CO2PR03MB2359.namprd03.prod.outlook.com (10.166.93.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 19:02:03 +0000 Received: from BL2FFO11FD005.protection.gbl (2a01:111:f400:7c09::165) by BN6PR03CA0055.outlook.office365.com (2603:10b6:404:4c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Thu, 14 Sep 2017 19:02:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD005.mail.protection.outlook.com (10.173.161.1) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:02 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUX021058; Thu, 14 Sep 2017 12:02:00 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:33 -0700 Message-ID: <1505415699-3401-2-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893229275270; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(39860400002)(346002)(376002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(110136004)(50226002)(39060400002)(498600001)(48376002)(8936002)(305945005)(356003)(85426001)(8676002)(50466002)(81156014)(106466001)(77096006)(81166006)(5660300001)(47776003)(105606002)(16586007)(33646002)(7416002)(2351001)(86362001)(2950100002)(97736004)(6916009)(2906002)(6666003)(189998001)(68736007)(8656003)(54906002)(575784001)(53936002)(4326008)(5003940100001)(104016004)(76176999)(50986999)(316002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2359; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD005; 1:i6btKVDzN/ihl37nuYkP9lDY00RsGbrPEzomPumKrB7Ysig1cypOCVcshe16MkLegLo76YfKTBF8ctEPJ8JaOADL/VDEjJHfgSF3C3KyRyXu4BDaH2piYZiXLh6qzuaE MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 505db648-3efe-4eac-4c1d-08d4fba315ab X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2359; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 3:lWOXV0HH/S4Nd6z7hLawl+efq1L2Ag+V2AJCub2I8B/iYs5x46op7U2LZSz6h7n1mDD4LZNUFkO4eeKNhHIHB9GrggBIl1/5d/St7lUygAy2Hq3p47TgvZBYuLpn8m9OZd7Uwm+6iwfsBAEOVCabsDLPspHbXvZOJbbkX1oKFBvBUkutc1bydbRpDy9pda8GGgd/Tp7dz5ZDOjGAACXU5TBbzw82AKNYpSSGYFsVefRHjtRp9/ELbaM6Fh4NROfwPSaKV3n+whFQ2dXjzt3taX8fRymc+pTPjJmwhoiFgAULvPYX+fisNaHPwJZj4U6P+8LC3+TyfNxuzE4fnAfQFERoshPVGOxFz0UBwhQWifM=; 25:3vZJE1YVKjQB3ql6rgv62P9n86+lFUT9FoxQ4znoPxVFB+B4p2rS8e64RXSB33RV44pHnC+/o+AHJUyJVAtJlpSYdf7bvTtudI7aKj9ri2vD/LCYwEjXH8Ko0wLfFN41TTpvo2qDTjo6yjAGTPb8qihk3fL9R7n6uJ+yDAnv5GE/hb9HsVvyNzH+06mp3SkNIEQlfl38as4oBnuEv7jAk5vCraFXOaN1VUfQ56I98GTQEJejq7B9vq4ycNg/HS3pCELM0uMuXiiaaxBJeAQrfWRuGjwCc/99KE0v2X0PeOABpU78odwAJ4wNmfLRmO4Qp0yPj8O191rVugZ2BG9DSw== X-MS-TrafficTypeDiagnostic: CO2PR03MB2359: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 31:QmazUbINGUo9ATrQjrUwMZpflzWNDkXiH+VpLNYPMSXrEQJNH7o2Y5NvbbMgDcS6ROXJbHIH5/eFfP2XZB0lrABgEzN+q6NR5eJpnROwNdHAVj+zS4PHspSeQO146U4kz/56Nj3SN+zP6p0cmlI5XnY1VZPlmYv9PswuWLFZXgzxAOcEZZJx4PAIDc5O4ZT2CpGKYtVB5RlR4O2N9VC3sb0Xtrsq1nDjR4TFc0u6mRc=; 4:xTARg0kyNjO3Yti8TO8vlP3mh0DNnfntaijwLOWyzcis20HzuA5FlveWTJ3DDD5gqKVBVSIJEn1l7RwZJQNCjHMPxtN+hm4GYYId+6qFtx1uMmphgkDr/fJKJsph63e9uPTVd63b1CGf+xWMP+W1sCKFBtMZhVJGwwEtYuOGCljxaXH1WNujmLc0UcDXk0g96lrO1IoC35/w66BoKzrkbLR77prXBPDH1y6l61ERnl/FStqpTRO0JsvMUC8WYYk+xA9ovf3urRbUmYbaLyHzXlCy8S6DC8REYnuaAG2sXzBWI/l/LR3t8C94cTl81NPAus+R5pi6r+EhmSFaU57GlQ== X-Exchange-Antispam-Report-Test: UriScan:(31051911155226)(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123563025)(20161123565025)(20161123559100)(20161123561025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2359; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2359; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2359; 23:3vB59mQ1hdykqR3jTrF1gchxQ+5d9xkxfqFSTfLBV?= 2hcor1LnTb+uEenM+Dmb+j/pkbrmubYxzJk1zymPXEyH5w+h4myNaUTtG25Z9rSFgNuuT6WqjKPLFO/KVjTAy/NyzWBVPxorb4JaYAIU3hpeh+Qt5HN/SSGZqwPidZjoIwL1ZtsKcuk+nDiakjs3ARtjAHUBPt9nVa7JsIz+7xvTL6bAftlCY/MAmhxoxZKLvWTmfXOy/fysEjkElAMf0hmLBuzjI7BGkamv5Bcl4D41eTFGLL9pzWRv4y9Npif/T24u9kj5yHUhketbIfSJsY1mQmqSGhw78jhIq1THU6y73cu90LxjCZ2OSxwPbLV5yHFpgaF6wSUf03Lira67ZvIh5VdyxQNn/J8yuxX1Moi1Hokv4kshWbwzHbfa+W41F2/UEOrOMy6w8zNtYTG/+uqZk54Ki2oS40EujQV8zjWhLXYlPupOS3NNYbT5uiY1jPyW7DE04QuI3Mq6ki67tIKA3DMQta4ei8QxrTkaMdZOJEEO1yqRc3gG/gYjGKoIouvQvVd4KP0toZPINYytSPC+fKaFamb5xX1G6apRljWY0AAQ2hmNeNrIdxODhzwODyHZsw6N38Ez5KWy7PN+g1WIYPi9GahCXkjsE7X7m3UzpqI98xyO4Q+du8j2XVO6MYBjrT0F/9k24S3HI5gJxfrWzAStnK/uyaFamkMKwCcazofaQGgskGrcUxQqzSZwZfQ+3SuVtXWgK+hxG2rKtaBt8DZ0a480zaOuLVqLgSLiy9LHYcDCzcTbLpTKhtcT1/BnfZNGqBCOOXipXe+boS3k2YZfEVKTin+tnkK2y8xy2DrrjnY+yV7Z2aJNKBvsO+U1gldqT+Wc5Mz/3juAAVQTUwhWpNRZ/oeIFQgx+N5NTRDt4Sr3hLBUxV806QtaexWU0ueALPsbY3CHt7vjTV5yx7NQL64/AyZxg3D5xjoDNsjhdqWOo8mXe8YO0QVTsIu3csTVc7sfTlYOws5Mm0fUaWwDC0m/yjuFKdrRA5XLS0k3NYI/ZIQV0VqOAeqc6ADAnf7fEyFep4Ud3ejT2ch8cGoFEg9EsaHfik94LXAZtWQJlRkksMnJ6STVlBhwMcsROq6FuGacMI1/bqH4XK1Hc741vkbkMNrwXsixUELid4KCIVf4aF2GELPldPPCXLBwMK9YmpKSY2ZwhqglQB8DxWRG/kg5BQyiHbvoZatPI+oHTTSAzAijLNfqPeAMLuawt0Ka0xGQST/uF5+CALT X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 6:tFC3CpKASx629vZQu2rykN1QtS1hzqCs7sQYkmZhyXk7klzeRjACzm5BmAWiMKoZujijaIiryH0bYPMnFeK3ARPwJkBBhWZndoz2Cnfy6GCDiE8w0gpYjV5laNFQ6umjQRkzp11uOPUAKzmLNzkTlu/emDGUxi99imlMWEzS9DDUN6xSFaUFGaYEiL18UJjgysOD10A05DBxnFZmsMRl2yjki3GBxnapF1PEEF1N+mZAXT6wM/h+Cs/WL0kZRZKdwCcCwWCDOlEE7iG//uTOH9MNcwU4DJXD3CCae3hl4VNcE1nmahDsjkayY7PDPkTo3ocuG7aYznQdIYCUiUEarQ==; 5:biObposEo/v/uXIDVddDpVsrQwQ8m+Jik4P03+rIUQNnhgnoTsR7H28c1GfDyvTZ7PS/B4WInFpoB79kLvObT2zKiH4MF40s1IGCZLnACl1El4qCnMSnNKRo5vk1IYys/uiHPg0xy/n1Ld9kuy3H1Q==; 24:4hLSLXejg6xibe//gBAn3hujuuTd6HEN0CKzmRbei3sdt5CCLudrxhoUo2htWbJSCzYjJ+kVbMzAoyaRT7N8ApEpvc65SOqh3wMGBwseeQQ=; 7:PS5bslUurO9vdhdVUyiy+S02XUm1zzgaZTrhgsHvNJb/WBjlhnEFhqqrzPlntCgsZH0I/y/5GiflOSaEWHdxUFAJiYOTqAm/I5rkHLFYLZaG52NB999M/uKcLM2OLjFgltJlUNgN9mSXkrZH33N3gf56UNbRup/5q9b35U8v36kH2eqJxJFObn/oM5FQI6HbhVUZ/sLqLIjVZeFPuW7q9xru/N9cPFKcZj/lewAvqzg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:02.5999 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2359 Cc: Tom Rini , Stefan Agner Subject: [U-Boot] [PATCH v2 1/7] spl: fix assignment of board info to global data 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" This partially reverts commit 15eb1d43bf470b85e9031c2fce7e0ce7b27dd321 which intended to move assignment of board info earlier, into board_init_r(). However, function preload_console_init() is called either from spl_board_init() or from board_init_f(). For the latter case, the board info assignment is much earlier than board_init_r(). Moving such assignment to board_init_r() would be moving it later. Signed-off-by: York Sun CC: Lokesh Vutla CC: Ravi Babu CC: Lukasz Majewski CC: Tom Rini --- Changes in v2: New patch to fix spl after rebasing to latest master. common/spl/spl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index ce9819e..98b0ca0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -365,7 +365,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2) struct spl_image_info spl_image; debug(">>spl:board_init_r()\n"); - gd->bd = &bdata; + + if (!gd->bd) + gd->bd = &bdata; + #ifdef CONFIG_SPL_OS_BOOT dram_init_banksize(); #endif @@ -450,6 +453,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) */ void preloader_console_init(void) { + if (!gd->bd) + gd->bd = &bdata; + gd->baudrate = CONFIG_BAUDRATE; serial_init(); /* serial communications setup */ From patchwork Thu Sep 14 19:01:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813914 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSbq00Rsz9sCZ for ; Fri, 15 Sep 2017 05:03:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 929CCC21DBC; Thu, 14 Sep 2017 19:02:34 +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, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS 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 0E7DEC21D82; Thu, 14 Sep 2017 19:02:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9AD84C21C5C; Thu, 14 Sep 2017 19:02:06 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0055.outbound.protection.outlook.com [104.47.32.55]) by lists.denx.de (Postfix) with ESMTPS id EE5E5C21C4F for ; Thu, 14 Sep 2017 19:02:05 +0000 (UTC) Received: from BN3PR03CA0064.namprd03.prod.outlook.com (10.167.1.152) by BN6PR03MB2691.namprd03.prod.outlook.com (10.173.144.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Thu, 14 Sep 2017 19:02:03 +0000 Received: from BL2FFO11FD021.protection.gbl (2a01:111:f400:7c09::169) by BN3PR03CA0064.outlook.office365.com (2a01:111:e400:7a4d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Thu, 14 Sep 2017 19:02:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD021.mail.protection.outlook.com (10.173.161.100) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:03 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUY021058; Thu, 14 Sep 2017 12:02:02 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:34 -0700 Message-ID: <1505415699-3401-3-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893234274624; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(39860400002)(376002)(346002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(36756003)(76176999)(8676002)(50986999)(54906002)(81156014)(53936002)(48376002)(50466002)(50226002)(81166006)(110136004)(16586007)(8936002)(498600001)(47776003)(5003940100001)(316002)(2351001)(33646002)(4326008)(68736007)(97736004)(305945005)(2906002)(105606002)(104016004)(6916009)(2950100002)(106466001)(6666003)(86362001)(189998001)(356003)(85426001)(5660300001)(77096006)(8656003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2691; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD021; 1:sjAxkgb03i+86o3QEAf8DNS2nY4QWwSqeTHt/g/ujc9uSACa9aCS+5gEPK/ccz5+9aBlA08B1j9HvFQcCAGhTT/2MVEQn08RSjmIr5zE8mnWAaHT0ZLgn3kQnZ79VHMs MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7a921bf-7290-4951-0140-08d4fba3160d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR03MB2691; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2691; 3:bNMtdwPPzXIuE6fCcUraUeBiPTUqJGU7Ww3m52V2jh883dMnRnorW6aDl+ATcVXuiFIv7x/qODG34HxPjPB1rCoe5TE1pFMdFb8f5A7iDQlHUagtGyNjqjHCpM9kBk9iUnv+sRGfVZdMVJHZY2OxvEH+O0KySsZOjCV8Koh9kwoOspoKEVV9RtBcbdCL47z4jW9qb7KDFUVRyE/EzBCxqlR97kD0gVOmkgXlLRNv+KFInw3J+XTsIFpW3Z+kmUs3GOoh9uzO7UZwO4ts934w0SrAASnxBJqHoTfA6Q4ehSMzxprlHmpfbMsXJGnPFjBxP1l0q6RvBBWiQoYIlmsTHO+ryoFPVKUU1b81HdoRQrA=; 25:22ArKPdyi8IQ3OX/qClLweTHSL19tIkwZuQoE6Oez/BXBrWCNYcvzvsucpf74ygG+eYvNP90SePlUuUQlLfzxOnGDNZHir9uhLMfxyx8dC+iRPutgFjzbaLhFGJbXIE1izOGwkfmK7nlcG3Aozy9m/G7TWv61BImSV7I0SGhRjSThkXQr1g+PITSvAVRt0SYyIKN3z/K26XS92nrnDAqhwuUE6SQ34GBA1r05he93uO9w9BlFTr2A++U4h7hRzn2lWuWMqtEKGKSCjp3J10U7jbHwr5H8xEvRSgBXptTdpm0t9VFvW7uLVM4MlGwYc8zVxUmMllDjs0bWPUC/AUqfA== X-MS-TrafficTypeDiagnostic: BN6PR03MB2691: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2691; 31:Sr9IGD0uCyLBGgF4AuUgTQYLiX8IZM875HNz5V4NV9qIojs+zUVov8PvVTQdI8KhiwiE/qnt7CTWpftAeAKxue20+owyXY1fMm9+VlN1dEoA9mFLd63Z83CkzTtmGWthyPfhn3LFi5WwgiVXIufia30NEQwdXek9NzjQGcDaLMlRF+hjqlcAWs4hsJgMSXIcaFpeKLgPDJmwslQd1E8kcj9h/rHe0YRKgIn2nZ9zvpA=; 4:FUQ50kvxZLR0cJAhknWV2FBE9z7Ujsixo72tbcoRVlRX4s6c6EdsOXE+0SEgNWVB5o6ChXmKWzpeq6DNMy+o5jkuwBpZX4Sz7XBC0HNLMnJQ9xvK6AeL4S2u42rd1wZ2YaP+f+wXinPWPA/GX5fivS7An3B6nJtaVDhxF4vOcFotXQf59M3pMPH0a0qFECQENc59diuyqDAbXiXndY3jMowSy3jlHLIfPemc27NwjoAtNlVoJYlGtUc7aFbksLWzwOjOTsBGicQEVabvEybN3NKEZj0JU2aep6MaFMH8goo= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123559100)(20161123561025)(20161123565025)(20161123556025)(20161123563025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2691; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2691; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2691; 23:vVEWkQwyxmVbqRDW5aD6dGGAgSGTYz/mq7de/1NYF?= /sn3ihdsTFsKzY3FH353Ib3qyou4XTbLhZqHlyxD/bJtmTCWMhJxLTcCHehdYMdMSS7Hhm1O99HZiwtLoszk7PLfaFjPIJ2ampuW+SmMNS3sGxjClIOnPaCdOBPOxctpinSdEKljamzi8t5BpBP2R64yIkBLt0Ga1E0SlnV3rMPoAzccdnwYFlKbZIcAE6GEPfz+jyoW4V0KZ8QbnVo0UPKGOHWNBais/y5bN5j2FlBV/uy09LZGWAFKTVeJfe67AOF7YK0zqyt1GgBsL3CQj6YDamPxkVT6nAjX8vtrfCLtpBp99Y+XAlxDKs17xRvYy83RNEUPyWO/2R1AD9y/Fsh1Ib3gG/Au6pqj7h45PdlGq+5SYVsLs0xBZQ+djiH9qeZwJPg3Yhp/Sz14Vz1KPKUyAw+nZ8GKfRfZAO1I1SP2Derh2NSvKUdKEIUyQC2enASaD8MYdETsGrQ2puNu8r7BC767fLqdOa3q230K2GPaNk1P41bdlSpIWqphroI8G2rfONwOCOCKKqGJKTrZezGwe1FlnzA/VHMG4qFXJi1ioy/BP+rXim1Khvbdi1UlRsrvm3f4V1gD3KBdMxUGP9MqO5Vba858rn76gTemD++Z1mdQ3bm0yjs2XabUuUXQwK5NoMKOb1U/PLyxijGP9HLC1bfmB1ka7EZNsdKluzXiqN5FvqNz92APm3hqbpfuzLlsmeB59XRwUl+brAtE0mahDcG1Z4YTWCW6SyjpDzCYZ5fSiiBmXlRW9KNCh5QRY9sol9IEDp+ub2alJTYNAxshmzsRJpcZtswaQcm3/mG8SQ11TmhJQ3xhPXcRcBr4pAO6U1GUbyWFGoRLkugSY9U48/WWsgYUK2Gj+/ot0ZiwSOjoo70Li82JPxJVgfGnFsyfMf2vJydTfkFosVVp2szV+Ygn7LPpLmYlg3VGumPnqJXAhpoHcethU7POcOHGCAl+LJi9EqJ9+T/DVRo6grKWYzeeHGiLHXJ47bR+ykTiCXyRbbtCF9sfoMIWjhqNEh4jvVgA6b8uD7wpfBDgM6PBbeQjXMtmFxwumSjsy2UnQARGWbGBMgFiwTh76QwxHmIpPMargursTiDLYGeCTH45GajTSAd6mpzxoDxtN+YXcmnJW9iVhNDyT+amEdIPB/yvv5bbbVEm4n0wsnMtdhC X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2691; 6:0B3LrqEGMppYc00ayl9TZOZKfLXih+3SIyJModvgzqID579ZH6qO79VL7OvtSeGYNWtko+i97cCFuZAsUEi6cCQsw74dOwO2/pYOQwwPRDioNGiEwaYm35R/syK/bJKV5McxT/tb3eyy4R1HMPFmGAJ+sOAS5aOhuX+LK1eQRb8fpnUzGBQo/Fcbug/k42yOSL5ItWHL5fqb/E9Dgw5CkaVfGTGuOJgSZWbhwBu9Zg1T2YDiOdikfAOSCXCt97yVOVLGFj43qys9lJRpgxcZ0xkzsdFL5Z/HYK6tAdA+p4l9+8agDLmTuWyQAgJbNpUzYGMQn1RrZgbCKUjRZciZ6Q==; 5:iNmzSBsWLYd7MXmbgH5YjZt/xAapkDVis+lok9nBFZG1AW1RrN9WHLL9a2NAK2KzLPv0IG6E6O1WZF7l8dtN1xwSfFZY9ql6/ElNMl55ZP/4hqUIvYrtVD/ivfwQM+gSdQSRha2AODpSYcd2Q89QHw==; 24:V7hoGnz796NzdLr3g5VaYYugks730+LKcWE5gMvApKlTN9+ZoL4Q6LZsDV5LQhPydS2v8OHER/Mb/W+VZVjcwziAJdAOKVufGJAMreEkfdc=; 7:FXuW6l1t6DZMgSMQz9JXQzl1aih3HglIeii90JQIBrnI56IZsme5RD2r5OsmvCojO0ezzOSyyh2kZuQWo7dgxfZQayM5rZ+GeSMDZKGwqQNMg4zTEvImqS+B/Ly5jvHMXeRXjX0JTnlun2rupXUis/SYmTammd2xa1r0900+yb3wGpXEJ1KzgA68rAGYZ4DNHx6wWuykzqlj385xRZ2scmijwDMZm7I3YRYzDdRZ4Co= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:03.2558 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2691 Subject: [U-Boot] [PATCH v2 2/7] cmd: spl: fix compiling error when CONFIG_CMD_SPL_WRITE_SIZE not defined 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" CONFIG_CMD_SPL_WRITE_SIZE is used for writing parameters to non-volatile storage. So far it is only used for NAND. Fix compiling error when this macro is not used for SD. Signed-off-by: York Sun CC: Anatolij Gustschin --- Changes in v2: New patch to fix compiling error after rebasing to latest mater. cmd/spl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/spl.c b/cmd/spl.c index 4d84492..3b8992a 100644 --- a/cmd/spl.c +++ b/cmd/spl.c @@ -121,9 +121,11 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) (void *)images.ft_addr); env_set_addr("fdtargsaddr", images.ft_addr); env_set_hex("fdtargslen", fdt_totalsize(images.ft_addr)); +#ifdef CONFIG_CMD_SPL_WRITE_SIZE if (fdt_totalsize(images.ft_addr) > CONFIG_CMD_SPL_WRITE_SIZE) puts("WARN: FDT size > CMD_SPL_WRITE_SIZE\n"); +#endif break; #endif case SPL_EXPORT_ATAGS: From patchwork Thu Sep 14 19:01:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813915 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSbx1yZfz9sCZ for ; Fri, 15 Sep 2017 05:03:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 03AABC21DA4; Thu, 14 Sep 2017 19:02:50 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 1A0F5C21DB2; Thu, 14 Sep 2017 19:02:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AD641C21C4F; Thu, 14 Sep 2017 19:02:06 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0083.outbound.protection.outlook.com [104.47.41.83]) by lists.denx.de (Postfix) with ESMTPS id 25F46C21C6D for ; Thu, 14 Sep 2017 19:02:06 +0000 (UTC) Received: from MWHPR03CA0046.namprd03.prod.outlook.com (10.174.173.163) by CO2PR03MB2359.namprd03.prod.outlook.com (10.166.93.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 19:02:05 +0000 Received: from BN1BFFO11FD047.protection.gbl (2a01:111:f400:7c10::1:105) by MWHPR03CA0046.outlook.office365.com (2603:10b6:301:3b::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD047.mail.protection.outlook.com (10.58.145.2) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:04 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUZ021058; Thu, 14 Sep 2017 12:02:03 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:35 -0700 Message-ID: <1505415699-3401-4-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893251519470; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(39860400002)(346002)(376002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(110136004)(50226002)(498600001)(48376002)(8936002)(305945005)(356003)(85426001)(8676002)(50466002)(81156014)(106466001)(77096006)(81166006)(5660300001)(47776003)(105606002)(16586007)(33646002)(7416002)(2351001)(86362001)(2950100002)(97736004)(6916009)(2906002)(6666003)(189998001)(68736007)(8656003)(54906002)(53936002)(4326008)(5003940100001)(104016004)(76176999)(50986999)(316002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2359; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD047; 1:he/cF4Z6AfHk1c4Ae1YpM6eNuHSuD7vuWX+ybluZP012W1wjU2uROm2xCUkmzPXVI659R6ud0DiuTP+8vtcpnI/aMJNj4dIEZjP0b12gJXV67SowG3/SH5nWYoY1PKtZ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5c90623-8596-4b38-c290-08d4fba31711 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2359; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 3:j5TPqyyWAEvVACaap/dzqyadw1YMXi3GR/LRr6zjnBIX+9kU/bxyZ028gDbW9CJTDyTeT8vZWrMSyDnexwmnQe8suLusWONS3IHX6HkQNHJKupR7bOKPi4u674WM8kqFo5paztujCLm8R2ibhT5duPfx5qimFDkx9v/t8ipY+qfq8PudB+v3VYypmlIoznrHwi1SnSGv2hjMkaYJEEthn4clkg/it4xN7otn8qO8efq5yCEhFlWIxX5H0SCoqHIeXUZb/eGGcSZYxiv4hOBcFtzPa2roBsdJvNECtYgzu8U4kuaVm3ABrG5smL4i6tEfa6lJpK/KaEfFyj7WQxFVjWTHhmz4Iexh6UTxk6zexwY=; 25:LVeR8toMFN2U71MNzROsZeS+5FhbP1nUNF5ka4Bx3lmEMuECKdAgQymEXVHHgLjbXhJk/gzEXvnA5vw9gXNlNCDMAUZsZNSpmt048qmPaxr3pi3eTQ4g6m+Vlmg4pgseqDefZtBtYW85E/KArALyRWfbMHphnrvl9eYgL4ruIOY1UzFMRVhREFaOV0kc8SmDM0/JxcTLucLFougzef1UrIqC2FSrndYisWAHdYbTABTGatb0n+gEUU+YAvXPqkY1MTY2w4Bt1xT+ik2IYKyIAw+tDCFVg/hss5YKeh129JpjmIc+dJhBFxms7UIhQr/bQZM2WOIhzrB8N8N6OnMqlQ== X-MS-TrafficTypeDiagnostic: CO2PR03MB2359: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 31:LKKdjHPAzPLnSq0MX6mwppt8BwlNSIpfechbSA9ObHHX+x8hspIeUECA9j6M0JrT9M/4nOCFnmv7TgjIr3ShaV+0aUphlIDyMwaecKVSoPB5Ig7lvqfAkbxGVRADKCmIS/vYtyBb6iuk+KZ1XpKMo9rx4U2iFtcXx3jp+UASn1vfvhfA9/wuTaWhLe2J0bV1+ROl2huA3d1hoR6d2INOQANDp/pkj1DuXjgkOn/hZNg=; 4:q/yAUlSsVvcTTuptpoUgUTgzAgjFYX6/BWPSQMEH7puUXPSNsYIlvbX1t3o0FR2xhXzOeYqpjY22BcJpdnDeta/cH4dpis4F+ibTrXny9WU4iAgthUOuF6GL2C+ZjQLKFLKzuWg5NGpdo3NkgtSwOf5GiJRpKiP3qwhOlICp050U71W14zscV9uui3GrlzwOc8IcTiItgQv4af2PaZjUr/7tAZobHDq2MG7RUoQbGbORXD1y9lfksw+ZvnOU/ApQjIUesh/5iNcK9OkM/pSh+i3DE8Cbi3zCQkBRsmoattY= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123563025)(20161123565025)(20161123559100)(20161123561025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2359; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2359; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2359; 23:ZMy3qPtKoiR/4cau/xCEaARDWTzlBPpicHU0epVgk?= T4Iaa/nAfKQJGNdzRytmZdrWVIE9+p3JRX45jJ1b14VM+HXiIDVEHqeJraUBJNd07U5gEk8OiCk4Dh2kM6YLyEwxXV7VrnQAOt+/WFAcrOCfs3dbjCbIZGVqJ0JzAArbpde1Ol8E5CTgtpwimtKxuKDLuK4gS1J+z73uYscDGZ5Ek1Ntqd0B4Sy2NkX+7W54xTEup8tOC47eUtpagJL422DrMq6KGMnYOg6iSlxqNV25mHfM7Y9L7IqiUpG7C71YNGX+XpT3aRo+ZByDUgeR5jsgoZRIJn26f0Ay6XtN+DK/PO0DEq5L25GyiYO5q892A709z+/JSOmrbNi7BZireaHxaVycENvXo415YrRMCTXK4ZpJC3ZB2jgOAX0WLXAkXOChQExrVvz61jE2zdTDVNe23i6UMeGW9n4Qk0LoPFyzIRRXes7BAt63Am0Yywg+WDx8KPhc9i3z9fJNixHZuySV/T7LxIEOFC608jRhWh7uKpTQpwQFdnyXCp85RX57rmu3Fgmq+TNqZgF9DgrPci2o/VWp/0Gi+7QpsYfm29W92C4ryPOKvnUNANU4rPrX6FQqF1JAprl46BQnhBNSsXz9NbsCcE8s5zgMcEYvB1ZfU+jyZkQ31+lQSAfz8l/b+xRM4URT0nWDllD+ZTXcMM/KXOSJeEIkSr9tguQ2GG3vHVdGZJ87L7+toymwERA4pvU1EDMP7B1KhxJr+II05OXxtvuswtTgnScwuh6lf1Kv5btWDrsXLopCj3VGAvlGnWpl2F3RIjFulenwRcOmTjQVIEd96vtc2z7ur/i3BsOsL55YX0sj0gf05D82iMkEsiffhTolZzycoGsAG1u7K1xDtXAVQasFMtu1TKS5QFPhHFno9OfZgyhLKES2aYXUSKktcwSQ99uOupsB0MYvXV7gMVqy+JgqH0V40zasJsWTSgl4zGcDk+a/++0oIncJaCNUuwPe1WQs7d1xwJlFUvkCEqLHwnZ5dV/7j/B0dvtZSwJlzjaWt+aNZ7X9P59PzkJpRduAw1PaH4mps1+8x4loPWVEDtEbadj1KGuXNfb/nPFbWziFKqiIpoFzwodSHuBX3ZKZJTcs8EKyGYK2mS3Y4RT7o6mzGwXfA7HFSfQ55P2m3fGGh40/hsmMnSrZHHNdzFS9au4e717t2oYj/cNyBhVO4q1kvNRlb1TvqBaxg== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 6:eK7kiR3jHScYeAoDFdWRE8I8zbgoCcCcoddhuqasfN1Pw/7Jn11o7/Rk2wF9j0pDPgWU2xrpID3jzNIagNXW2g8LIdllt/q5zDziV2n4ibDtZxT8cHxw9kK17Gu6Nzc29wQQ7lcdFBOts4xrnO8QE25zZDlc7bHfgdTM3OfWjYgJhV82gm2SUfJjidJRxAC3XwIM9nQT/2bEuE7E7cC930WETdaCU8PnZgIwTo76DaCVgSrq9KasmjDaIgLUCmz1JT06EINJ5TIZ59TvjpSZKRMUYmGhfOFBQ7z1sJ1GmMuQx8XPhOdOtaLFS3F+eICT04ACcDodyq3k52mUCDx9Vg==; 5:cqWzyw6uso1z/ZsVGnIko2rDvrhtrzydvcbE4qNElqohk/+AIoth2bBXCh7mvSlzxEnqd1y4nY2edTAGnHF+qsBKlRR6KYO4dWngg6zE0LCbYt34nKr71FfQgfo/g22GCZaLMsVmY8n5whkElNbfEw==; 24:RP2I+mmEmoO7n1yzbi7LXSGPoYkmVY9p1GQJDF8FKYtNYvwJt43xLgdbuQpnGD4T0O78B2wvCbbpKNN6FVp1oDxYIYQu+BfXnle6CjPV0yc=; 7:vbdupgZLOCa8GE62AisnbUj9vOcXwDnkIwdrMvOJ/9VRHG65vrVNO4dttH4san3+wJekbyVVdHVV0Rus2wHgvfmmkdxeGzHjd6i8mMTZ4QgYDx1RR0OeBlIM84F2/00eS+P8tAOIb/M2VeC9ftulv99ciEN6mhgpXs3K931O2jUrCKnEAkOcyg/tO8OEYnN8q9+oDBf6ML3IA6oEz5/Sh5qpZGzqD2g/F7MC8OyNfVE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:04.9179 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2359 Cc: Albert Aribaud , Yuantian Tang , Priyanka Jain , Hou Zhiqiang Subject: [U-Boot] [PATCH v2 3/7] armv8: fsl-layerscape: Avoid running dram_init_banksize again 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" gd->ram_size is reduced in this function to reserve secure memory. Avoid running this function again to further reduce memory size. This fixes issue for SPL boot with PPA image loaded in which case secure memory is incorrectly allocated due to repeated calling. Signed-off-by: York Sun Reviewed-by: Simon Glass --- Changes in v2: New patch to fix gd->ram_size error after rebasing to latest mater. arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index d21a494..fe5f4a9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -698,8 +698,19 @@ int dram_init_banksize(void) * memory. The DDR extends from low region to high region(s) presuming * no hole is created with DDR configuration. gd->arch.secure_ram tracks * the location of secure memory. gd->arch.resv_ram tracks the location - * of reserved memory for Management Complex (MC). + * of reserved memory for Management Complex (MC). Because gd->ram_size + * is reduced by this function if secure memory is reserved, checking + * gd->arch.secure_ram should be done to avoid running it repeatedly. */ + +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE + if (gd->arch.secure_ram & MEM_RESERVE_SECURE_MAINTAINED) { + debug("No need to run again, skip %s\n", __func__); + + return 0; + } +#endif + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; if (gd->ram_size > CONFIG_SYS_DDR_BLOCK1_SIZE) { gd->bd->bi_dram[0].size = CONFIG_SYS_DDR_BLOCK1_SIZE; @@ -797,6 +808,11 @@ int dram_init_banksize(void) } #endif +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE + debug("%s is called. gd->ram_size is reduced to %lu\n", + __func__, (ulong)gd->ram_size); +#endif + return 0; } From patchwork Thu Sep 14 19:01:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813920 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSgJ1HQXz9sCZ for ; Fri, 15 Sep 2017 05:06:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DD6FCC21E3B; Thu, 14 Sep 2017 19:03:05 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS 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 14ED8C21E0F; Thu, 14 Sep 2017 19:02:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C207C21C73; Thu, 14 Sep 2017 19:02:12 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0060.outbound.protection.outlook.com [104.47.34.60]) by lists.denx.de (Postfix) with ESMTPS id 57700C21C73 for ; Thu, 14 Sep 2017 19:02:08 +0000 (UTC) Received: from CY4PR03CA0015.namprd03.prod.outlook.com (10.168.162.25) by MWHPR03MB2702.namprd03.prod.outlook.com (10.168.207.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 19:02:06 +0000 Received: from BY2FFO11FD023.protection.gbl (2a01:111:f400:7c0c::138) by CY4PR03CA0015.outlook.office365.com (2603:10b6:903:33::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD023.mail.protection.outlook.com (10.1.15.212) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:05 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUa021058; Thu, 14 Sep 2017 12:02:04 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:36 -0700 Message-ID: <1505415699-3401-5-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893256639681; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(39860400002)(376002)(346002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(104016004)(53936002)(50466002)(2906002)(6916009)(2950100002)(6666003)(54906002)(50986999)(76176999)(33646002)(5003940100001)(5660300001)(189998001)(105606002)(2351001)(106466001)(97736004)(85426001)(498600001)(81156014)(16586007)(8676002)(316002)(305945005)(68736007)(8936002)(81166006)(36756003)(47776003)(8656003)(107886003)(110136004)(86362001)(50226002)(356003)(77096006)(48376002)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2702; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD023; 1:VeVjLZxBoo6+DzXrkhtmH1QT+Rz2XCU6USsi0KCucEvG6/jRCqM0WnIDwQaEQsnd2wcsXU/kWCBdGTzAsZnQu/jZ/uCNQzY/3BNwj6AV16B4OPEu67erOXMmaCaI8aBz MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c892b46-e668-477c-e360-08d4fba3175f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR03MB2702; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 3:IR6rE44VoPaK2KjHpSs3oM1oEcp0ZEm/Dm57k/9MiUi+vn0FSLaNw8OL3lTM+dyDNAtlwdvTZOayawfn1S6cpTCrixEb9Yj/8or/bfxMCWzBUG5UBMtQ8XgMOdQpojQS390aOjotOw6el9zDNGeLkJIl+qRghcG38dnZevLb3HZWHTiBSxgz1FZR8x/o8Roz/NxaOY2j1+kEfmaP+Pt1DOPe3Uu5PPiYn1FwURkWJCRzXQviN2ZApgFj4vgfXd9HK5m3YNmj9TFACnKCBQYofyPMjlhhES+Zp4+dwVnfNvGkfBZuLbX4EwzVMJAfwq92VObK934Y8hGADOiELzdXYvLc8bJhYJtwkkNaP0bCAQU=; 25:9ed56JO8IuzKCfu0/kex8NhReYXVrkVujJGwq6OX1zaAWWUFhK6GuvC5gBEhvI57D5+dDlFEiZrVgItwl3KCVQNbh3J/urvI9oHgl9r7ncOPYfXLJ6C/D62cwPwQ0aAjPDeVBSYOP5JEfGSpXoNLv5+LlpV8Zkr3jbK6gTcULV1DEqYuNsuzO83SJMWjpZHHqOeH5gitNZs3a3s+Z1SkbPlV14vJSzIQwj0+6y22tq61DuLQYvSFodoUPBerkjMe2JKg7f6Pme6UwS+4LB50gjvJ3q0Tw06vAy3ig83596Qf3LNAbcBHvt42AQmbWyTQxst0eQUZlzX2l65FjrBh3w== X-MS-TrafficTypeDiagnostic: MWHPR03MB2702: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 31:Q1nFCZWHRgpedHhbhV559Re+zuyip74TAd2lpZV3+DCiNaBeZStcVMgWG7FwX6SYbGJ0mBbA+AA7lXa+8r0IOife5j0EXKQlADNL9S1tOO0LThLB0nKO3GoccFIEerG2wOx8bNBa62vnkm8m60HTjTLVJV0pHzCNvcZ/i+gxwM6tX+v38rL8X7Pb/lpvUX6ks+vYCeikm1PROiZyG0Cl6hZgpgAKKtiQddBvOpjwtSc=; 4:eluQiTtwcsch5eHwDlQ7WtqjW1YL7qna02nM7Cg5sikYNk54wqYdYw94Vw9S5lueXZyZuTTedk4m8AaNVu5mhUg0stKroySRN42S6nBFeUMuWIaNFdDXsavsiLvELAX3bCEtKU/5v4y36AVKG1rVs5taj/Dd6SBouvDePe0ur7DgsXuMDTH5ac8T5CipouEwUncHMBEYEDnaN3e5kb0iy0eSvnO3/CpUPYucK/Mj7lLep5jERbPEzCFuOqLz1PJ7knrR4oFzoaJ+kcrGzJPOvvu6ZKVVoVbv4RPB7uehZ2A= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(20161123559100)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2702; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2702; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2702; 23:cvIFSaUGE3cC5qT4eVYcA5mGnUnb5l77/zueGNynK?= QVO0W9+zpxJqW7a0WmhDpWZ+0U0/Ke4anYcoemcLFnoDQSoEH/CXN0bTvw6DzeJAsN1vTzyQwTELPYFKeQiwLLhb5p1dXRGr2YMbM0HNKSwzqyf0589Z9JobnJ5+9wEEfjPovRsGczNMYENQKmWAi3mwScZK49VprO12Mb/QXkXxNlOpvh7G2mb6q50eBg0wQgC9Y3Vgk32+Q5DsoYHQG5Q1pMEgTIzn1leVn2GSn4C9ey+B91hmmqKGuD5OwL1Udoi81MXoiuAVZ3vqxP0iwolrXMZk5cvwzgf6/epQuSTv1TQqkWZu7vmyhT8/iCjoGa0r8bws/KLBJg1xWM349myI9QEpg7KpfnwBd76UseraLDrW+YocxpP4LkeLX5PQz/AoCJ1mlLpSZWmMkYhnEP18lKJ09PJqyzrKE6iEzpVyLRZY3Am0b3+K27JbsvufefiFfvXEfbqvW/fIBQbE5nn3JThq3e+9WCak1qK9fuvHRAH/bfHBcoKYYk1KqXpLw3cNx3LE5bdGSNhjPiY6MWYUx31dNMGsYHy16RI/1hWc+1lAuBmmA91k2WZyUXEnzMsiqsBbjEnIBdv/d1siWiyPKZicbhru+9jOlDzAvwpfoOoyHFtLZsDvfZ4zwo7U4WaKqSKrDM4IVE4z8D+p6GJDMjqdUSLmK2uFWIJjWL/o8yPA2rBbf63/NedYGr5T/L8V0yVY4HEJvWwOuQiD7IFeGxb9XeR4weFt/BCVJ8doSiGwUlkTcmqhTtixjSXOqD2DNYdGtuqIdf8EL7FU7lOC037/zq0P7hkKD4zS4RvEj6a8T8np01sCJty3QSjm0jSrYQdwAt/vYolvXFbKxyaxBTgBZPmE0kIoLORNPolUVPODB8Na+4rspvCcVSzpwx2gILEQb5kQKZMlqPnqYUhOH40vzsXY4L5GBPyUB4l6WQuJG7KxcM4THMUHCpz6H3lQykcimCclrJkgbQEvQDFj995HbEgxq1wc59QEuhYjqUWdL0w9u8wAuNg0tpsgIkWcCPcAISrrLcJNbL3Xe8ImahWKN9MAFDoBpL4C0Exc6uz3CSU1QnIf3e1veB45qiLCvhogpx779fa7wVVne9sYnGseJTp4FD+SdHth62TvYOrFjSlwo555Mk/GRE0FVvBMM+H8UXwGm/4S8ZwU6i3wpeu4ZMjbJpUgGWn2WHE5Q== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 6:NX1uoXK27A7dIDXoMeWN7w6Ldl2dQbf7ST6za4BmjhFU42OGLIR6MnjjNE+z0G5AzsFpYC9sYVjpYKvyMAU85b1/+JnPThaPrMpGLdQlzvTVgg7eqSw2mVE+kR86DAP0H91b4kn70ZPVD7OqVXRpTeZEuc4zIcliJeKeQVHbCY1/1LHZmQdTCQq8pazcGonEciyNEUqDBaHhJbqvaajLoP2yj8vLQ1uIrHW7Yr/jKTj3UN87kiIhW1ziVAgeVyl9etbg9ppfemw4c7VtrwxHNaOBzhp35kjvaajU2AcQ40OIkr2ycj3rFfR30wF0w73xia3KIl5BQQT9fjeXLts4QQ==; 5:WjSigazi1XMlPXi2SFLGWubOT29XboveSbUt6kgdS7JViNIrr+5nSbK1qiOWgVHcgdS+ic/QCR4dp6t3PIkagL4qQ1/9lK2RvRi67fRng9aHqtgf3bl89cvLOiKQZucnrlvRGCECqPnrp7kCT+V8TA==; 24:O8Sa/NaXKFUoff8MilxRIlosJggw1SI4UmyoZ9CQe3588R2FL1cVByylhpvtHRrAkcuEEdIpBgDIe3mUkoWHk9EjAdcgKVNF3WJ9JzHRhf8=; 7:pGEzTffGE5cZ/iPxO9PzkUvZVJ3H1rP4l+ndCzSV2VPz+wcM+0+iwcsBJYZ/hQUtYzxef8gtKFNAeELsrnt+pkNQ2+8u2AH+v/SzPIPrjHmqcin2XIrp4YLgwbi25QrkTEv9rwQsFn8/ywbbBFNgEaHXMOq7YMKwusabjt8dhf+HRcl4/7whxX6cc0Nl/YbojWK+lx2szRj6/m28hkfXt6G9BtLkAI+hspIkU1EZ20k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:05.4611 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2702 Cc: Mingkai Hu Subject: [U-Boot] [PATCH v2 4/7] armv8: ls1043ardb: Use static DDR setting for SPL boot 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" This board has soldered DDR chips. To reduce the SPL image size, use static DDR setting instead of dynamic DDR driver. Signed-off-by: York Sun --- Changes in v2: Drop checking secure boot in this patch after rebasing to latest mater. Recent change in SPL makes the image size bigger. board/freescale/ls1043ardb/ddr.c | 46 +++++++++++++++++++++++++++ board/freescale/ls1043ardb/ddr.h | 67 ++++++++++++++++++++++++++++++++++++++++ include/configs/ls1043ardb.h | 6 ++-- 3 files changed, 116 insertions(+), 3 deletions(-) diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 354b864..c8f3b5a 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -169,18 +169,64 @@ int fsl_ddr_get_dimm_params(dimm_params_t *pdimm, return 0; } +#else + +phys_size_t fixed_sdram(void) +{ + int i; + char buf[32]; + fsl_ddr_cfg_regs_t ddr_cfg_regs; + phys_size_t ddr_size; + ulong ddr_freq, ddr_freq_mhz; + + ddr_freq = get_ddr_freq(0); + ddr_freq_mhz = ddr_freq / 1000000; + + printf("Configuring DDR for %s MT/s data rate\n", + strmhz(buf, ddr_freq)); + + for (i = 0; fixed_ddr_parm_0[i].max_freq > 0; i++) { + if ((ddr_freq_mhz > fixed_ddr_parm_0[i].min_freq) && + (ddr_freq_mhz <= fixed_ddr_parm_0[i].max_freq)) { + memcpy(&ddr_cfg_regs, + fixed_ddr_parm_0[i].ddr_settings, + sizeof(ddr_cfg_regs)); + break; + } + } + + if (fixed_ddr_parm_0[i].max_freq == 0) + panic("Unsupported DDR data rate %s MT/s data rate\n", + strmhz(buf, ddr_freq)); + + ddr_size = (phys_size_t) 2048 * 1024 * 1024; + fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0, 0); + + return ddr_size; +} #endif int fsl_initdram(void) { phys_size_t dram_size; +#ifdef CONFIG_SYS_DDR_RAW_TIMING #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) puts("Initializing DDR....\n"); dram_size = fsl_ddr_sdram(); #else dram_size = fsl_ddr_sdram_size(); #endif +#else +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) + puts("Initialzing DDR using fixed setting\n"); + dram_size = fixed_sdram(); +#else + gd->ram_size = 0x80000000; + + return 0; +#endif +#endif erratum_a008850_post(); #ifdef CONFIG_FSL_DEEP_SLEEP diff --git a/board/freescale/ls1043ardb/ddr.h b/board/freescale/ls1043ardb/ddr.h index a77ddf3..926eff8 100644 --- a/board/freescale/ls1043ardb/ddr.h +++ b/board/freescale/ls1043ardb/ddr.h @@ -45,4 +45,71 @@ static const struct board_specific_parameters *udimms[] = { udimm0, }; +#ifndef CONFIG_SYS_DDR_RAW_TIMING +fsl_ddr_cfg_regs_t ddr_cfg_regs_1600 = { + .cs[0].bnds = 0x0000007F, + .cs[1].bnds = 0, + .cs[2].bnds = 0, + .cs[3].bnds = 0, + .cs[0].config = 0x80040322, + .cs[0].config_2 = 0, + .cs[1].config = 0, + .cs[1].config_2 = 0, + .cs[2].config = 0, + .cs[3].config = 0, + .timing_cfg_3 = 0x010C1000, + .timing_cfg_0 = 0x91550018, + .timing_cfg_1 = 0xBBB48C42, + .timing_cfg_2 = 0x0048C111, + .ddr_sdram_cfg = 0xC50C0008, + .ddr_sdram_cfg_2 = 0x00401100, + .ddr_sdram_cfg_3 = 0, + .ddr_sdram_mode = 0x03010210, + .ddr_sdram_mode_2 = 0, + .ddr_sdram_mode_3 = 0x00010210, + .ddr_sdram_mode_4 = 0, + .ddr_sdram_mode_5 = 0x00010210, + .ddr_sdram_mode_6 = 0, + .ddr_sdram_mode_7 = 0x00010210, + .ddr_sdram_mode_8 = 0, + .ddr_sdram_mode_9 = 0x00000500, + .ddr_sdram_mode_10 = 0x04000000, + .ddr_sdram_mode_11 = 0x00000400, + .ddr_sdram_mode_12 = 0x04000000, + .ddr_sdram_mode_13 = 0x00000400, + .ddr_sdram_mode_14 = 0x04000000, + .ddr_sdram_mode_15 = 0x00000400, + .ddr_sdram_mode_16 = 0x04000000, + .ddr_sdram_interval = 0x18600618, + .ddr_data_init = 0xDEADBEEF, + .ddr_sdram_clk_cntl = 0x03000000, + .ddr_init_addr = 0, + .ddr_init_ext_addr = 0, + .timing_cfg_4 = 0x00000002, + .timing_cfg_5 = 0x03401400, + .timing_cfg_6 = 0, + .timing_cfg_7 = 0x13300000, + .timing_cfg_8 = 0x02115600, + .timing_cfg_9 = 0, + .ddr_zq_cntl = 0x8A090705, + .ddr_wrlvl_cntl = 0x8675F607, + .ddr_wrlvl_cntl_2 = 0x07090800, + .ddr_wrlvl_cntl_3 = 0, + .ddr_sr_cntr = 0, + .ddr_sdram_rcw_1 = 0, + .ddr_sdram_rcw_2 = 0, + .ddr_cdr1 = 0x80040000, + .ddr_cdr2 = 0x0000A181, + .dq_map_0 = 0, + .dq_map_1 = 0, + .dq_map_2 = 0, + .dq_map_3 = 0, + .debug[28] = 0x00700046, + +}; +fixed_ddr_parm_t fixed_ddr_parm_0[] = { + {1550, 1650, &ddr_cfg_regs_1600}, + {0, 0, NULL} +}; +#endif #endif diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index ca1d862..da87497 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -28,13 +28,13 @@ #define CONFIG_SYS_SPD_BUS_NUM 0 -#define CONFIG_FSL_DDR_BIST #ifndef CONFIG_SPL -#define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ -#endif #define CONFIG_SYS_DDR_RAW_TIMING +#define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ +#define CONFIG_FSL_DDR_BIST #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#endif #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1043ardb/ls1043ardb_pbi.cfg From patchwork Thu Sep 14 19:01:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813916 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSdf5h3Fz9sCZ for ; Fri, 15 Sep 2017 05:04:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 895A0C21E26; Thu, 14 Sep 2017 19:04:01 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 1DCE8C21E5D; Thu, 14 Sep 2017 19:02:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ED479C21D6A; Thu, 14 Sep 2017 19:02:16 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0045.outbound.protection.outlook.com [104.47.37.45]) by lists.denx.de (Postfix) with ESMTPS id 38C7BC21E09 for ; Thu, 14 Sep 2017 19:02:12 +0000 (UTC) Received: from CY1PR03CA0007.namprd03.prod.outlook.com (2603:10b6:600::17) by BN1PR0301MB0721.namprd03.prod.outlook.com (2a01:111:e400:4c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 19:02:07 +0000 Received: from BL2FFO11OLC007.protection.gbl (2a01:111:f400:7c09::184) by CY1PR03CA0007.outlook.office365.com (2603:10b6:600::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Thu, 14 Sep 2017 19:02:07 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC007.mail.protection.outlook.com (10.173.160.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:07 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUb021058; Thu, 14 Sep 2017 12:02:05 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:37 -0700 Message-ID: <1505415699-3401-6-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893276473541; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(376002)(39860400002)(39380400002)(346002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8936002)(81156014)(6916009)(2950100002)(189998001)(50226002)(8676002)(2351001)(50986999)(85426001)(106466001)(76176999)(81166006)(305945005)(105606002)(356003)(47776003)(16586007)(498600001)(33646002)(2906002)(6666003)(36756003)(50466002)(316002)(8656003)(39060400002)(54906002)(53936002)(4326008)(110136004)(5003940100001)(104016004)(48376002)(86362001)(5660300001)(7416002)(77096006)(97736004)(68736007)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0721; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC007; 1:pTX6kJ8bUc+ydHIEeheH7UQ/HYcZWRo1xaLny3l5GS2tDxSh2pjmj9NPOiWjaUbsGV4RrBqbH+Y0AktDwQg4scENCCWpHQqRpUBqL25Okjlr2YGPKeSrOJQy5NCIuUsj MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e16e8401-69bc-4c28-7c80-08d4fba3187b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN1PR0301MB0721; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 3:yS5cEFlhuZJYXv4s5pdXLDKj/cpbW+a5SJinAd5JHefqtqpHgSrw8+1njUi3y6RPTgAVj/bqPWOr+w4GNLxCb950BNjFztsRWYkixbU94LhhslxelmrHxgy6ZT/3nSFLOy+Q+6y3JWnDgTClwhMVg/qS6QU3TyPLHn36hC8v+++JMTlnAT4mAe4q2cJGJSaWwIT6FSB/slUWFW5frPx92gzF6SS+FoGI+G2WPKuwhbUQlEzCzcvAk6h1TRmQuLMoKdlpoZ20xZjS/4wEuSThcYFxvNotCE8msWp9YGNpVGbl2DGZ7UGUWDwV0NsuIdaqQpcn3AM5/4gHOy17WQA8FXQmWUhY5X0yV2HIOtTwk8s=; 25:3UkCLlV5LWQLXzx28i1GoBG8BBeauJACnpXGNVb4Njrg9+7OIp3HRgcKWgu48hx7L3qFD2nZVOGWuIH7kdeRqBBP0Z1m9gPakzh4xPXWtkTGQzYN/+Tn8Vn1NH1jh2y2if3GdzPZ+gj86fpZYXiolGqih6IA+7UOw5MQrlW22ydTfw4np6uo/du/LXF7iULjEW0ROoRtC7skYFlg1EOBXA2blv7C2Dm+oCs+jW5bkIjcHjUn/ytlIbCup5zsEK99poRvMfyEmMN+k2Q4gzV5WybLBzQrawCCe42SFzOoBZO7YW0NOabji0qbqyCofP7pdYxbJUlWC6IKb3b6iAbRGQ== X-MS-TrafficTypeDiagnostic: BN1PR0301MB0721: X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 31:euagHavKAa/1L4mgWhPqIJ0+mOYZXPSDHvw4/usUiO/VS1NsVWhD4TuMv+M7jqJ/U53eUDs7Iju2H6x0sQhJ/n5+i71LFZbQJrB8m+x4I46u/ieNCH+uc9BqqfT0MzD3SPXGEli1uW1ViBaQ7kN2afjUQsNedkcywXVdYadL/HSewSPFAdvLATo3bZIIHhDLgtVYicyVpDKimljlfgsfrOHVhFhkKuaaP+v4IfTRlmY=; 4:XfILu16UaXCYCYYLjDX3CUyhk+hInMV+mYALMrcndRbG8bQ1cUgfXCkjXQEvIUENw5H3/msq4MAGTXn4Cjb+7M7cAnW5d6IbTZMV2YD+SAWQMvX4OPxhYhc2NG/sUdKpFrfsGx2RODFZ/1EV1rSgkNWR/dWMa8XArhr05P3A0ieOiXYvtPuK4Yd28zHWRxGDG52X6LWWrILSKGEuSlAIYr2Wda1K2GaZeH3cKyPTkW7KVaW/e+A2zWuol+uAFNcUH6sjqsfWH2DDKnfBxy7sx6KbhlqD9gttu7w3D7AeyUA= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123559100)(20161123561025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(20161123563025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN1PR0301MB0721; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN1PR0301MB0721; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0721; 23:fumyc45kRyBH9dEy71RzpJ2f94SKMoBN1A7W3bd?= gYNiPmGR+y7CiZuurseliYgsiS6AWgCSNjHPNQU4xDZXpQzV2sS9s3RJeHLSzIB6sOaqgOG0wvvCkWZzkuZsZv1RaMdhc4jdiCL7gP5AzFD8UpVoMZVVUy3cclp0Ne+2VzDXWGrrhIX+vvzCrn1j+spuPFREWmV/r//cRarErIvYdJeiYIPlGATgc5TWNLDNzAm0jXSNS0/FZqlTtZTtd57aacuFDqqqG3ZrjsfsCVeXETVPg5IzheNk3DlbReOLDzax4e/OUpLn5BJ/7GfyL/eLymdzqkoK/1zRU/gnjFAtXgRc2JHSlHQBxiR4pwLzu5ZO8jJNNpZm02Wntjj8RMWrLBz9N/av0wyg/a8BE9dHCGHnxJMXLTQs2pbYGKbZMcTtNiTclTE7AKCZwScs6q65Wpc1Y01+GwodZiOMQqCB3+yhBvQC4lkWAiDJSeidMhj5wxDuGbc43jQ84IuDy8hn4zHdT9Yw5Mms8k3tfgdEHiDkPk2HhCYoe+ESO10JTkKrFdKVU+Qdd195NV4eo2gsv+1Q7FknlvV6E2pw/xiaxSY6sMrxlafAxWCV78lnHYs0uE8TlmE4VLP4avE2wo9PDqHHY5U0xxJnAUsWyK7sYeLH1FO0AnPzwCsvwAZDsOkh1YhHOUvwlxn4iktdXUoIVnkMnJHIzKz4RZN/csc9nZDRd+5idszWl3On097b74iTtAEUZqVPKFzGnvWnPlCgsKTiX+knlbsaigi1zuFbyf4IaLxJneOEW9htgXl6+ttfjCAjLLSCwvSnlEyjBK5NGhGEHlQ/uSdIcMNTHwi6X63gseECkc9T6/Y6RRAFxZfWQxFsDR0Q1bYhazecoG5QeEB6pHxYTd/xCu1SyoirWG6xAIRq4QIWsyFhlrmThIDGhZICGTHKpq9W051Dl8V9KnYXZN67rYIPc7PDAvKRq32mD5dTGHFwB1qC6CO+zQIw/ghp+VTax1Uw2WYAJt79iEsG7j0tkMCu9n/ncM51qZZq+1K/Zfy++t9LezObsP4j9IN7NASG1YTpGdpdTG/T8z2Pmp3mj/MTSIkWypzKu71d6w1Auq/snQE1+1dtn9uWgUnl+m2iVuH+LisQv30fFQp5QGK78jHd8/GQmuP8tO1Ofntc2MpMI0fcMBQKY9xL/c1l+RcusrBlhm8M892Sn9gLWmDjYIv0fPmMvfVJJozLtp6EwNAHBaGHSxUUqLTc= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0721; 6:QvFo5Mg1KPUZGvZcAFG9wuLxZvFjgPiAvY0BwbmQnf4KWsgQzTLlFRmNinXO7tBSEzJmaIhBxQoULNJwy7UdW9YDOYJs4TFul7ETGLnQSDpA5rqGuX4Bt8QjGbokykoqV6kQkroJj+Pi4IJfWFiJSQMOn2dTNoaFj64bTrq/q9zxD8+rNHHz7ExGExY4RRpPnGY4gOm6fBn8Jf7TUHQE/TTPYgL4J4z43CNSHiuG4j4s2K7yJvUQNN8AiKj6MnzMKjIqaSw3NlzNuhDcChKTaWxzz8FfNQ6qFSTSYztwcZUOhR9KXJF24/mHF+R3zJ8weLMHeV88RosFtQC6DqVkww==; 5:kVuxuLi3hIqKllDsZEQABmhsky6b1Qi6PADN/vgESYsVfGjOM+QW/TRXTnxLGRv4QXdINoLMzXOeV2JT7yM78dQprEV+4BATeu2drWRA89CrqhqW7B1P2qFud9g1hzehnBBIUtRYP5wC4Mcyaiv9IQ==; 24:TnofXO2b2ZWS5EBXz75h5YIl70lFIffNraLg4d74Apa5s4RfPfhuM5W8VSf9P38PCdvzzivLY3KnYZF0jMdMDaI1Wh6EBRqgdET8OTLitf4=; 7:ZKLRB2QoFTP01z6fa4rx9p2pnU1n/R/axPU1kO7bIKs7IJv2tRBMxtAbuzhKksvEFDKhi0n8Z5jO39OBeZmQG4UrmP2PuTv41O0Bt0TK+uYEcVsDNYwTzkP0LOnTNSSjzWRchNbTrrAK0ABZLL8W0aEakNkaO12bCReV+guvd+gpu6wadUcjIJJsQhlXobvnMlhi7X8ud5IKFr643cSpB2RthUN/c3iWwVUFnSh5wsQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:07.2261 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0721 Cc: Albert Aribaud , Stephen Warren , Hou Zhiqiang , Vinitha Pillai-B57223 , Ruchika Gupta Subject: [U-Boot] [PATCH v2 5/7] armv8: layerscape: Eanble falcon boot 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" Add jump_to_image_linux() for arm64. Add "noreturn" flag to armv8_switch_to_el2(). Add hooks to fsl-layerscape to enable falcon boot. Signed-off-by: York Sun Reviewed-by: Simon Glass --- Changes in v2: Relace getenv_f() with env_get_f() after rebasing to latet master. .../arm/cpu/armv8/fsl-layerscape/doc/README.falcon | 140 +++++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/spl.c | 29 +++++ arch/arm/include/asm/system.h | 2 +- arch/arm/lib/spl.c | 11 ++ 4 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon new file mode 100644 index 0000000..282b19f --- /dev/null +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon @@ -0,0 +1,140 @@ +Falcon boot option +------------------ +Falcon boot is a short cut boot method for SD/eMMC targets. It skips loading the +RAM version U-Boot. Instead, it loads FIT image and boot directly to Linux. +CONFIG_SPL_OS_BOOT enables falcon boot. CONFIG_SPL_LOAD_FIT enables the FIT +image support (also need CONFIG_SPL_OF_LIBFDT, CONFIG_SPL_FIT and optionally +CONFIG_SPL_GZIP). + +To enable falcon boot, a hook function spl_start_uboot() returns 0 to indicate +booting U-Boot is not the first choice. The kernel FIT image needs to be put +at CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. SPL mmc driver reads the header to +determine if this is a FIT image. If true, FIT image components are parsed and +copied or decompressed (if applicable) to their desitinations. If FIT image is +not found, normal U-Boot flow will follow. + +An important part of falcon boot is to prepare the device tree. A normal U-Boot +does FDT fixups when booting Linux. For falcon boot, Linux boots directly from +SPL, skipping the normal U-Boot. The device tree has to be prepared in advance. +A command "spl export" should be called under the normal RAM version U-Boot. +It is equivalent to go through "bootm" step-by-step until device tree fixup is +done. The device tree in memory is the one needed for falcon boot. Falcon boot +flow suggests to save this image to SD/eMMC at the location pointed by macro +CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR, with maximum size specified by macro +CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS. However, when FIT image is used for +Linux, the device tree stored in FIT image overwrites the memory loaded by spl +driver from these sectors. We could change this loading order to favor the +stored sectors. But when secure boot is enabled, these sectors are used for +signature header and needs to be loaded before the FIT image. So it is important +to understand the device tree in FIT image should be the one actually used, or +leave it abscent to favor the stored sectors. It is easier to deploy the FIT +image with embedded static device tree to multiple boards. + +Macro CONFIG_SYS_SPL_ARGS_ADDR serves two purposes. One is the pointer to load +the stored sectors to. Normally this is the static device tree. The second +purpose is the memory location of signature header for secure boot. After the +FIT image is loaded into memory, it is validated against the signature header +before individual components are extracted (and optionally decompressed) into +their final memory locations, respectivelly. After the validation, the header +is no longer used. The static device tree is copied into this location. So +this macro is passed as the location of device tree when booting Linux. + +Steps to prepare static device tree +----------------------------------- +To prepare the static device tree for Layerscape boards, it is important to +understand the fixups in U-Boot. Memory size and location, as well as reserved +memory blocks are added/updated. Ethernet MAC addressed are updated. FMan +microcode (if used) is embedded in the device tree. Kernel command line and +initrd information are embedded. Others including CPU status, boot method, +Ethernet port status, etc. are also updated. + +Following normal booting process, all variables are set, all images are loaded +before "bootm" command would be issued to boot, run command + +spl export fdt
+ +where the address is the location of FIT image. U-Boot goes through the booting +process as if "bootm start", "bootm loados", "bootm ramdisk"... commands but +stops before "bootm go". There we have the fixed-up device tree in memory. +We can check the device tree header by these commands + +fdt addr +fdt header + +Where the fdt address is the device tree in memory. It is printed by U-Boot. +It is useful to know the exact size. One way to extract this static device +tree is to save it to eMMC/SD using command in U-Boot, and extract under Linux +with these commands, repectivelly + +mmc write
+dd if=/dev/mmcblk0 of= bs=512 skip= count= + +Note, U-Boot takes values as hexadecimals while Linux takes them as decimals by +default. If using NAND or other storage, the commands are slightly different. +When we have the static device tree image, we can re-make the FIT image with +it. It is important to specify the load addresses in FIT image for every +components. Otherwise U-Boot cannot load them correctly. + +Generate FIT image with static device tree +------------------------------------------ +Example: + +/dts-v1/; + +/ { + description = "Image file for the LS1043A Linux Kernel"; + #address-cells = <1>; + + images { + kernel@1 { + description = "ARM64 Linux kernel"; + data = /incbin/("./arch/arm64/boot/Image.gz"); + type = "kernel"; + arch = "arm64"; + os = "linux"; + compression = "gzip"; + load = <0x80080000>; + entry = <0x80080000>; + }; + fdt@1 { + description = "Flattened Device Tree blob"; + data = /incbin/("./fsl-ls1043ardb-static.dtb"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + load = <0x90000000>; + }; + ramdisk@1 { + description = "LS1043 Ramdisk"; + data = /incbin/("./rootfs.cpio.gz"); + type = "ramdisk"; + arch = "arm64"; + os = "linux"; + compression = "gzip"; + load = <0xa0000000>; + }; + }; + + configurations { + default = "config@1"; + config@1 { + description = "Boot Linux kernel"; + kernel = "kernel@1"; + fdt = "fdt@1"; + ramdisk = "ramdisk@1"; + loadables = "fdt", "ramdisk"; + }; + }; +}; + +The "loadables" is not optional. It tells SPL which images to load into memory. + +Other things to consider +----------------------- +Falcon boot skips a lot of initialization in U-Boot. If Linux expects the +hardware to be initialized by U-Boot, the related code should be ported to SPL +build. For example, if Linux expect Ethernet PHY to be initialized in U-Boot +(which is not a common case), the PHY initialization has to be included in +falcon boot. This increases the SPL image size and should be handled carefully. +If Linux has PHY driver enabled, it still depends on the correct MDIO bus setup +in U-Boot. Normal U-Boot sets the MDC ratio to generate a proper clock signal. diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 2776240..30b5432 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -116,4 +116,33 @@ void board_init_f(ulong dummy) gd->arch.tlb_allocated = gd->arch.tlb_addr; #endif /* CONFIG_SPL_FSL_LS_PPA */ } + +#ifdef CONFIG_SPL_OS_BOOT +/* + * Return + * 0 if booting into OS is selected + * 1 if booting into U-Boot is selected + */ +int spl_start_uboot(void) +{ + char s[8]; + + env_init(); + env_get_f("boot_os", s, sizeof(s)); + if ((s != NULL) && (*s != '0' && *s != 'n' && *s != 'N' && + *s != 'f' && *s != 'F')) + return 0; + + return 1; +} +#endif /* CONFIG_SPL_OS_BOOT */ +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + /* Just empty function now - can't decide what to choose */ + debug("%s: %s\n", __func__, name); + + return 0; +} +#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 79bd19a..7d8dc44 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -215,7 +215,7 @@ void __asm_switch_ttbr(u64 new_ttbr); * @entry_point: kernel entry point * @es_flag: execution state flag, ES_TO_AARCH64 or ES_TO_AARCH32 */ -void armv8_switch_to_el2(u64 args, u64 mach_nr, u64 fdt_addr, +void __noreturn armv8_switch_to_el2(u64 args, u64 mach_nr, u64 fdt_addr, u64 arg4, u64 entry_point, u64 es_flag); /* * Switch from EL2 to EL1 for ARMv8 diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 27d6682..ab5d227 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -7,6 +7,7 @@ * * SPDX-License-Identifier: GPL-2.0+ */ + #include #include #include @@ -47,6 +48,15 @@ void __weak board_init_f(ulong dummy) * image. */ #ifdef CONFIG_SPL_OS_BOOT +#ifdef CONFIG_ARM64 +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) +{ + debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg); + cleanup_before_linux(); + armv8_switch_to_el2((u64)spl_image->arg, 0, 0, 0, + spl_image->entry_point, ES_TO_AARCH64); +} +#else void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { unsigned long machid = 0xffffffff; @@ -62,4 +72,5 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) cleanup_before_linux(); image_entry(0, machid, spl_image->arg); } +#endif /* CONFIG_ARM64 */ #endif From patchwork Thu Sep 14 19:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813918 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSf622fBz9sCZ for ; Fri, 15 Sep 2017 05:05:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E92FCC21E5D; Thu, 14 Sep 2017 19:03:42 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 451EAC21E1E; Thu, 14 Sep 2017 19:02:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5863CC21C6D; Thu, 14 Sep 2017 19:02:14 +0000 (UTC) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0081.outbound.protection.outlook.com [104.47.38.81]) by lists.denx.de (Postfix) with ESMTPS id 61D83C21DC6 for ; Thu, 14 Sep 2017 19:02:10 +0000 (UTC) Received: from BN6PR03CA0016.namprd03.prod.outlook.com (10.168.230.154) by CY4PR03MB2694.namprd03.prod.outlook.com (10.173.43.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 19:02:08 +0000 Received: from BN1BFFO11FD009.protection.gbl (2a01:111:f400:7c10::1:167) by BN6PR03CA0016.outlook.office365.com (2603:10b6:404:23::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:08 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD009.mail.protection.outlook.com (10.58.144.72) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:08 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUc021058; Thu, 14 Sep 2017 12:02:06 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:38 -0700 Message-ID: <1505415699-3401-7-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893284778073; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(376002)(346002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(356003)(189998001)(86362001)(5003940100001)(8936002)(81166006)(8676002)(6666003)(81156014)(5660300001)(305945005)(2950100002)(8656003)(50226002)(76176999)(50986999)(6916009)(68736007)(498600001)(48376002)(36756003)(53936002)(316002)(106466001)(85426001)(54906002)(50466002)(107886003)(105606002)(97736004)(110136004)(33646002)(104016004)(47776003)(2906002)(77096006)(16586007)(2351001)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2694; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD009; 1:4I5KWVXe1qTkQuDCzd1kvGeQ45dOnpK62eOzumkTN78DL+251KjuFlfxGX/FKJDtTiX4FMNAK9KfB6GjHr5UGP6QvEfnH+60p5xEpy9sTd5NVuRu0nDI5AQJA+ZJbvsD MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d33d98b5-6e27-43e8-9551-08d4fba318fc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR03MB2694; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 3:eoldQ4StIT711A7S/Bee4pVCR0QYum+zeMsJ3hFxF6jMqkyslAYU/qMXQwuqH1qTePNg5Ha8JTZXvu3eEDhhxgA7qQ37LhUrYX8XitDto3w6zQjN0c+NbVr2+xYME5ggW9qmodt2zGuYmN63rpJUxTFEf1+2kethKu4iQR1lk3TDOpOapBx095WsXkZEao5z8TFMfF4OmHIJAap933wELMT3o2hoEfnldJ924uWS3yezi7VV4d8TIJvM136Ku5yQmTGXPrdH21W3OLrGehuLPxYqL5aTEN+M3xxl0naqCnAt/MSn5ciH4zWxHX12bj5jYAQO+OqyTH1mhi7CLJl/r56nD666pjTnUqfG74KenbA=; 25:/VL5pdPfo8aLvMy34shsxH3Ja22GTUmEaONmRCtOTyVLQmRoVnqi31L4PZPPCRdUjPQqnFhi9z6MxzP7i7sQsrxA/3oVHaQUEMOUMiaknZ6s0r0Jqs+VJgtlblguAoN+rRr6yXzpU4VqgjcBNouqqKYeoYnOhqxUfROay0fRAJq11zaSzN+de3Ts7OKD86dd07rI1bohmUfsppXlL5OofVrfgcUwMhMcOAr+xcuyAK13Uy/CN8fzg8ShNSUoi0VmgwjA1EjPHHO0Y/GhoO2t3mwdznzFuW9SGpd47mzw6IT5D8XVFtBXBsR9jLfiWfYvo7MIswvgFoIAZuYHZAkPlg== X-MS-TrafficTypeDiagnostic: CY4PR03MB2694: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 31:Gena2KsK0eJCZDHjNi6SBQkVkQPdBiyXKZZb1ph/45rYLdgYmsDJZaOZuv4PP79p12TWYNwUfm+Da7xIRTNtcc9UAAXdsKwc+rZ+nvyuWIEIKMDFlJrdsGyzxnrOsureRfiq9LlZUTcA7d6fs31+JDsivCmkoG1a3LGHFOhyh39RyCrnkGJLRSt81v0P9I0VF775OSzYncQ2ycvbPNxHCwR8119JXttiX2VmjLkCd5I=; 4:O02e7MXgi4v/nVSrQYIQfA7E/ZCUHgRQ79j52yAGjse2qCPPJwdyrC2dFrHiQELHB87m21BqlvL4iT61VXsttd2rlBk+uXUIFnA0jPrfz/BLwHW0Wq2xhCO/nESGDqbEXUpN13SdZhBN24UgRjZ0vgh0d/nnvqXrhVOvZ0MJrbPmZqg7h1yx/CQPvMYsaImzeoKsSm2BBuf3qJ4F9733Bhvn0sqzssJpqt90rBYZG4FF6k1DJwERvp4VEokxQahg7D0L/iUW+iEwGaA2tI/Dvx3I0Eets2juaBDSYh7fGUo= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6055026)(6096035)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123559100)(20161123563025)(20161123556025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB2694; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB2694; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2694; 23:8botYECT1x+g1clnkEYQGVj+lthBVUpep6pPD86Rr?= 9pyM/MZ9xRtU5efd6RPBLVhoCgRoiFq8M1fJcKeBxH1ozW3Gq8Wqvcgppyy6MTxi7YQhv6o3kPuE3T9tSE3EYyz3XyJ3U7bkm4enBAw6fiR3ARozePVvNzIJ4CgpyRq4w1Gr76uKx4jrazoUIri3O/kR7n2jpCCO3sdS06tsfvehw90UVvlbdGAj1HpIA27k4ACBcn6I3nFMt3ogAnsZPOfbgE3eV3dN9HVztSKbSYiOftVrNOKoIr12kCUSwdN5w/cBZ30j+Qji8dDr8zQRchTalQ8Nyxseo6NJkTpKwOBkcbMl5BkODjGctEoWpkXMkPwwHuNbbaEMed82zXMiaEAnldHn81E/OvARRsaLd6ECCvkoqadbUZ7ubl/uvkwEqUt1N4PKpR1XRLGRus2/SNe3o5ntbSw/2EpiNFRDrHx/jZnIBrDXj6bJ/rux3LAncveCkmudFm0Agj2VWzddEK0LBWi1UtyxVwxWGcgOZtwOnebRos86plwgjEwM75qokFgeuuTA0eOdJi0WJvrix+BkQwdm26JXDPbD/eQLHdWWtYoJv/3yTkymMk7aEOPOrHPiH+bASIP4mn6h+qGdZnsdMM8XMb0K1fWLrNueLx8Dl6ZVDQbFf4PcXrgpnzMB907J/SxNX94XHYv3U+uJ7VmasNc9XXPpqDQg9/HAOwVJNOFVo0PNQJe4jYl0/VhCi0nAZRnu6gjegcTtLtkRRv93W5GazxuiQzQrHwO/u8T905nA7a/qL8OSsMvMZ8wn4gg3g7xQVWOCxXBqFzu9RXFpU4fVIIw1IwAyHpCOduluSxqCxrmDUp33ti7UtRGrvpdcwGICf4HKWx1XLXCHmWceBO4FP52o7wt9QJz44dV/bA98ZCRMYIOlvNPv2DKDit+1WIbBPRW/N6YqcndKQmcucZY6Z63L4Ec2fWYxUadqVcuDYqudZhWAvJS1vD31yPb1uLoTF5nPv589D4EHbdyCdSSaRCVJKR+BtxTYYQmguqRvmKDR+LHbZb4CpuU7jU9+yO8XvSC/Wn0V/qV6CShfB9NBZI+WZzRDCFVl1ReSRRxL7U56jIaZ3Sueqbks2+JRhLLZxGI/hCvmJECRAxiQTZmrKUySzpXx7k3BWeRaBMEIkqOwcstec4SSMCre1saRDiY74js4rxZBIKbVL9+ X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 6:l5pqVTkvqw1dM4TxqGFpShmibK0pryr4j9RXlWrI+faXxfvML4Gen/M0ngQrX//9h0gxMuxCHygikJZRjmKxALQlvSWOVajXAzPt1Dcmqc2HCIC3Q5rlv0MEIDUHhV852zj8rJ8QhufVg5WJmKprXrDCIkFLMwJsyMmWg1Zp5OZw9U8t864CZIjMdjhbwBdvSko06/ZBST5oJcSIOZqPp6ndQI7TB1zG1QXS8e1uCP3IVJGQKbDUP0Q5RRhf5doKPl5LbDnTNAfd3Oeq/OD+A1Fh3BONCh/LeB3RKaLX4NdGT2AO30qr5hx4RaC+S7lNwcQf/5PBM+D5C83Pt8gShw==; 5:o0JoQ3ZVyuyLZY6XT5R8CorGr7C+Bni1cLaME4NVaEUnlAT/PAfe8lzGKyHcyroA3oYsbogFEHavkT8UC5Oe8nb6ZzFlbyW+LuLf5qFBDUSeXzip1CQ/St3ZB9D9zJoDCj3fALe3zbzdT7gFaR0pQA==; 24:sQ6s7BuTq6SwRzK/NnTwGtOnaFcANpZQVTmKGczKKxofwHz7n3FpfojUHLKIXa06dNx9TUB4jstUh4ydQ+5KNTi1FWb5pUcTuE5jYqDEd2Y=; 7:z+f3WTZh6ByJXdkuLsN6ElpplOCz6ve5Ut5d0N3qHe0sRluLdSVYAAGZjGFPejK7qTeyapZmjkHvSBcqiGm3MnA8wlVOD2+YWnzJXmUyGBWmSUogThdXYvHLeXG4AAwFRU7OIZONxMa80Gv1/Q4/9+sOVNRuf5vGRMEncbaNqed3CQZgUO3lY5MzTUzJFl25TlKvCPA2Si4/6lAhNntn/eE+E/08qcqjl91JBwXNpzI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:08.1814 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2694 Cc: Mingkai Hu , Ruchika Gupta Subject: [U-Boot] [PATCH v2 6/7] armv8: ls1043ardb: Enable spl_board_init() function 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" CONFIG_SPL_BOARD_INIT is used for SPL boot. Enable it in defconfig for LS1043ARDB SPL targets. Signed-off-by: York Sun --- Changes in v2: None configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 1 + configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig index 5c8599e..416182a 100644 --- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig @@ -17,6 +17,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_SPL=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0 CONFIG_SPL_CRYPTO_SUPPORT=y diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig index e5310fe..d680d93 100644 --- a/configs/ls1043ardb_nand_defconfig +++ b/configs/ls1043ardb_nand_defconfig @@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_SPL=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0 CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index bdd7ea7..b2144f3 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -18,6 +18,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_SPL=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 CONFIG_SPL_CRYPTO_SUPPORT=y diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index efdaaa3..2ce2aba 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -18,6 +18,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_SPL=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0 CONFIG_SPL_ENV_SUPPORT=y From patchwork Thu Sep 14 19:01:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 813917 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xtSdm2st0z9sCZ for ; Fri, 15 Sep 2017 05:05:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 219E7C21DDE; Thu, 14 Sep 2017 19:03:24 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 1B85CC21DF7; Thu, 14 Sep 2017 19:02:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EAA18C21E31; Thu, 14 Sep 2017 19:02:16 +0000 (UTC) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0073.outbound.protection.outlook.com [104.47.40.73]) by lists.denx.de (Postfix) with ESMTPS id 92389C21C6D for ; Thu, 14 Sep 2017 19:02:12 +0000 (UTC) Received: from BN3PR03CA0075.namprd03.prod.outlook.com (10.167.1.163) by CY1PR03MB2362.namprd03.prod.outlook.com (10.166.207.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Thu, 14 Sep 2017 19:02:10 +0000 Received: from BN1AFFO11FD029.protection.gbl (2a01:111:f400:7c10::161) by BN3PR03CA0075.outlook.office365.com (2a01:111:e400:7a4d::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Thu, 14 Sep 2017 19:02:09 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD029.mail.protection.outlook.com (10.58.52.184) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 19:02:09 +0000 Received: from oslab-l16.am.freescale.net ([10.214.83.126]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8EJ1uUd021058; Thu, 14 Sep 2017 12:02:07 -0700 From: York Sun To: Date: Thu, 14 Sep 2017 12:01:39 -0700 Message-ID: <1505415699-3401-8-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505415699-3401-1-git-send-email-york.sun@nxp.com> References: <1505415699-3401-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131498893296757927; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(346002)(376002)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(106466001)(54906002)(189998001)(2351001)(8936002)(48376002)(50986999)(105606002)(76176999)(356003)(2950100002)(6916009)(110136004)(53936002)(97736004)(50466002)(36756003)(305945005)(33646002)(6666003)(16586007)(5660300001)(8656003)(47776003)(81156014)(81166006)(85426001)(50226002)(104016004)(498600001)(68736007)(5003940100001)(2906002)(77096006)(4326008)(86362001)(7416002)(8676002)(316002)(15760500002)(139555002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2362; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD029; 1:J/t4yzQaXNclPRF5ohB+fdCZnC/Km31lU917Qgx1aH1fPdzk5BDizzj6+mb8G2JiG0p+eoNVCOpNVc2ryHr11ee9yANDgWL8VRFngaAIqKF8xH+LtJvv/cRJ9iKyZiOb MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28c2685d-7a8c-4b9e-0b46-08d4fba319c4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR03MB2362; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 3:vhUKYxOxmNDkoYdsqeVfWA02/itYGpZRBv14YekgeqU+1lzHpyF+yDDZaWTpJRRt1XIQI/X98EpnUjQSAZ7aPnNN8AQX9FlC33/4midohkRRrhtJ93/i1WooC6wtHgmjKQvFLFkI3dZL0sWdgzP2Cu60n4N4kHYvl37+05CDbye6BHouf8KJZoyq952QtKUI094t1T2eCBLy3CEKhKTJfr8el3AZbUT4C6DRr408BM8qk1S+KSmQprvF8L1Z5ZLMFEyKypMUGuuXV3WDVV6qgxVT9myjCTt1b+RSPJVpBOafTLJB7DNAf/hM8PMMgyZOw1FPK5j2WEDRWeWrb5lwcBlmBWlLOhJ6dC15WEOTbc4=; 25:K6klHUVBX8BVOSW0hWHL7aqxHE6YfR1vGAZpL7XCn5eZ8y3PNwhj8s8rj2fa93fYB6EeksZA3Y2VnkcSsoIfMAE0aTi9HrvCV71WrM9xl4thDvhDMfJh+rpnw9GS+vhQqiSGPxLiys8yS92L56/NZu+2gSopKWvkSb8PA2Q+yPgysU0hZs8bFiiTC1HwjasT323BEdpBH3zMft7fYgZAhhRW5BnARJ6VNiNgRQwqTUow1c83PnXtHx19BA9BYjtczRgK8I4SJBLUS6Tu+4mD+MNLrtTmxmtdCvFT+8g8WhkiIHlNHQZuZyGJ9ybfotHJJvIPUvq8Xne4TFZhMjYHYQ== X-MS-TrafficTypeDiagnostic: CY1PR03MB2362: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 31:TMWBtwrk0+CrQv5gnqjM5ekcsLNt80ei4S929wz/5Um8I5YMpq2olicH3lQN1Un+H+Kw5q3RHfMSwgsflmLLlXKD5LLUkEgMvCHys7uVnfb9tRA35bGZ4pLIlGD2/2vUawoSZtiD9LueCTn7Gg5+Js3W96/nNtwGwxwATEKqUnQXHzRhUqioA3KLBOPagX7yMpqrtNQ3TpL6ew5+bxf4elgf98SDPMUGcnp/AhH9d2M=; 4:UX31gtxIqRiup3GUy0DM/M8aeN29QI+doFOwhE6zr6cn3XZy1BUxix4IQFI7wl/eHqojw+39a9izTZ7eORXCq7ZcXj3t92pzU2VnshdH9q9O7FTReY180zYBbcxdsW7FKSQOg+QAwIUWM119PM6yo7jLZ+nGt6O56VK29u3lHZil+kKdmo9vW0EbM8T0B9AR99aCggc14TMVg0sLmaW6oTf5XjIv9vSeh0RWRo5Wc+eZOg742XzOcEMY0P+b821hL8+nZtfJiinX2NA+KNccZWslSDGJP+isRp5QboL614M= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6096035)(20161123561025)(20161123563025)(20161123565025)(20161123556025)(20161123559100)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR03MB2362; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR03MB2362; X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2362; 23:m/w7WQHZvjoQYUOqnTPoXHECY8wgH2pk8Y2XrNF1p?= kIaTH4K7VsYrAjE+Hn86g7pHrDhFtvH1D0hiG8+TlfE1YuAWgIv6MTSYuFRE5u+lfs4My6jByzFcKfMvnziuRz5SKxJ3e/tIfs+IzC7pu7muCieb7xCgFzrkHPXaujO6r6dfbHxFDmssFz+cMH4ud6iIW5rf2jPOirIY/0SufL4PISHMXYEg+xwL0ABrDjpmzWDP/El+L4D2zo8NtqrSJykqvgle1VqnPMyShK0JT9e4TlrsBR8f07fGbMdlSno+HgSx2udDAejJIUTJ9XBq3/AD1xHRcfWQBBCkmrM1hHfI7C86fKLs+cOWcdwYZoWf5Fzc5snfbueFKih21CsiSg+W4T5o3nDGxZwmJJycgqV9snhTe6StUyIXRNBHKXJzGgAMNSOWQKVksAzHkFNpOoVytcvGuHZGwdbN3D40a+pY4LiBCbqSUshhkro7/Ge0yOGwMIlKxFL9PVnuVsQA4VbdQabgLAvjZEIu7GAfY2VedWxBzyplJguwii06VVguz2kAwhXeJ8lwBjoTQrNNcOGF2MeCCvlx5aar+RE458g03ejnc378r4AMnt3PZ2uinmKcr0hIZU19IRiyWbg6qhuP0jxmH+bojYdhitf+QYY1ZX6pkbZ/ABlJCmUXP/DCc2ACXf+Jt2MnPl1StYARGrA6A/VFbcqt/dNt9K5OsDYd1U1F1j3T2UZI4fylcvr9ZsXev4KQD+BHSnzA9vqRYv4cPSn53pBVPwqCr5ue12n5JfGl0mqmdm7kTqcMzNIx9kmX1OniZ9yvzCoa/6hvaLZ9I/r4ycSPCur8VupQUGcy7papxBzquEmKeuGMVRp5EqlwOYZoe2y45bWH3n0U9FO17+C1c1mHvoxtynhUGifbuFNMd1sB2udbxVVJgYoxZ8nL203hPma+lDV+wv1r525kOn/EUkBAhruXmzGurwUkuCCLxmsonN51K3qJijJKvHPUMRtKeOr9AWJcetIApvkqlJrCVhinc1uuavouG5Glo6kkyNG3B5W0nOtPHpjJA+DSmnMxQc24PT1PfgwycD7KMfGALcMF3/aHk1XvHEPgWfwO3UFJwYzdX69G3XpTXH+j+2ZNJmMNEZTRxvzMdYC3mDkgU17rS/j9pQQRUBpa1MO4YdiRARuCNfFdFVx8tVUPr+eJVU2ZlDqcUjB7t72dC6dfiGhaXRdrxZ+pkUy2UL3j3Zaf4ejZbWcnZ5+uoMLwYY2tDmu1YJh41+H87TI X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 6:Kyu34jVWKeFrCDbmlovHeU0qhfILrm53GPmDAxUaXAGoX3SY7KZqondxo259I/gBaeSe8CZkOugeCwHYQx16QCO7scfWBxZ2ecFzChxTPBATGdlrxOuKCs4SmOfUNEmJFYPs7MChBbkCjRBBwRXA+HB7M7peibegA4Yqy6NRYlRaHPXUf95O88BBqpvkylNTF2hdQHw0sDS9I0PD5gZGlT3IcV1tN1zQ48IvTHbxK0S/bIvfTOnjWsaibyg8UBQvyqcV390oPCpK0HO4jQkZ3aHxazN8yxKu23Nqt28p/Ne6aM4WWN4A2JndWtLLIxDmbfgw/Vg4gJNXCBZdZni+Ug==; 5:fzEcR9iPetagrntFywj1R/r+J7iqUMSMKubqNQnckK692NMUEKZ1Fqw5nDWJCRh9rhZ5hj74p6GbpFBMzkuJq7WEpnyuti+oPJzgfHEuGLoguVw1L94Cnas6sZ08hzWtlBAJZoBZ4sXvAqWliFwaFA==; 24:rVxWSBRC8vCEa+xX5eHZ0lmqufEk0J0jZCUgrHiBw+DVH0NFyMTQRMvL45mWNYLMf2nDV/XNiMNNz0DuoICU/ffK6hhfrA0n7QfJgGW7Vo0=; 7:7uuSmatSylB7DT/oOxsRyZmyja6X6ZFqIDkU1HABgYK/JGmWtAdRVw0OV66ZtnO6hVHPhVS1eAtQcV4c3bwgPY2fOtGIh1VVwIaosqP/Y5qEmQd9mhQh5f9+tKC8yprIJckLqIFFLXu+KgNYq9Tc7vH0bkQSq4fVZCNhHG1JIHBGB/HNl+yANvs7J6rmti6JZr2+2aphAdmaSUQAZm0Z3oc27IKVIEEoZ8B5viHS0VM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 19:02:09.4885 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2362 Cc: Vinitha Pillai , Mingkai Hu , Ruchika Gupta Subject: [U-Boot] [PATCH v2 7/7] armv8: ls1043ardb_sdcard: Enable falcon boot 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" Update defconfig to enable falcon boot, add needed macros to board header file. Because environment variables are not avaiable during SPL stage for SD boot, set "boot_os=y" as default. Signed-off-by: York Sun Reviewed-by: Simon Glass --- Changes in v2: None configs/ls1043ardb_sdcard_defconfig | 6 ++++++ include/configs/ls1043a_common.h | 7 ++++--- include/configs/ls1043ardb.h | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index 2ce2aba..37b3257 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y +# CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y @@ -52,3 +53,8 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_OF_LIBFDT=y +CONFIG_SPL_FIT=y +CONFIG_SPL_GZIP=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 002830c..734729a 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -73,10 +73,10 @@ #define CONFIG_SPL_STACK 0x1001e000 #define CONFIG_SPL_PAD_TO 0x1d000 -#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE + \ - CONFIG_SYS_MONITOR_LEN) +#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ + CONFIG_SPL_BSS_MAX_SIZE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 -#define CONFIG_SPL_BSS_START_ADDR 0x80100000 +#define CONFIG_SPL_BSS_START_ADDR 0x8f000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #ifdef CONFIG_SECURE_BOOT @@ -280,6 +280,7 @@ "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ "console=ttyS0,115200\0" \ + "boot_os=y\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ BOOTENV \ "boot_scripts=ls1043ardb_boot.scr\0" \ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index da87497..f9843f5 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -46,6 +46,11 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg +#define CONFIG_CMD_SPL +#define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000 +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x10000 +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500 +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30 #endif /*