From patchwork Fri Jun 15 08:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138664 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp550479lji; Fri, 15 Jun 2018 01:30:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIJkQpTvaHE8l5OCfW1MuyyUHPa4OCZLDrtpOcBcJlpcdrnVCxo3tscJORZ2X11at5c0Mf8 X-Received: by 2002:aa7:c2cf:: with SMTP id m15-v6mr1073377edp.280.1529051447509; Fri, 15 Jun 2018 01:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529051447; cv=none; d=google.com; s=arc-20160816; b=QhFXDh+hO7QPe84TvsL3Zkgtd0UxmB0zuJhRu4WBj5y7T+RCbjVWixDejy5WRhlMDt CwJaDyUwNVYWa4l61W6vMA4Q5D6OE4cwzcrei4+eRnwKcpN484dGhiBQBO7kPlP3PcMy e1UOyn49YMaGDm8bEzVxpNJN/xnsQnWf8XQeooobVvjN60DoD9MEbykzeRWdHWjNSNT4 bfy1XZqvhkiodvcyfcCuILknt3R0CkQNUSKnYcdK9GHM4IVq1vFkRV1uXc1fHlyw4c+K f+YNlAKYlBl5WxhGRlXkixcLeMfaIKdJ+PI0Xtp5QKYo7PPlYabgWntwtfJmfXUWP4PW QDQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:arc-authentication-results; bh=JzksXfIZhaipOwcLi1pgOns3RhMrMFvVBh4213aQj/o=; b=cMDs7Re1A7s10vZ7EmRQh6hpFicd04HTht3g7HrHGuVEanAttR8fLKuOyNW5pQAlth X8/AQL9l34oQR++8VZmZPN5tP6rSvnMpe+FAvYq/5Pyj0FBB07HNBhxfVb+7fX3jjlnh /m5TfEj0XNee+Iq6Aj4YRY/+wwUhhjfeHCKXKSXj5tqw/TEnAIlk7XAL6BjUdwfH9bgC Y7puYZB3vzne6iPuzKTTmoaVeT8l9cm/spEEb6kBXnZVoDyWsaMk7kpjGQuKQbvXkhfH 9Lf8dFOLGPJ17hX4d9kNsA2m4JE3Ynek3Z94iZkAotkSLTzYniCP1HxnMaz9ov3Sq3SL 8ppA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id t25-v6si4420965edf.80.2018.06.15.01.30.47; Fri, 15 Jun 2018 01:30:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 1150EC21EB1; Fri, 15 Jun 2018 08:30:10 +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=none 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 E76FBC21E7D; Fri, 15 Jun 2018 08:29:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E627DC21DA1; Fri, 15 Jun 2018 08:29:30 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 582E6C21DAF for ; Fri, 15 Jun 2018 08:29:30 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1108FAD21; Fri, 15 Jun 2018 08:29:30 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Fri, 15 Jun 2018 10:29:27 +0200 Message-Id: <20180615082929.82491-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180615082929.82491-1-agraf@suse.de> References: <20180615082929.82491-1-agraf@suse.de> Cc: Joe Hershberger , Rick Chen , greentime@andestech.com Subject: [U-Boot] [PATCH v3 1/3] net: Prefer command line arguments 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We can call commands like dhcp and bootp without arguments or with explicit command line arguments that really should tell the code where to look for files instead. Unfortunately, the current code simply overwrites command line arguments in the dhcp case with dhcp values. This patch allows the code to preserve the command line values if they were set on the command line. That way the semantics are slightly more intuitive. The reason this patch does that by introducing a new variable is that we can not rely on net_boot_file_name[0] being unset, as today it's completely legal to call "dhcp" and afterwards run "tftp" and expect the latter to repeat the same query as before. I would prefer not to break that behavior in case anyone relies on it. Signed-off-by: Alexander Graf Acked-by: Joe Hershberger --- v2 -> v3: - also check for net_boot_file_name_explicit on option 67 --- cmd/net.c | 10 ++++++++-- include/net.h | 2 ++ net/bootp.c | 14 +++++++++----- net/net.c | 2 ++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmd/net.c b/cmd/net.c index f83839c35e..eca6dd8918 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -183,6 +183,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, int size; ulong addr; + net_boot_file_name_explicit = false; + /* pre-set load_addr */ s = env_get("loadaddr"); if (s != NULL) @@ -199,15 +201,18 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, * mis-interpreted as a valid number. */ addr = simple_strtoul(argv[1], &end, 16); - if (end == (argv[1] + strlen(argv[1]))) + if (end == (argv[1] + strlen(argv[1]))) { load_addr = addr; - else + } else { + net_boot_file_name_explicit = true; copy_filename(net_boot_file_name, argv[1], sizeof(net_boot_file_name)); + } break; case 3: load_addr = simple_strtoul(argv[1], NULL, 16); + net_boot_file_name_explicit = true; copy_filename(net_boot_file_name, argv[2], sizeof(net_boot_file_name)); @@ -220,6 +225,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, printf("Invalid address/size\n"); return CMD_RET_USAGE; } + net_boot_file_name_explicit = true; copy_filename(net_boot_file_name, argv[3], sizeof(net_boot_file_name)); break; diff --git a/include/net.h b/include/net.h index 5760685556..a259b7c530 100644 --- a/include/net.h +++ b/include/net.h @@ -539,6 +539,8 @@ enum proto_t { }; extern char net_boot_file_name[1024];/* Boot File name */ +/* Indicates whether the file name was specified on the command line */ +extern bool net_boot_file_name_explicit; /* The actual transferred size of the bootfile (in bytes) */ extern u32 net_boot_file_size; /* Boot file size in blocks as reported by the DHCP server */ diff --git a/net/bootp.c b/net/bootp.c index 9d7cb5d30c..fdcb4374a0 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -157,7 +157,8 @@ static void store_net_params(struct bootp_hdr *bp) #if defined(CONFIG_CMD_DHCP) !(dhcp_option_overload & OVERLOAD_FILE) && #endif - (strlen(bp->bp_file) > 0)) { + (strlen(bp->bp_file) > 0) && + !net_boot_file_name_explicit) { copy_filename(net_boot_file_name, bp->bp_file, sizeof(net_boot_file_name)); } @@ -889,10 +890,13 @@ static void dhcp_process_options(uchar *popt, uchar *end) case 66: /* Ignore TFTP server name */ break; case 67: /* Bootfile option */ - size = truncate_sz("Bootfile", - sizeof(net_boot_file_name), oplen); - memcpy(&net_boot_file_name, popt + 2, size); - net_boot_file_name[size] = 0; + if (!net_boot_file_name_explicit) { + size = truncate_sz("Bootfile", + sizeof(net_boot_file_name), + oplen); + memcpy(&net_boot_file_name, popt + 2, size); + net_boot_file_name[size] = 0; + } break; default: #if defined(CONFIG_BOOTP_VENDOREX) diff --git a/net/net.c b/net/net.c index a4932f46d9..510d491271 100644 --- a/net/net.c +++ b/net/net.c @@ -165,6 +165,8 @@ ushort net_native_vlan = 0xFFFF; /* Boot File name */ char net_boot_file_name[1024]; +/* Indicates whether the file name was specified on the command line */ +bool net_boot_file_name_explicit; /* The actual transferred size of the bootfile (in bytes) */ u32 net_boot_file_size; /* Boot file size in blocks as reported by the DHCP server */