From patchwork Thu Nov 9 09:57:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengzhou Liu X-Patchwork-Id: 836264 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 3yXfG125RJz9s71 for ; Thu, 9 Nov 2017 21:16:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EF744C22023; Thu, 9 Nov 2017 10:16:22 +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_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 1234AC21C46; Thu, 9 Nov 2017 10:16:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1D18CC21D63; Thu, 9 Nov 2017 10:16:20 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0047.outbound.protection.outlook.com [104.47.36.47]) by lists.denx.de (Postfix) with ESMTPS id 59B05C21C35 for ; Thu, 9 Nov 2017 10:16:19 +0000 (UTC) Received: from CY4PR03CA0106.namprd03.prod.outlook.com (10.171.242.175) by DM5PR03MB2699.namprd03.prod.outlook.com (10.168.197.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Thu, 9 Nov 2017 10:16:17 +0000 Received: from BL2FFO11FD041.protection.gbl (2a01:111:f400:7c09::109) by CY4PR03CA0106.outlook.office365.com (2603:10b6:910:4d::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Thu, 9 Nov 2017 10:16:17 +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 BL2FFO11FD041.mail.protection.outlook.com (10.173.161.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.178.5 via Frontend Transport; Thu, 9 Nov 2017 10:16:17 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vA9AGBmh028687; Thu, 9 Nov 2017 03:16:14 -0700 From: Shengzhou Liu To: , Date: Thu, 9 Nov 2017 17:57:56 +0800 Message-ID: <20171109095758.2042-2-Shengzhou.Liu@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171109095758.2042-1-Shengzhou.Liu@nxp.com> References: <20171109095758.2042-1-Shengzhou.Liu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131546961774194074; (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)(346002)(39380400002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(5003940100001)(6666003)(16586007)(86362001)(316002)(6636002)(85426001)(72206003)(498600001)(106466001)(105606002)(2950100002)(5660300001)(36756003)(77096006)(50226002)(110136005)(68736007)(8656006)(97736004)(189998001)(8676002)(81166006)(81156014)(50466002)(48376002)(50986999)(8936002)(2906002)(104016004)(4326008)(53936002)(305945005)(356003)(47776003)(1076002)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2699; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD041; 1:okrOLtdcR8zxSdGY8To9kDr6wTUXv9zNHjb/Jai1XDg+l14f+08VOEdB60tcsKGY1rEs8UMK2BW276jGC4JOnwxQhMhl1KwG7dkS3sxKnZaluVCbFOrHOMUOLktq2Fe4 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44390104-c0a7-49e8-2d9a-08d5275aea4c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603249); SRVR:DM5PR03MB2699; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2699; 3:kkKeWWI2O0BNANB5Ajg5QzOOQ79qCJ2+ELeOrRNAUY5pai7Pv63/RaFOzAWH+pd1+Y8YdYh2fAgz8rEIVxjS0tGwD7rD1hbtZcsVTcZRF8rTF2UTXT/CoHJJakD0+w/NpRJ+lGINWuZGSS67r6LdwzPc1+zc76eUq6tURM7VhuMpw7qKu4SbkwCG5HtllC82KMgCLmQhLxmGNqt9BAa12BkYI5Kw5yF0o6MRz8SnyINzi55W6hJRTXt8uLa/bUh5zO0Gl07YnM4rXO76bfZUhSjtjgWfLF3H+qb6oy1nuwgWS9WcgsdSsO1dHnmG5zgWOilYURACjt2+Mnos7mt7016UdqNRIIHDWZ3JUOzy1Js=; 25:msLO+XpgHaGLkhsUzbGOlEaAzfgokbjLNp0Gr50yUvC3C5Gbs8Wa+seUOmns30MaFMq8BwVnC7FMJZA949yysL2NSjVijLqpVQnrfFilmPmIr/kAhj5wWVJZm5Qq0YADfYDfp4pWSKhZeYTFMGrC+9c1ML1Pv/9ciabBqHtatXaDb0VhUdTdMul8PXGJwyY3FRuGEF1B0JhxEE2osDbdodfWhpBygtKYteGJbR/nBeSnC3CGrTQc9QgmQF71YzgPU7aYJfp4T3tRUjXR2vCu1wNmCxtYhXzEpai5k20jVJ43aHgnd7iKudsAsbw5cyrNpCW7paiG8jNL5tFlTPZKdw== X-MS-TrafficTypeDiagnostic: DM5PR03MB2699: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2699; 31:/5MPxCnQs7zH5A3wn97THzcRSj55oh8WNOlQmlrdgTN+vJQyaZdG+0VTC4mSfAcVn0Q0bJ43uIPLpFk0jSS7fYyBsxBeegBSqqXJeKA5fc+6MbMhe4xtznE3L6ULUe1fCUZjsZ3UeqpoHuwNJSmdTVL2gZGyONRqxDYAXXqYgWEe5VpQJ8JVBeONIVkgbCmdpgGyvC9r7Xy2QlE8JdEe1A3bm3C/n50JiMv0m8R52Jw=; 4:aEeVkV+FKnPJkp5IzM4sgn5aPmmbdO5blN+7hzV1yyYVasmvyx0xEBEkbwon8Dni1oEtUIKWPzBqme87uyYVlggcmqZHn+Fkdu2Hnim0cALu2r+C8OKu+x8d9Hqr1FQO1k4p/FvR5sLwu8HpbBCjBzHnEAjQaTrr5E7/OS9hlWwONxuDC0tgazy4jYQnWruXhW3SQVSUgtXVD25/2kbaWrbVgT85pqjYQv97Uv4JlkEcBsfPa+MbTKTLYNGwkb9CO8Sbqrs73EgjjoxFYQVI4/jmtl/QRjTlWxqOu/3gRovFMUnWkxCYuweaw3r+oBil 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)(93006095)(93001095)(100000703101)(100105400095)(3231021)(6055026)(6096035)(20161123561025)(20161123565025)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR03MB2699; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR03MB2699; X-Forefront-PRVS: 0486A0CB86 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2699; 23:sAI9Ok5HRWPZ3eTlCEmTZO5wnL0nFl/8oPeqY6F16?= 1ZmuUhTPDH9NNYvxb22HrFujEwfzq9VonPOgJ3opVwSF+w9he6AIzC++hi6oczu22lEGhOviKY5k6n+6Lb6lbFivIg2y/JcmYPuRQ3ZtohsDgAsCQLStLHFL9U6yzfHrFggi+DvsIXH6qIZPpJvQhVaAzt2fvJ9Ccsn3yawF1jjGafaNRXFmNkXJTMVzPBCoXY5Tc6MO5JSBewk4GLtN6l0LPPoh/hbUYaYBN1AkK+1b7HHrrxnsBAHM8qqYg0Rp8XkugDI3BOZxCCbvZZL85Pc8EKMEPhUiRDz3026137sVJ5fS3W7i2cAXEtrQPqqXlZ7hB+0jAo6sydK313bIXs2RN7vkKldBYSrgZGby6Wosf4FQvlPhYC8mzCdlMNVQGllV1qsYmF5luVbwNcoFUgYt0XfWaVaZXEVhh+gnKD+LMVA14+pkPVWmAp4o6hokXYYxlS5RS84Dqn+JBTZwMEvOYbP1V2TRrOVkDlyeGk+Z+3l5qljHJUQoPIqpR1Lrv/SloIyRTH2aDludC3uwjGfC2cinGyP4DGpU5DHlzDRF41DxGZjtrfxoHuw7sxzMoXY9RJQoF4CAcKB177HIqXug8Jj2w1ZCYudt5uJhqPs518U5W5MhI75CRP+R79l9riIaqKZGDL523CGW6FMPj9dATYhqqSGeKs2JJ2RrBLx/FnlPu4mPAZt5VGqPLuD81ox6pcRP+L4fUFR2lKdIJQvAWAGBvZMtMl2Ayojd/Q12dwLVLGQywIRY4kr1Lge4Z3CCHhgWMekzqUpwf5ocQ/eUspK7/MnmQMS80R6Yv0glqYda87Pt4mIz9Rf7XAnwrUaKqWbg/5NlwLF17/MHbPokpXNUDC2kzBJSF3ggFe/lFE93yu4EeIgKVLsBCqCyXpNySKWSv7kJyZakmzLfNm8JeX5LIMkrf++ENiYBuh86TVj4mxpzc3O58oyLnS3O8XFpA/o65R/MpOIYMEkfKKFogm2t4B+h9Mc+svPXiLvUegFQ7SWcicTKo72Dq+GFqFitt7GyO6zM1m8l4xjxFqR+v+C4X8ELoBa1QaTuB8sR32knW+leXL5Gf2FXYvF3l7OLDqvIKTlkIg1kGt8Vg+UoidnTIAScYGBdwzt2VdlAMghcXGCQjPjFdmfpiY6s8M= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2699; 6:nVhTTWSsTa9BZfokxIuU5wfCO30++VroyfLxlmWEZ1IFXR7uBf0IbZCjzy+B/DGoYLBweRYL1MznXxynbd9GGdetHNT7rH4zOfUVLyWq00R9R+VomIJBbXMGHResykF4ozT4TO+KqMXajZ7iWZc/6KYtBA6yLkJMWPEkNhTiSeUTHn3MO9ER6Xr9J6OpCazEvsGAqmRYYYJFuxOBMe+lCTsUvyAc8qQgeChUJ30+XZCg5FyUeEQwyHhULrsvb309Zo6S7aPEaMm54zqGJgSHm6Dino9TvnFpZoDbKLvWh5Ykm5RIO1lLk7/hrTaFMHLK6yNJqsko9xPbhq/9c5tuv8s1RUw6nBfr3DBji7Ychqk=; 5:Uo8iGvnikT6whkPZuD3igwziNqjZxjjn8xVoKx3LVaplu2q9dvrvpRzM+RLXKMLDxZJkKo8Is05yudrFfLEcjBW4AwwdqKKGCCPxwMJSJQF1kmFSQ2KpO67Y8z4PZqqR9spTwXrDn+4i+4xHmf+eVrHNK+Mz000NPa6UQ5v2ktg=; 24:FqdFJ9pMthxMgIrnGlfOY+Qp6gZKFq1BfjNDMEQUInOQaBB5l/tkj7hs86YOlsswb7LHOlAJ64bId0xa2eNM3aOsaj6xkI3Wc6rkk/s8STs=; 7:3sXHivOH+gPXffMyt9S9HUZqBwU/UiCeS1K8D0obEwxLbOaBg6IwDGbqISvCuO0W3+YVSEZRtIco+GRpyWH8jaNJ6onmzzXS1XJZTvlKIx8gMVfqRnK9S/TimYzOC+EhdsEVqrV6ZjGR+D8OEKBwfqAz7xjJ+rzmgsDx5QB5WKlwcPLRtg4raxKA7TYTufvdsyFc6e/62d1rsah75j+LEqCbWyuFIjY4KuAzW+xh0T4j1J61Ff5pPbsk/oPZ/Rjp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2017 10:16:17.2478 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44390104-c0a7-49e8-2d9a-08d5275aea4c 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: DM5PR03MB2699 Subject: [U-Boot] [PATCH 2/4] arm64: ls1046ardb: Add sd_bootcmd for distro fallback in case of sdboot 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" Signed-off-by: Shengzhou Liu --- include/configs/ls1046a_common.h | 11 +++++++---- include/configs/ls1046ardb.h | 6 ++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 6d501b9c54..e7b1425c15 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -227,6 +227,8 @@ "kernel_start=0x1000000\0" \ "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \ + "kernel_addr_sd=0x8000\0" \ + "kernel_size_sd=0x14000\0" \ "console=ttyS0,115200\0" \ MTDPARTS_DEFAULT "\0" \ BOOTENV \ @@ -257,12 +259,13 @@ "${scripthdraddr} ${prefix}${boot_script_hdr} " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ - "installer=load mmc 0:2 $load_addr " \ - "/flex_installer_arm64.itb; " \ - "bootm $load_addr#ls1046ardb\0" \ "qspi_bootcmd=echo Trying load from qspi..;" \ "sf probe && sf read $load_addr " \ - "$kernel_start $kernel_size && bootm $load_addr#$board\0" + "$kernel_start $kernel_size && bootm $load_addr#$board\0" \ + "sd_bootcmd=echo Trying load from SD ..;" \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd && " \ + "bootm $load_addr#$board\0" #endif diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index bb27dd058a..d28af34d19 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -225,8 +225,14 @@ #ifndef SPL_NO_MISC #undef CONFIG_BOOTCOMMAND +#if defined(CONFIG_QSPI_BOOT) #define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ "&& esbc_halt; run qspi_bootcmd;" +#elif defined(CONFIG_SD_BOOT) +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run sd_bootcmd;" +#endif + #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \