From patchwork Wed Mar 28 15:51:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149283 X-Patchwork-Delegate: joe.hershberger@gmail.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 0E7C8B6EF1 for ; Thu, 29 Mar 2012 02:53:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 966932834E; Wed, 28 Mar 2012 17:52:43 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 DkG7qugWoMcl; Wed, 28 Mar 2012 17:52:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 531ED2834F; Wed, 28 Mar 2012 17:52:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DC84B2833C for ; Wed, 28 Mar 2012 17:52:04 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 K6yTd6wXumq2 for ; Wed, 28 Mar 2012 17:52:04 +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 mail-ob0-f172.google.com (mail-ob0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id C19752831D for ; Wed, 28 Mar 2012 17:51:59 +0200 (CEST) Received: by mail-ob0-f172.google.com with SMTP id tb4so1508685obb.3 for ; Wed, 28 Mar 2012 08:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Hcc9Q3dooUH+FTlpDNOptZ3ym1eZRls8VT2To0wwS7A=; b=zyWfklbFzEgXpuV+UJbhBPez6UmwJ3IUdwNrZtKC8pFDsrZDT25VXHVZRN0RIl53ZR SfHQZNUIOf/93JpHnjVqlXDO9mx2MC0CuvQKEV37RwbhftsBnrKG8rjmM02MVW1sSEF4 d3OVs7Xn6DD62pTLM3RjVNRm9mhbe5NhLRld945TBMV85MyWRlIFetX2tLPxFT91KNZE XZ7SIkDbgIh5oJeAIzhwoGLbE94gbYR2oAgMATiQ0zqueTYQovQGzBBaYCQ5e6H9Db63 qvNM/qxYY3o4X/c9VHZ71FOX3vn/zrkJR34f9/UBb22Vqd7eyICaqjhNVH4jHV6J3dGZ ZbOQ== Received: by 10.182.122.36 with SMTP id lp4mr38779674obb.64.1332949919340; Wed, 28 Mar 2012 08:51:59 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id yw3sm3354179obb.7.2012.03.28.08.51.56 (version=SSLv3 cipher=OTHER); Wed, 28 Mar 2012 08:51:56 -0700 (PDT) From: Rob Herring To: u-boot@lists.denx.de Date: Wed, 28 Mar 2012 10:51:35 -0500 Message-Id: <1332949898-6502-5-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1332949898-6502-1-git-send-email-robherring2@gmail.com> References: <1332949898-6502-1-git-send-email-robherring2@gmail.com> Cc: Rob Herring Subject: [U-Boot] [PATCH 4/7] pxe: support linux entries for labels X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Rob Herring Kernels can be specified using "linux" or "kernel" entry. The difference is kernel is supposed to detect the type of file, but for u-boot both are treated the same. Signed-off-by: Rob Herring --- common/cmd_pxe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 2497b73..b8cb4f3 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -628,6 +628,7 @@ enum token_type { T_TIMEOUT, T_LABEL, T_KERNEL, + T_LINUX, T_APPEND, T_INITRD, T_LOCALBOOT, @@ -656,6 +657,7 @@ static const struct token keywords[] = { {"prompt", T_PROMPT}, {"label", T_LABEL}, {"kernel", T_KERNEL}, + {"linux", T_LINUX}, {"localboot", T_LOCALBOOT}, {"append", T_APPEND}, {"initrd", T_INITRD}, @@ -1024,6 +1026,7 @@ static int parse_label(char **c, struct pxe_menu *cfg) break; case T_KERNEL: + case T_LINUX: err = parse_sliteral(c, &label->kernel); break;