Message ID | 1472695780-11515-1-git-send-email-wenbin.song@nxp.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 3sPyTw3m7Dz9s8x for <incoming@patchwork.ozlabs.org>; Thu, 1 Sep 2016 20:02:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 56AC3A7560; Thu, 1 Sep 2016 12:01:34 +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 J6jXzKFLH9kp; Thu, 1 Sep 2016 12:01:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DC555A7597; Thu, 1 Sep 2016 12:01:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CEDFB4B698 for <u-boot@lists.denx.de>; Thu, 1 Sep 2016 04:54:43 +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 OPle8m-iI3TT for <u-boot@lists.denx.de>; Thu, 1 Sep 2016 04:54:43 +0200 (CEST) X-Greylist: delayed 1986 seconds by postgrey-1.34 at theia; Thu, 01 Sep 2016 04:54:39 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 NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0082.outbound.protection.outlook.com [104.47.33.82]) by theia.denx.de (Postfix) with ESMTPS id 22D234B68A for <u-boot@lists.denx.de>; Thu, 1 Sep 2016 04:54:39 +0200 (CEST) Received: from BN6PR03CA0052.namprd03.prod.outlook.com (10.173.137.14) by BY2PR0301MB2006.namprd03.prod.outlook.com (10.163.196.28) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9; Thu, 1 Sep 2016 02:21:28 +0000 Received: from BY2FFO11FD032.protection.gbl (2a01:111:f400:7c0c::116) by BN6PR03CA0052.outlook.office365.com (2603:10b6:404:4c::14) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Thu, 1 Sep 2016 02:21:27 +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 BY2FFO11FD032.mail.protection.outlook.com (10.1.14.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Thu, 1 Sep 2016 02:21:27 +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 u812LNDw029110; Wed, 31 Aug 2016 19:21:23 -0700 From: Wenbin song <wenbin.song@nxp.com> To: <sjg@chromium.org>, <bmeng.cn@gmail.com>, <hs@denx.de>, <p.marczak@samsung.com>, <sr@denx.de>, <york.sun@nxp.com>, <stefan.bruens@rwth-aachen.de>, <mk7.kang@samsung.com>, <u-boot@lists.denx.de> Date: Thu, 1 Sep 2016 10:09:39 +0800 Message-ID: <1472695780-11515-1-git-send-email-wenbin.song@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131171700875586090; (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)(1110001)(1109001)(339900001)(199003)(189002)(5660300001)(81156014)(8676002)(50226002)(77096005)(19580405001)(356003)(8666005)(7846002)(104016004)(305945005)(36756003)(5003940100001)(92566002)(8936002)(11100500001)(81166006)(85426001)(2906002)(586003)(47776003)(33646002)(97736004)(48376002)(50986999)(5001770100001)(19580395003)(7416002)(87936001)(105606002)(68736007)(106466001)(229853001)(626004)(50466002)(4326007)(86362001)(189998001)(2201001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB2006; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD032; 1:v/hRPE3Ln6IFMQp3txh/CgILDOMhY6IHxiERmezqnBzeKPC0dU7LuhiUpnTQCQaMaJ9l22kMDBpdhD3rk6qT9lqvSHAEMB4gQA2UYkH1A/+/JOaIQfHT4uHEtj/TRdmC24gvdF2d6Zdzs01sjjj99EvzzH9ugPzfXYpBQdAukhlC3CdPIoX4WN/9Pg5seI+vNb8rOcA9y+gs6eMLI876tada3COCq4RZgY/0vhHIEKk9IxXJU5G30cQB20zAsjPXROQuQCFlq4dpiD8eC4hBoErRqIeIQSKLKJ9FlaC6/J3WclCNv+vH51r//v0PXaENy5U4fyytFUYKFn/lIrZCkguXqf8xU9cArNiq3yZS71IMClEvsoRg0aDPnLcPKbQq23Z7k3Ni/QvwZsOk5xNEdmtS7/XuZl3BksELCL4CGY7EH1j7R5GPxT6fBJ6rCDp82V1PjxOkHv9RLlsrkiubikd9wfuz4Q8clKefQtHvryeHYblyKQYKu3gqSrkKwhUdhPu0kokXcJm+HDY9BKYOGDDfFQlRmiAJ38+0Ar2GOFNyv7Q6508j67IT4mDa3n/J1kJBtBauBLJDZ5AsqhxC0JnexO5/L77fla8ikQ5rYVxkul52UD12fTtBfaIrRFzMpf3ZG5fE+8pwwf7t6EwHVxNoStC/4hRPV7SAcw8D/3qr5YODyJA7740pQ9rnx/6NprZabSKyNqLH5ucbvU5B0p8yUkaU02ZPGcLQgUEeME4= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 50e8dae9-6dff-4925-88ca-08d3d20eadba X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 2:/vKbMkoIjrqTprcHkrGpkUzzHWR600uDD/Kh0KfJSR0qxLQwhL2RkOeNNAMiDS7rovijamJCSiZqWlwZ2kInrs2V0QKHKBOAiltaT6p41pl0mTH43oc5zqmFkUa6Q+v6S7vxaCR5BNcXSY8b0SD8Lk+bSuj/1vPPMKezYaURtwA17GFGIS7gu2UPEMAuIScX; 3:DCrPGqmyZG7sE95tLmWpiSjwr6/qR8Lhn6O/2wUWEtnNw0QXMTlW0uba1Dao+2BuPJFyiMD1EtUtT5cRwwHHE3wYV4GzQBD1/lvwqDdXH3or987dfnz1uh+nGkC7G449QUhvZEenkS0ahcVhAIymSMQIWfjPLFGmwdkvkipQmmTLMwsLJkAoCPd0v4LqLbfMaEXRO11nN9+pvmsAhXQ3mToJv+8obDSNlCOnadHvcQQ=; 25:5Xf6BFE+1bGXOlpfpc62vEcE1S2m9l2hori/04Kl+yg4hRKt4ScSlD7oXweRWEa6tAYyPJnMEP8XwbutaAbyfnlwdOnZPx9YbO0PIQwhim9xJKT569hHzQtSeZSJ1heGMYHAwHFjdThFmCKbPyMj4a5hkUpC87jKBNX2DDARtb2YdmDDZajTMH03NBIsEXuk6eMsblFSnhj3nbq+Odh69p2+Lf9z4vC7bf1Q/LHHVMw+J52D9NpFsFL6A0kgMbnb4y7BZ4kKSrNxBnjBiYqH3mqMQ9+rgm0xK7Xesw2pKoNeHEYpYF7Q40u3b8srXG8Z+X+hLFabxvOSCqCfPRGqt1jUQDtEx7jj04b9mgyFHYdSvYctq5hmVGsJEFkxDlFCvQCud2rnd0mTWsg3sI2IA3TUxg/hHbATu720tCvktKo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2006; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 31:BtoVYZ5QXXFrTtqTgIem3ChgFnb4e78opeNLyUeirU616IJBPvFRh368bTlka8pKHBCeyohHttV7hB14JkKv7y92aPLj/k52mgOV/E9HFKyHSBph/jyYV+YEOJyQ/XFjUyylzyNRvV/QPndTsAhp7JcAckaw3EyH9FzmvhIeeJc75jT7O+/EvDL+x+CBfNfwooe/xB267ge4lT3Gf4Hqu1aj6xKP/RKDm50IoEaYLNE=; 4:4u0g6rrv6Xd3JDW5l0ifKWszGdxJEEcNGdDdoTTrgZFMDoE4MX4UyVRmeY4UxuTL7JuaJCKZTxYlc2MPhXaMhEj2oD0YON/SdUxuF2L+XxOo6qTbg3h9lp9dU84RbFTKq3tB/0ERmKbvvR9WinKTgTjbn430fipqNTnIVw5XVfrJWIKr61slGy1X5rwIy7aTgLhCKQMkfbrYwnam6zogmVnQ5Jx11A+fl95uEUBGlg0BJgaX50UfuvD7VNbaQN0h/Wa5Pc3+KzZP7jAIZvLjzCVNNGim1Nj7M7QKsrEePp0/BOZKeSbZF5TRyoOe578rkpUoiLL4o3wObn3+0LQjvnJJJJ8WqU9JSlBexUIkOdh2MzHQbSkhNmDOey+drtv7WxeSVrgnitgiE3hZ6DOndVDWLYEHeM6eoI3T9o6+FoAlA5EqxsjpA+Pcqn88YCr/JIfYkDDozBE7LthpuEFIBSIvM2UFiZILrcQOD8kdZIaLohLDDzYr9EM0D0SydCUC145lfFpL4bgHTdhq0aGebw20LrXkDj0VFjN1R97UyvA= X-Microsoft-Antispam-PRVS: <BY2PR0301MB200638E0E2F070BF809CEB97F1E20@BY2PR0301MB2006.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13024025)(13023025)(13018025)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB2006; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB2006; X-Forefront-PRVS: 0052308DC6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB2006; 23:2udYGG4mLlCfuaWNxSXj2kmGQLVwIlEm93uVs2M?= =?us-ascii?Q?8ucGjhZ0xtQDTmFp1QujseO9EFNDms8QWJjFAgDuPrP7AjqgH0o0JYCXnWJv?= =?us-ascii?Q?RGKXYT35KrrLSVgYJvr8tGiSjQEn2tyKb6c0V66ic5KzGtNtm1RT6E/40lzA?= =?us-ascii?Q?+UyehR/R++N9YOB4d6TMlAmO956BSUdCpCVbpE/lH3k9bzEWrT8fIPrjxJtq?= =?us-ascii?Q?UtAx+uTnbuEg+3KfrMYv7/7VGtMpVwz51XumhTCjdfLHjCmnaL8esYluZd8m?= =?us-ascii?Q?+p5mzwK+3yUGOpWgkZU2GOvFwM0BIIMloY4+I+iU/GSl/GvRBcn58b94QFkg?= =?us-ascii?Q?tK8eyjI2sxdxkQurreAsB4xQFTSkaoIszwSKA/nDuj2UnS69xTTDOuRTAqSv?= =?us-ascii?Q?ylEpbH3GCi0R4mLwls7qUhYrlNkgMXrAN1RuQdh5StwHeCW3K3rLzyz9v+2k?= =?us-ascii?Q?D5YHRgvtkTLMmBLftqdRFYoCbqyefSrpkpFF97zv5Wq49SSFXWoAiEhAAQ1G?= =?us-ascii?Q?jzRwnXzTEty2HXeeA3n5GfP0/OpYV/F+qJNi//GogusnNBNuTPMtwo3pwMQ5?= =?us-ascii?Q?jzPx9hztjMNYg5DtLytrD6OLBfMaXpXd5GSQvMbwfu2ydI8lvElWcARBZN/W?= =?us-ascii?Q?PTEFKqSIwBwQV0Z5tmpmUCw4F5qnIc3DJU4fU+alRBtKb9JSipGQiBwTF/D1?= =?us-ascii?Q?9IqBpyMjJx7qzAlbEFci4Eao+GyYnGpcabN5ow1vimvuzJI53X93ymPWIpSn?= =?us-ascii?Q?OAjEbC6nSocYyPan7jt28gtz7k6Cu7Oe4SEChK2kHQRElrl37su5FPW/Vxof?= =?us-ascii?Q?dx6YgmlNtKrPlG7/E9+KnsfYOtMCZMTgv76XanpvvAzRjE19OHHyg/ucj/AA?= =?us-ascii?Q?9fAir5NqZukj2w/ATlL47ViHtJpctbufyorFXlKW7HaIGrWJo0DP4aXSaI2d?= =?us-ascii?Q?+Ds2GFAJgqPgjbVevUUdco/TytcOyYG9uoQfb7htabScbK55G8I2gq4aN0Kp?= =?us-ascii?Q?Iqr/W1pv5t082bJ/OseHUowvtUnn52icmeMhRwPl1gPgXCYxA8eKZhp58Tda?= =?us-ascii?Q?MKDNxyDJ7APKn+hERFWQeZ25u+rFzHxfmPPlrrXxuoj+PL1aFVu03TLOd2TL?= =?us-ascii?Q?urWDpNfrjbdU0/g1Mn2wwbcVyeWpzoZ5bmTh59jDomNFofOQuucKJdg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 6:T9v9Xyvjq3bg+Wj9RtvrcHR5P1NvQF6lxec40n9X/VMLR7E7oWmMuF8ASIvQHf/bKIS6ofN6BkxgxfWg8cHN1Y658NXmCrfXC5H3+VeOXKFrjaUA/WpWTiysmUwL6NeWS+Lssolwwi/htrvWVz5zLlICmLDb+ZeOWuwdwazCSFCAprHsr0542/5OAbOCdtTNiw7gXNViXu0kDxe3PFAZNtPk69v1CjqxcKx0pEt/f32S+/YRHw9EnuwUIeFSH0BWVYUKaMYJEOCygVFDBmGLVz2reHRuya7QWKL5gY/UA9Q=; 5:hF+fuHKeShMoSohGqaRzwJk1HBMojAzCXTR9Ao1cNnvZFhsfb9jd5qwN33GUWnVly4JED40F4s8qm105oMLxGnVV6A+K8tuYDfHfvLGpEtD6zCwDBhDpJYb2AdJkCa27Pil6FwcEYwyiUHj9Q2V2vkRBMwC2y9Vp7AyKuJN91nU=; 24:8GdLwsUONhO5jH94Cm9RS2ow2z7Fhfxkou5RCOkZg8hHG8O8c0JRrG86GgzQNV0ubST8WEqneMo6JGNYIup6UbBd5vnbpQTIsg8wI+yDw+Y=; 7:UZw8/hYd56w8k+79T5VhGsId0g/dvjMRStf76IWWzP6xONyyOFcc9Os2fB4pE9RdldLIn6LdqaZGTZw4yhJOh6PYlERIKvtjgBps7tbB/n8tcp7nIvry7YL3gbI1XhLk8JKA0yaDZyOt4avgFHBUlUv0Xma7JUuCck7gurNC/og7Mh3x5QgmF9Hv1XFgTatDEGzNdNrVXB7NzklCkkbOXm4wja2TDPLlasHcdQGihnVTiQ5enDygA/ZIyeVhRTsv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2016 02:21:27.3558 (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: BY2PR0301MB2006 X-Mailman-Approved-At: Thu, 01 Sep 2016 12:00:55 +0200 Cc: Wenbin Song <wenbin.song@nxp.com> Subject: [U-Boot] [patch v2 1/2] 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 <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
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);