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