From patchwork Thu Jun 14 10:04:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138536 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1905675lji; Thu, 14 Jun 2018 03:06:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLqqe4AhDbZ9t2SKTaA9hopRliiBqWJk1hcmZrzhbCy9I+8AN9oaErnDQZvt4lEyQ/Sxzwk X-Received: by 2002:a50:ec19:: with SMTP id g25-v6mr2082406edr.242.1528970789769; Thu, 14 Jun 2018 03:06:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528970789; cv=none; d=google.com; s=arc-20160816; b=mNUw6XubU1gAr2GTetG7iOVCYuDUAWinHnnBY4kd5N9QBEK3LCk7sWDHLefF4Lol0u NT9JGDbZRW9nssuBr8Zwc5qMpDuxL4rnZN1V9+az+hoj1px8ETRyczJxc5sWKW1EIH8i KxVilAVOgYZQ/kqXMg9Sx0Xx0NzFgWVj2qcHU3zcuocJnmvi8uByGkvIEuCMWCL0t4dy huHcFX6JItKLtGmdE4uxskH8f6w2uSokp78blgxmgHQIVHyUaPpDGXzi+ZQTJWRgb0v4 5HUZVChktUbiNB8QEIZxWRrIl5Js0hWB+YVcKjXVEUUPWBuiRi/92c3wE4R8slgjqNly AH9A== 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=snGGyF9UvmYs8zniu5ctNN2sHPSe7P6u6Mai9BqIas4=; b=0/JY+SuQAG4rSoO3xFtTwyl7smPT7rCOgV6sgD2H60YND1lNiOcpkSydJZ77y9HZHk uUrkFJmqtkBiP4NJLtKt7pScoxjcrw9vu805/seztR2RMuLtNVlX7VYdKtK6658XvaMu VjpPgfpsp3j0nQ/p8kYoj/LGz7XlekaUyBXXWLiLgpKXtaL+KZoCXGY+w4qwDKTyhzQ0 Dj/0eJY9o4U/O3fM8YBuLtoUzEQCWlI/MyetEvuRRmUbcNR5H/NKW7rGZLTWZgXOD/rm hefFcigwP0bT20jFdcAwKmVOuWe28/MCpyx+kSmbp92jQIQUrQqYcScU/rDCNOwftkIe 8blA== 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 21-v6si4201328edx.293.2018.06.14.03.06.29; Thu, 14 Jun 2018 03:06:29 -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 6514CC21CB6; Thu, 14 Jun 2018 10:05:08 +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 DAF81C21DF9; Thu, 14 Jun 2018 10:04:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 75B3EC21BE5; Thu, 14 Jun 2018 10:04:29 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 01EE3C21C27 for ; Thu, 14 Jun 2018 10:04:29 +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 6059BAEE6; Thu, 14 Jun 2018 10:04:28 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Thu, 14 Jun 2018 12:04:24 +0200 Message-Id: <20180614100426.40511-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180614100426.40511-1-agraf@suse.de> References: <20180614100426.40511-1-agraf@suse.de> Cc: Joe Hershberger , greentime@andestech.com Subject: [U-Boot] [PATCH v2 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 --- cmd/net.c | 10 ++++++++-- include/net.h | 2 ++ net/bootp.c | 3 ++- net/net.c | 2 ++ 4 files changed, 14 insertions(+), 3 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..f3da8572b7 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)); } 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 */