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 */ From patchwork Thu Jun 14 10:04:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138533 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1903835lji; Thu, 14 Jun 2018 03:04:37 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIA9srgk3jMu5vBOzLMEC6rjfUuUbEq7MN548TOtC1aooNCWt0BfPN6JYDV+o+Y41wsSjxY X-Received: by 2002:a50:b14c:: with SMTP id l12-v6mr2060358edd.65.1528970677849; Thu, 14 Jun 2018 03:04:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528970677; cv=none; d=google.com; s=arc-20160816; b=NuFRQ52AhdBayOp/uKDYHRqC6EmVCPvHw1pd0buCJtVeYU1lgPI3ZBkOyD3brpcqC2 TH7mGE9qt5OW2C4K09Bs1tGOr3geUas3GmXwSCYI8XGJg//d5la4CVxLJ5MnBtpiltBi cnC8zlp1fSFU+BWnSbDvIqkak/ujawZPWFUTqSrdLXqfoUM0PGqpwJbps+AC3+OpATSk wRorCH77DJoeXqGPdY72X0uYfeSRNkXHG+q7ieGzLCnFQ63Ud2yEGGuxZsaXTy7jrLi6 qffq1TePQN32x3p6FMFkqpB6TOcPWssFhbanc0G4kp3v7IlDqZH+XBbp6XyH4LGgxlJS 73IA== 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=DfgFR7gvgFEsuyAgT27CfiBwcwpPDoytdWFzmqAIyzc=; b=i46ykFmrDg6aHMSIX57abPxJ++guyYkAOKzoePdzVJfSAl31/HhQHBbnkzEZy4FR3F 2duvhmPPenca0qaFsNAmj7VQRKTsfzsccti0hnvhl1LQYeVeBhkkVYdUgzi2vWMyT1cs mzjksexuqUQeIM+4FQBNHT8Ibk2rz1I/CBCt4k69wAcZpuE3glvQ5ITQoJ0QNlvc4/6d T5QpDzd0Cs4O8jsJIfImidoJQrmT2+cLqKkTuMGB+34zD3YoVbgEnX+2V2U7z832ENlg JODZJvLm10rtkB8+upxsb1oVvAb4pe+0OfDOemHfCt4Oa+NUQaiDQn/d10WlPcRJnyn2 TDKQ== 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 s4-v6si2165343edj.431.2018.06.14.03.04.36; Thu, 14 Jun 2018 03:04:37 -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 832ACC21DEC; Thu, 14 Jun 2018 10:04:33 +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 26A92C21C27; Thu, 14 Jun 2018 10:04:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5741FC21D83; 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 01E7DC21BE5 for ; Thu, 14 Jun 2018 10:04:29 +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 606ACAEE8; 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:25 +0200 Message-Id: <20180614100426.40511-3-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 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 f3da8572b7..154c71d694 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 Thu Jun 14 10:04:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 138535 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1905563lji; Thu, 14 Jun 2018 03:06:24 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJSgPGXYLPMw8YfsREjQE6plE6E4HpQpfe0dzl2soTNXYSp8bABF/dpvpK8K7NwiPiPhbWg X-Received: by 2002:a50:e0c4:: with SMTP id j4-v6mr2123878edl.198.1528970784222; Thu, 14 Jun 2018 03:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528970784; cv=none; d=google.com; s=arc-20160816; b=PWGfWOfR/Q70oVE0xIOimxDcRFjMnJbBd5c+szoMjlxLeGykPYOdFX6T3joYQNxfZq AikXqNLe20UQ5M0APSlS0llHAmw7QvVmcIi/JN3PSvX880bIDMHkhBANK6kXe4eftpWy 7hGee4kMNw3CSWoIfTZbuDAQNRA6YDn8k46sPpGYRzkFp3SWK+hcXYypyEUjBBm8QYK3 R0FJDbKX5/aP38dNViOzI8NMgn+s8ZM3RXii20TmpaMoQScj17ckoyY2ZdwWnvpqGdHL x4QUfQBF48wN4Gjm1FveSUnqj3de4DnpcRIgIdC37KvXiChfWU8VjBEQb/PfnHMlILpJ uu7w== 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=farkEbgvbAHVNcSlEguuVWKbuLB5V+j4mct84QZ7z3qXSSIotUT2F/Gw0F03j/9vBr IjHcT37O9Y26nnPl142BRQ33F6s2v7lyFr9+Unbd1gGspb0/Mw2selzaBe0SILaLR7/C rzS+zCC8HeDUUOf8n4BiKeG9LIhwKwb0Frf6W9MQ4nBEXyC44T6k0AmrhWefBZbVPFlB vRZMG2J8exRBvQNAWBwOwAwg1LWdsGblmZAzPfos2DIYqX8lZZmnr0Jj5F8AWU5FQDIn I6HaVHuo3LQa7P/isHdKLzOZPFibxw+X+tbb7OIOIQGa1fy6WEqE7vrtytaFPOlFcSED HzcA== 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 q8-v6si3140807edl.126.2018.06.14.03.06.23; Thu, 14 Jun 2018 03:06:24 -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 C8860C21D8A; Thu, 14 Jun 2018 10:05: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 BCB03C21BE5; Thu, 14 Jun 2018 10:04:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8C949C21C27; 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 03229C21D74 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 60B00AEE9; 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:26 +0200 Message-Id: <20180614100426.40511-4-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 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 Reviewed-by: Joe Hershberger --- 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