From patchwork Thu Aug 4 07:44:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin song X-Patchwork-Id: 656194 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3s5RT027FVz9snm for ; Fri, 5 Aug 2016 22:49:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9E8114BA68; Fri, 5 Aug 2016 14:49:02 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IDrYi_cVLbK5; Fri, 5 Aug 2016 14:49:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CA1D54BA38; Fri, 5 Aug 2016 14:49:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 458024B77D for ; Thu, 4 Aug 2016 09:56:29 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lG6-xu6_yvjp for ; Thu, 4 Aug 2016 09:56:29 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0083.outbound.protection.outlook.com [104.47.38.83]) by theia.denx.de (Postfix) with ESMTPS id B1DA44B62B for ; Thu, 4 Aug 2016 09:56:24 +0200 (CEST) Received: from DM2PR03CA0029.namprd03.prod.outlook.com (10.141.96.28) by BN1PR0301MB0690.namprd03.prod.outlook.com (10.160.171.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Thu, 4 Aug 2016 07:56:21 +0000 Received: from BN1BFFO11FD017.protection.gbl (2a01:111:f400:7c10::1:153) by DM2PR03CA0029.outlook.office365.com (2a01:111:e400:2428::28) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15 via Frontend Transport; Thu, 4 Aug 2016 07:56:21 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.557.8 via Frontend Transport; Thu, 4 Aug 2016 07:56:21 +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 u747uGbA029691; Thu, 4 Aug 2016 00:56:16 -0700 From: Wenbin song To: , , , , , , , , , , , Date: Thu, 4 Aug 2016 15:44:50 +0800 Message-ID: <1470296690-29194-1-git-send-email-wenbin.song@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131147709821181790; (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)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(77096005)(33646002)(81166006)(2906002)(85426001)(2201001)(81156014)(104016004)(36756003)(19580395003)(7416002)(8936002)(50466002)(5003940100001)(92566002)(68736007)(229853001)(48376002)(86362001)(586003)(189998001)(47776003)(105606002)(50226002)(19580405001)(356003)(8676002)(5001770100001)(107886002)(97736004)(7846002)(8666005)(11100500001)(87936001)(50986999)(305945005)(106466001)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0690; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD017; 1:kZzhaDigaiRnNobnbpwYNTWkKXwc6t9r6+rLm1WAHVmHVf2hGo/geWaVEHnazuBoXB6P9y1kJYmlsq66gm00DLeoxviDONgFWh7T9Bq8UKxcl+RfxG7mXLtolOEFDHPsnIntHYsKm6PYojp7jAGYiUin5WiGY9v1bFqFSYy5LnWSABxBm+8FHiDnA1h24puHfgCMMUAirmmvHGq/ARJYhw/DmF2JD0Q+G3LcS+BAHs7r5c8lTZ9VFtpWohQ7gVtqgCDa3Yy2EoBDmYv08b0QhZjm2UQ8KT797YwEGLrZiCnZEUQAFkNWlLG9q2EYvnHMubtCjBO9N6ImYnhM/UVd+4ncYEQVWdukGKbn00bgd8OTopj0gQxO1r/vmw8xsYI6hHpQ5o0fV17p+tADtwX5g3iypOQi1JMiFVMxhKE73vjHmUC04yl1I/2vDr7A5FxVVnlFZ9JQ4fDUoTvTnadG1gRuwwUEIOl3OsNS4TkKyCFvIfDvXETIRBui+crPpXwy7ImmARtrWsvGGJHFqiG/dSNOjIlaXO2Lyu7uWesb4QS3HI/drYae/krR95SFgXR/CsSPqjoiC2b61X7LNEq7wngI+TEIx3OKHroYUt6rfTx2t07mdXxqTeXp0yYJt7eECTTMSyZ9eJJi2e8UluS0c3o3SoqYDWzDFNVOMgnDRTgReMGNPH49y0hWutMJH7BSFlfo9t7cknQzdmDedfYgkSeGlOzDu8ZLuKw76sgChRU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f93bef24-0aec-45df-fdff-08d3bc3cd373 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0690; 2:7jk6WEdQ620efv31Y7ySMHodIpCdr+fepXF6zYMeOXGBLeCKOaY+DdEvKGJPp5nBpT7ZviTflTd25mnhHCv1WwpYC1EOhVV4tHpMkPkNEbTptdfM++6wT/viL521oas9ekrfPqShx3aPnXHQW6bcfabgL8AxTOXgDleVtZcuuaRPYV29GlWTEd2TwTENqb6Y; 3:QujtwJLLdIj8/8l8dji6n9v/fz+faX0OJA0Fa619wa+6YWNuLldjAK1P6/8oSml8pt8oyS42goUpTKqI9DXPIEvtB6gj4kGmHwJELPE2yYpphqSOJVRn4+m+vz34pFU1lwv9AnjWvOrW3RfGy+9zO07VDj8VS6nzxHXFttNizKZmFn2/ONwSPO4MSRoJ8Tzrj914UpCTNhg4SLtCV0cOFHo4f5zKCmTaL8splimDZNY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0690; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0690; 25:Yc6mweyv7rCoYSe4MJNf1a5iHeRc2AgOc5ZHdOkz+vB8NnQoR2ggWPdC2X3slEq6RwLWVak2CEAKnG+LovAm4nwW6nYALX7fvNzk6yjJsJYfxZaFA+iqUdpjWJjqyYK6ErvyelZKSqTLDjslUELGPzoLVtdrwi0tNLVW7kDYwBF37JseqpiZ6g8vNKWl1pOXyp8wVJGETGRkCb0j1jmerT581LsBMD+FXxddKiFWNh6m5l25lPWNM9/fEnxVntqFMhpeu0W7XoCdwiD/LSzJ+PFv8T/i/xWsseSw0qJsNM/N3dLavDildLXDesbHwnW4eqZYQF17MgWZQieN5ZQNN6ldQahX9a/bpwztpRskkJ2Mn0KCo+4R+EyIMI5eTVSaCPN8hymwwzGSFFCcKbcOXvLpfySc1vxMx8T+nXEdKGE3KAO5/4bifDuAMbZZnLnIGupj0uDC+karszPx1wDEAmcu9Jw/N78x4XiCK02jVRzt49A23FJ06PLn7tjOZdCFkKSJUT7bUK0xpfTrbGjrJYwi60IpbvuB+ezq4e8kW4wnbwm0V9pCbDr/oAvO9JpPGMOrWi9GXcQG1cmHKFl2WNHanwiuS4jyd/7sumlpfErRMzLUpBlN0TD8Olijjj/6DF0PQ47CNXyQ+olkNgXUIEdN01hw0pXXN7OCVOsp3YfiYJSAURRe+Cp+5DdbVlSc6uLWFySutvQ1dKLKEoUdng==; 31:k+z3CHY7BZOOB6zUwz+QLnZqNdcFY3Kmv8v8sJrUv2vZ61SZ3qVX9aHfqN1NiXTvG+NzmP/+36wFDvggXAEFY9mD0TyyIWoIa9+sKy0TPvSGWY1vulZNUKm7qbeAfHOEnXNvogRnwG5wYwHOTnJAlZIyJHtdETFKE1e+ey0AE35xddtHDyvO6M5AfrIb2kF0ayNYVzo2iaxARmAeZ9LxgXKl4ngJg6g5oWjNPLIv260= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13017025)(5005006)(8121501046)(13018025)(13024025)(13015025)(10201501046)(3002001)(6055026); SRVR:BN1PR0301MB0690; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0690; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0690; 4:bewB3wd5KMKxzGW58ouAaAHpw6DtIWNrOoc+yOlEZgn7zuc6qKIGjfMlfzDvB5MrtjanA+yVeU30s5jHDrsKvcs4OyO5dCKcHe0Z0XMgEk8mXzgsqmjAP2iSfUjQcuTafuLfqpdJgczYrEDcT0TaQ/unPiuFjiTt5oLscLwY3KDJKc24ycyszAPywFgCAA70U06jMd5x1M0rp/3D/osEumcDwqkbqjys2C92qr02od+UUsu38NTgCrpsEt74vA+0av549Hcwoe64nH1R/geizbeSCmrz0LhYTDmBUyz4PLq5tdieQbADPTjwjUSwJApQ6LZxG8T0eoMCdDpOLXRccBfbUjQgWVYG42FQ3BvjMDnbEz+UbkTXhtMNmOtVb/8sEFQPAzNGUS9QQyeygRZMZa88GKzVHan1m/JS0cVClOzYzF5JCMlZQc8VLi7oN2EbPfyXL4ZzrCCVgZiJnb1CrWyJ2s0Gdz+vsZ7xTdN/swvtlAA7Jr43kFiaLTp5NWGl5oZh44pNLzM1s68r1DMnPw== X-Forefront-PRVS: 00246AB517 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0690; 23:DsqZigsn/hiLsC1IZI5KXl4cOxHZZ/l8bzDSyHi?= =?us-ascii?Q?cB1nqELC/YyOTbB/WoIKfKomAi8OjaDW+Fk9p7VfNeUe/++/Yufp+kkI3uA0?= =?us-ascii?Q?5j1D2pyqdhP0sKxIXYYRbE7+XuK3QFqfwWcFL1Jt/aByeC2ZnP9mEpSd/JAw?= =?us-ascii?Q?bk0/5CaHJr/MDZgl7KIXZr6h9sbUq5KVp1hDcGyY4TcxdF3BmlF3cHfm25Gn?= =?us-ascii?Q?4JhPYe3MypLFa2etqsQnj26YwPsVY6E+TtyVU0QMcA1HIly2ypv1KEfTnj0C?= =?us-ascii?Q?3YDtEuA9ApUTFz6/Ls6Lxw/mPD7d3k19dJT6opVs2LmJH0UZqIyVX8+fzOLh?= =?us-ascii?Q?nwefbTY0upPfFbMvPpv9bDe7Iohj+mrAI+Ovb5v1/fk3xBymQb87mcuR+B1y?= =?us-ascii?Q?cbGHhswxEMGkvkNVgXAnZlA9A1o3y2/p486MJjSHQvTCYDqRqXP8mszZjDJI?= =?us-ascii?Q?fOn0aoJhCgho+FjP/pTGLvo4FJK45WHUND+TpE1nj4axZXRjAnULlMTT50+T?= =?us-ascii?Q?ZjpQA3kWocj5tdk7T8i3tyIHt0ZfJxY5tdQccxVIUJ7WcLnFRDIwI+fx1aMW?= =?us-ascii?Q?hYdhhe+uE6eGG8XTrp7WKZt5h7WhweRymrtalGT/QWOTj7j6Be4sMkLC1XS2?= =?us-ascii?Q?puRp3v8Ue9aPtsmFSWX+pzhKmaQHAc63YqYjyBYrP/ni3lMy6jnzLtpjKYRA?= =?us-ascii?Q?X6oO2OlWIzZIu2Z6GG7sUWBkuTMrgzyeeZ/Nbxd6pZs557c+19vZsYt5ET2q?= =?us-ascii?Q?AP75YRYa2IfhhWe+C9TIb2fsiMDEEsKQzLVF9+dSenmDDUgh3iZh9UILY3VV?= =?us-ascii?Q?uHdxjkWonCosMdvCXWZvlGoI1H79KlQHglB44rLtxVHS35fMo08AsrKgZ5KO?= =?us-ascii?Q?CngPm/8Uz8vUi+/xGiez1duWn2X0FtLBAWnV3zwYoWzyR+fv/HfFSJ0+e8eI?= =?us-ascii?Q?9AGVTP+gFGo+ifyG95gcCAfcU2SM1LgT2Sx1DzaW2wOf6OoY/qhDRcscrdba?= =?us-ascii?Q?bxNioaU9HCvTJSt4vwb/0OM7hicZivgZbXvqfWYuB6YJ0SpixLV6jabX7v06?= =?us-ascii?Q?jII6uyFuHNUe6ru6uXsX8nbzzqC1bUd6Hi6f8SBG5sfx5AaPYUxwVYVb7fdO?= =?us-ascii?Q?C/SnF5ZBSNoleGt3/2MGvEqVYiiQ4TydiqzuvXxCbAIHH+TtzSvRzxg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0690; 6:rAa7pyLxa2Pxo2yDITwhopk39FPgCh1HghwDGeXVSaDhwKdc8lDlZ83SVt9q2Ux/72Y4g0sRhtsaSnfM2sllvTCeVfA3+8YTEH4K84kUpJRBah6lfx5D5EQGsaj4EkwzO6SXNI0TIFH2lf6JYUxK0KgzIEYiX3f6BbfRG5Gn2UBXY119UoHsHCoUOl+P0m4th0yPtBAMxDIpfyTgEezIcPkntoDt8mYBFiLMBJmDSx37i3qS8D3aj/9p7qep+f61mAQyfuBAxOUFEzOG0H/Z0Y/RhL6yBquf9BnUk6cDwPo=; 5:TA0FxpNY0pACX+3F3Z8oVMzjHMDcKaFmZ/31sYqf2T0Mr9nE+T8txyaRNiCoyTBIN4xoHtlvJ8tGHHHH/bowAmarXdRMGoz/to+hUnu/vXjS+Hoo1KdhIEX3JCc0GcKL3qQLtzEWmGMTaTEPiOFP7wx+edZYJtAP66PR3t0KPko=; 24:11bMW2WlLV5l/XNzhiViDGdOSz936WPBrkcuc0ksJa4otjSLeV86+InphfoVi1Wjb+ZhuCEmm7t8RelZ1PEveZHDAi2dHl0eXYAlq5Ww06s=; 7:NXEM33zCyNwVMrTlZQOWtf+YaSN7P3DUKmaMntSCosohp5c3PQdHClBJB3zBMETvUj/a2mpkn7wSkz1hIiDi/hHvzSCo2DyVGPuWW9wIVb6grdIjWS2pi4ISOtgocfo8Rqzm4ESaNr+m1SqzVJ6trwd2k2sQl0NBWRYm84iVW0kZ4Gfc81WqKdVFaz3wwzjRGxKHWclQzokEWmPNRWBIEWuIFnabE5xExxUucjmHTZ761ognthezwTUUpxzXWI2k SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2016 07:56:21.8685 (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: BN1PR0301MB0690 X-Mailman-Approved-At: Fri, 05 Aug 2016 14:49:00 +0200 Subject: [U-Boot] [PATCH] pxe: Fix pxe boot with FIT image X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" From: York Sun When FIT image is used, a single image provides kernel, device tree and optionally ramdisk. Argc and argv need to be adjusted to support this. Signed-off-by: York Sun --- cmd/pxe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 9434a18..0a07f14 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -620,7 +620,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char initrd_str[22]; char mac_str[29] = ""; char ip_str[68] = ""; - int bootm_argc = 3; + int bootm_argc = 2; int len = 0; ulong kernel_addr; void *buf; @@ -652,8 +652,6 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) strcpy(bootm_argv[2], getenv("ramdisk_addr_r")); strcat(bootm_argv[2], ":"); strcat(bootm_argv[2], getenv("filesize")); - } else { - bootm_argv[2] = "-"; } if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) { @@ -785,8 +783,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = getenv("fdt_addr"); - if (bootm_argv[3]) + if (bootm_argv[3]) { + if (!bootm_argv[2]) + bootm_argv[2] = "-"; bootm_argc = 4; + } kernel_addr = genimg_get_kernel_addr(bootm_argv[1]); buf = map_sysmem(kernel_addr, 0);