From patchwork Fri Apr 27 09:55:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 905594 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZSP87kBh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40XTnn0dFFz9s02 for ; Fri, 27 Apr 2018 19:55:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B8761C2208E; Fri, 27 Apr 2018 09:55:21 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 BA8FFC21FB1; Fri, 27 Apr 2018 09:55:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 37A57C21FB1; Fri, 27 Apr 2018 09:55:17 +0000 (UTC) Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by lists.denx.de (Postfix) with ESMTPS id 94F48C21F97 for ; Fri, 27 Apr 2018 09:55:16 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id j11-v6so1188095pgf.2 for ; Fri, 27 Apr 2018 02:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=b/SRIYKRc8TWrVEUm6zrxIEjx1cbQq5KBVQtUHOgfk0=; b=ZSP87kBhQGePLkKf/MFoQ285YG/h+rQZuqMy8InX8CFWOe2ceWImQtsOa/1l0MkiZN g3H7Ah2SGnXM0Lk3VXd67PVv5uuJdkhpO7IFMVzZVg3thisrKOWPToU59eHIw5OO3VnH klTx0RgaQ7FWxnzdvwjcI6El0kAxgqco7OTv95NHG1FqvNrP+rfpxjK9KOTfXI9w5agQ 2gK55sevClPSABIu4+Yg42grpXwBZDAg8YDPSSdI/yjPRptv/odSsJhj3KcdwX3j9U6G D59bZENp+KfMCBY+1rVxwwy84lLDJl86ClRpioPt0V/VuLVdUtc3lO9B5aMRvKPIWRw8 iQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=b/SRIYKRc8TWrVEUm6zrxIEjx1cbQq5KBVQtUHOgfk0=; b=Vz8L8LdniKLskmT3V5uv+JbQHExdr2PfiVnOh80gUfRfzCpe1xmWXBhfmmSet5uTwO KkY0CnfNEfHoLXOHE1ZKTj3HbMeJRI0Tq4YEY3YwTZo+5GN4VjzFSE4SszeaQo8ed/za eYNcPxr+MNcLVIZ4Dzh7jLMtKKUZYbkOlSD3gHdh2ewetTHpwcHeRdLS9iA9Ej1c51tK 9kwJlAHDSXsv9mhzgDMRHUYNHlyIexCDVvynJheMCk7ujhP7hJsvnfAujI7faE49h6vv 8lpYt2n4vV45qDkuBwvuJPSFXv8zp2fb3XUEDH2WkFCNQL/ytBQ8rqE49f3pYOoOwx5v 25Pw== X-Gm-Message-State: ALQs6tAyt24nwzCsuF12z5VuQNhcxf5TUj/RsVYrk051liQoQ/z+7i5L QSMsSSlnwqlmNV2F14dD81GNJZOo X-Google-Smtp-Source: AB8JxZoCQtPVC7iOO2mqlARtuIHHfC8SCaTsCrTS9jRAJNJ8vNuxmohSnUeL4aiMhV+UpJ1G6uQ9Cg== X-Received: by 2002:a63:8c0e:: with SMTP id m14-v6mr1571707pgd.320.1524822914850; Fri, 27 Apr 2018 02:55:14 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id 86sm2364012pfh.93.2018.04.27.02.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Apr 2018 02:55:14 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 27 Apr 2018 21:55:04 +1200 Message-Id: <20180427095505.25035-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: Joe Hershberger , Maxime Ripard , Chris Packham Subject: [U-Boot] [PATCH 1/2] net: Add Kconfig option for BOOTP_NTPSERVER 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" Add a Kconfig option for BOOTP_NTPSERVER to enable the DHCP/BOOTP option to configure the sntp server address. Signed-off-by: Chris Packham --- cmd/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index bc1d2f31c010..dfb0fddb7671 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1086,6 +1086,10 @@ config BOOTP_SUBNETMASK default y depends on CMD_BOOTP +config BOOTP_NTPSERVER + bool "Request & store 'ntpserverip' from BOOTP/DHCP server" + depends on CMD_BOOTP + config BOOTP_PXE bool "Send PXE client arch to BOOTP/DHCP server" default y From patchwork Fri Apr 27 09:55:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 905595 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kT9AzDSK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40XTpW3Pj1z9s02 for ; Fri, 27 Apr 2018 19:56:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 23C09C22118; Fri, 27 Apr 2018 09:55:39 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 9E711C220C5; Fri, 27 Apr 2018 09:55:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08A14C220C5; Fri, 27 Apr 2018 09:55:23 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 14167C22094 for ; Fri, 27 Apr 2018 09:55:19 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id p10-v6so1191138pgn.1 for ; Fri, 27 Apr 2018 02:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y+LwLpUCW86rqiZ2PjPyLOvD7z+F2PH6pmeD9UaKYHY=; b=kT9AzDSKqbEc58a4064VdX2vVXSZtFe2oTY25S6kXFOiHCBlA01ktB1xTUNCihAv6T Td0ks/W3WshLNkNIqGG4PWhzByzJzEloEJ/SqPD6W7Gbl+wFaLe6ro0e+uItIZ9zA3ae VDhW+P97T3s4Vhh01g/cqMhEQtjZm+KIAtB5P25SsvN0PuBIdtpFs6ZZdndNxFrb45cO MBPCBe7rC4mQqqORNsGB53/KG1rNJXfR9h+ILIUCJjyDqWXt/aw8HmxVbzCLPBjqYBw1 qGqWnqPAyt7BksUk4POcEHkOKP4kDhFSZVBDvyzm5MATcqf3vXWXZk/0rlHeKil4k3Si DwiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y+LwLpUCW86rqiZ2PjPyLOvD7z+F2PH6pmeD9UaKYHY=; b=joR8+4xJw/PSdVyICPLMUeniqTTfNs6mfF/o+GWMduP3uX78IH8iBRlbmmXbUhsYe0 aRzukwKjdNNMeCrl58VT8tuP38soCNB/uqHQL836q4HIbNirmbykugXdB8wcf1TkVjbg 7KLixmlsawJP0XjjuaDC2wFDcdEgWHrHz4fKZm7BEKQGVanC+ZbhZvIXr2Jnxf3ZxzVA qkKYf6MV3BsYNeEV5flAi4abb5Hl9QvXOaEXpgAZ6H+0Bubf57U0l098rll5wVf6AxFn +ti8NmL42zhdGyCsxePLyksKaNE+kPHMUyfCFROo91jDhMo5dokcueGoXoejiuLqnPZh fVjA== X-Gm-Message-State: ALQs6tC0oFAA+BGlYvkUpBd7dsfsiM87kT/kNUQSqg049ENFeJGgYqKh 8P5hxo/FY893FCGHZ4WVkJDK9Upf X-Google-Smtp-Source: AB8JxZo27DfNdEwnU66fH0I5rPO9wTgVzbgu9JE8++VzXOoO5oeODQhjwrAPy4GcP6aC5nrrUPip3w== X-Received: by 2002:a17:902:205:: with SMTP id 5-v6mr1615799plc.301.1524822917569; Fri, 27 Apr 2018 02:55:17 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id 86sm2364012pfh.93.2018.04.27.02.55.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Apr 2018 02:55:17 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 27 Apr 2018 21:55:05 +1200 Message-Id: <20180427095505.25035-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427095505.25035-1-judge.packham@gmail.com> References: <20180427095505.25035-1-judge.packham@gmail.com> Cc: Joe Hershberger , Chris Packham Subject: [U-Boot] [PATCH 2/2] net: bootp: Fix compile error processing ntpserver option 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" When the following configuration is set # CONFIG_CMD_DHCP is not set CONFIG_CMD_BOOTP=y CONFIG_BOOTP_NTPSERVER=y The following compile error is observed error: used struct type value where scalar is required if (net_ntp_server) ^~~~~~~~~~~~~~ Resolve this by checking net_ntp_server.s_addr instead. Signed-off-by: Chris Packham Acked-by: Joe Hershberger --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index efa959971c27..9d7cb5d30c14 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size) debug("net_nis_domain : %s\n", net_nis_domain); #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) - if (net_ntp_server) + if (net_ntp_server.s_addr) debug("net_ntp_server : %pI4\n", &net_ntp_server); #endif }