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