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 */ From patchwork Fri Jun 15 08:29:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138661 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp549282lji; Fri, 15 Jun 2018 01:29:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKo55mdSHCl63vd4lrceiY7MXb7JPkpd2NmPXba3MRjLfvi7LoFqM8qaa8EGp+6ayL6Kjyf X-Received: by 2002:a50:9dc3:: with SMTP id l3-v6mr1060603edk.234.1529051376810; Fri, 15 Jun 2018 01:29:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529051376; cv=none; d=google.com; s=arc-20160816; b=E0VnaSm52yGeeiudTkop/Mdosg8bPvCszWGWyxXHsRPvbjhC4zXdcgx0lk8SEypG2R wkutF0Ev9PYcqanQLS+Fk+HZHu56w3IDhAMVELOHX++n11LCKiSKfZtcihDmJ7Sv/kqq gYBq0/HF+qJs0kv7/vR/J7zACp4UmyMa7Bijc9xz5OqmxtHROokvy07ltTxwVHiB5IJ4 eraSTV3563F5/G7PwwPdwV4Qzr2HM/G1Dbo3vBUaWnw5jHfsZHK9n8g2EnPuZdpmKbZe U70H66ugG7bnE3ZTN3edm0so7VYvZOVxvT6fp5tgx74w7LQ/XoORRzfJ69gJLvbwxJgQ W6og== 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=AKqRsywTH3X6gAkZKzSc6tiku143HvePoMM0xiORiXc=; b=BLBZV2OdIslpJ9yFya8X7Ax8n00Pqbw3GYCkSEce46GPh9f8bLJQaCt/g4bynEV+TC vRu9bvr/9kuMCm5jZ37vWC2jLhahoap71yQzFjX1g/ofaFmf+ne+bs+ZD4lEsJIYo5zZ 8aipazOkN2MsstXcLp2n9JZMB2cpQHaweDEmEBx/YdqO8SQBNcYmo6QOrtL7oOYoLmwC uuWlunSHLBfVad6cKWcBOlfUGI04SDvlTmTM+g+Dkgrk8RBwf9Um7FpMtxTT1WB8pjiq B+D+dFNUb+1DKDcuyYN94D1w0HeaL1T2dESNklZwErQS3VlD8LQ84N2IRQnlz/TN3TLX A8OQ== 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 m23-v6si1971293edd.448.2018.06.15.01.29.36; Fri, 15 Jun 2018 01:29:36 -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 5BB96C21DAF; Fri, 15 Jun 2018 08:29:34 +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 4F695C21DA1; Fri, 15 Jun 2018 08:29:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B7116C21DD7; 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 57C74C21DA1 for ; Fri, 15 Jun 2018 08:29:30 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 14C55AD9E; 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:28 +0200 Message-Id: <20180615082929.82491-3-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 2/3] net: Add option to prefer bootp/dhcp serverip 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" Currently we can choose between 2 different types of behavior for the serverip variable: 1) Always overwrite it with the DHCP server IP address (default) 2) Ignore what the DHCP server says (CONFIG_BOOTP_SERVERIP) This patch adds a 3rd option: 3) Use serverip from DHCP if no serverip is given (CONFIG_BOOTP_PREFER_SERVERIP) With this new option, we can have the default case that a boot file gets loaded from the DHCP provided TFTP server work while allowing users to specify their own serverip variable to explicitly use a different tftp server. Signed-off-by: Alexander Graf Acked-by: Joe Hershberger --- v1 -> v2: - remove README entry - improve Kconfig help texts --- cmd/Kconfig | 11 +++++++++++ net/bootp.c | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index e283cb9a8a..80a5af8a0c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1121,6 +1121,17 @@ config BOOTP_HOSTNAME help The name may or may not be qualified with the local domain name. +config BOOTP_PREFER_SERVERIP + bool "Serverip variable takes precedent over DHCP server IP. + default n + depends on CMD_BOOTP + help + By default a BOOTP/DHCP reply will overwrite the 'serverip' variable. + + With this option enabled, the 'serverip' variable in the environment + takes precedence over DHCP server IP and will only be set by the DHCP + server if not already set in the environment. + config BOOTP_SUBNETMASK bool "Request & store 'netmask' from BOOTP/DHCP server" default y diff --git a/net/bootp.c b/net/bootp.c index fdcb4374a0..9a2b512e4a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -147,9 +147,14 @@ static void store_net_params(struct bootp_hdr *bp) { #if !defined(CONFIG_BOOTP_SERVERIP) struct in_addr tmp_ip; + bool overwrite_serverip = true; + +#if defined(CONFIG_BOOTP_PREFER_SERVERIP) + overwrite_serverip = false; +#endif net_copy_ip(&tmp_ip, &bp->bp_siaddr); - if (tmp_ip.s_addr != 0) + if (tmp_ip.s_addr != 0 && (overwrite_serverip || !net_server_ip.s_addr)) net_copy_ip(&net_server_ip, &bp->bp_siaddr); memcpy(net_server_ethaddr, ((struct ethernet_hdr *)net_rx_packet)->et_src, 6); From patchwork Fri Jun 15 08:29:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138663 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp550282lji; Fri, 15 Jun 2018 01:30:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL55+cQnTK3hDwaF54Nz+sBabNrBvbtqMYQOH5z3NH0+uc8+3h+TfZjeKJbR1Zi9t8MSkK/ X-Received: by 2002:a50:ab0e:: with SMTP id s14-v6mr1067241edc.133.1529051436255; Fri, 15 Jun 2018 01:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529051436; cv=none; d=google.com; s=arc-20160816; b=v0un0xFARGTwXBX08Q4gOYy1bKA/3HbZtj3wT+ZVOVhUd/ChvpixQM7pSYY/a3wEWK DUHfKvR9ucmGCJDLvjmK2VWq/m3rqTpW758UWvcTL+z2sOz4QhcWbGwkcmRDtXLlICp/ 4TK1SObxs6BYK3OMd8cBvlz606opgviU+9qL5+w9hSf6ktzt+An397IUemMXk1H6PmBz rl+leoLNUL8h8TJSzDDRQmxP/0U/+HJqaVFIxCzNiWP2aFI/cyhSdjb95XCXzd7182k4 Cg1fPgjmTehf9jEA40W3isosWi3ra2C2fepGDpc0imBhN8lTjPAqaFIL/tIMQDMNQqK4 juGA== 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=qCEJYFo5jWnVIScg5PR4f6ubRgzhtXO6IDrtpRj/GaQ=; b=gWYFxt0RV9zw9NwUJET25UDOlBkzruhrpfUEuwj7l8KAdzUcclDZPZ6eIMsHh7e0dL Zai6Zv0RCi5ObcS51yjfnJxPuICjkeRqQ0vHqdGN/2uiHJAudsVYkcYLtYQrldh3JSUv AQUPFrxG8S6Ste5Op8yYpxaWf2lxlq0iyXZI4KJ9JGXfs1Rz0VuFy16oaWJWbcOFL+pM Ly3GT/FVL9fl9A2MPAfjqO4Mg3eOsFe6tBBnMSvnm0DSC/hd4r1RZC8FFNglY/rUlU2j HEHPyGecnl23lj4mRxu95u1Ib1LE8F96q/hAl40Jiegv32YoGC8aQF2HiLId43UOTX+y Pluw== 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 h8-v6si1355377eda.272.2018.06.15.01.30.36; Fri, 15 Jun 2018 01:30:36 -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 D9467C21E39; Fri, 15 Jun 2018 08:30:27 +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 338C8C21E39; Fri, 15 Jun 2018 08:29:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9BBD4C21DA1; Fri, 15 Jun 2018 08:29:31 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 4E501C21D83 for ; Fri, 15 Jun 2018 08:29:31 +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 1E4BEAE40; Fri, 15 Jun 2018 08:29:31 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Fri, 15 Jun 2018 10:29:29 +0200 Message-Id: <20180615082929.82491-4-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 3/3] ax25: Switch to CONFIG_BOOTP_PREFER_SERVERIP 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" The ax25-ae350 target currently uses CONFIG_BOOTP_SERVERIP which means we ignore the DHCP provided TFTP ip address. This breaks every case where we do now provide a serverip environment variable. Instead, let's use the new CONFIG_BOOT_PREFER_SERVERIP option to fall back to the DHCP provided TFTP IP if no serverip environment variable is set. Signed-off-by: Alexander Graf Acked-by: Joe Hershberger Acked-by: Rick Chen --- configs/ax25-ae350_defconfig | 1 + include/configs/ax25-ae350.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ax25-ae350_defconfig b/configs/ax25-ae350_defconfig index fc04c87485..a328555af6 100644 --- a/configs/ax25-ae350_defconfig +++ b/configs/ax25-ae350_defconfig @@ -40,3 +40,4 @@ CONFIG_DM_SPI=y CONFIG_ATCSPI200_SPI=y CONFIG_TIMER=y CONFIG_ATCPIT100_TIMER=y +CONFIG_BOOTP_PREFER_SERVERIP=y diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index b1ca5ac11a..b230896734 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -11,7 +11,6 @@ * CPU and Board Configuration Options */ #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_SERVERIP /* * Miscellaneous configurable options