From patchwork Fri Oct 23 10:58:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1386656 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=Lt8Za3W4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CHh762zfQz9sSs for ; Fri, 23 Oct 2020 21:58:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE6008244A; Fri, 23 Oct 2020 12:58:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Lt8Za3W4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7DCB82457; Fri, 23 Oct 2020 12:58:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F186682442 for ; Fri, 23 Oct 2020 12:58:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1603450716; bh=Wy8wVXevpALBJXDKVRVDqBAsmGoi/pVHBWXi+rXsCx0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Lt8Za3W4BoDocUMs/grPTNkoQZplmsiP+0bra0Dul3ClDI5kchcDEONY35byJGx8j zGlXlSyULqUFygrJ9iWW2CXq+ySgkgoSw7ii+jZlOBB+m2RrNWLkBELp8yIRkXYZqY 2o0AWqav4mhFYDnZyZfMdSTIjo4doRu0Irl1KTV0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([178.202.41.107]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M7K3i-1kUnmC0oM0-007pSv; Fri, 23 Oct 2020 12:58:36 +0200 From: Heinrich Schuchardt To: Joe Hershberger Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] net: sntp: remove CONFIG_TIMESTAMP constraint Date: Fri, 23 Oct 2020 12:58:27 +0200 Message-Id: <20201023105827.6185-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Y0dYaxR7Ocoyf/y686wuXm5z1nSllxSLtabh6+nlA8BE+5y2kYE oj65Z6Ios3+8T3vVoSqrv96kO4PEpGPKgpvsGngjdkoy7JgMlF4w86BCuDHdHiru/Ieu9YG GOJrr9T+pl/16bwYORSiK/fHmK3dOurqrug91po0CDd7m+GN5upt4oxDcooPzCvcs8W1WgU DXP6pybU05fckCc6f+mlw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Z92Mv4XWWWs=:g0KWROz+LdFmd9zRuXDSKZ 4kAQ8q4xdVxmljC1b0EizomuD3kyd8E3Je6WkMkpBWQVi8kmCqZ5bcAS1Kj0/3hIKeUa+Yjq3 kad9fQwAaGxYIizWlCrayPJKN6hwqKZx4Caw3M3HmuRObecydWIrPsB/O6BN/yY1GvQwap+L+ klnDZ3Gn2LUJxtqVjniFF1jcJrfaKa3m77Fwx7USEUlDELvckO7XxDdhuQvymrghgotnvgy/w LdI8Eyvm6QKHZNeBk/G+7suhKLeXxKulWJTH2whVpT57trUV7KsyP09lmZM4Ib8RscwDKWBRM rje3jncTxhxWBtTb52Upk5V5gczYt1SRUDYOTaeXDWeVxjdPEyaK6qOREvcfUmsbZX/pdPHdP iDzjreJuWHl9/XEhqJ/8yNpuPbOhD2J/ok3CoNurfX+If1E6lw6KQha+hf6c//tBn9CdbE+Jt 5qGRfLeEswSQKoQA/aMjclyoeTbUzAz/YqQ6SwftYyOaYHY/26YrWx/dqMSOJn8rm8OoV6ut4 dmz4X8mq27Mb+/Qoai934Ssq7OnoJ30jN4i3Yxk/fJrSmvEvLo4eX+rbJeSWByaObRIEyie2m q5Vnqp+YWFGKaDpvO5xh/aVePFniSENI4XmIRrzwBx/MlaQRubIkWX64ZX2sbU5GfjBv7nHEC le6uyPKgFbcwTfjwUozOvejFSnhYkFI94RCOTUgdDTYmORfg7XlzUcXWGm/csEpaDOmWyHgli 0ke5wGZOs54HtnWA5/xoYaxmmgLwuDz814xjahCPBfrhIjYrpIrwYmYAZ9swdWR1rKVn7vHjp WnRM/+CWl4X/qh1oy/ndhpsP/9FbEBj4WRuRMVC8m0hEnTPt8ybfyZkEMVxp20uzOzV+3V/gd d7S1g6eZamkX6AQaxpKQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean CONFIG_TIMESTAMP is not related to the RTC drivers. It does not make any sense to let the updating of the RTC by the sntp command depend on it. Drop the CONFIG_TIMESTAMP checks. Furthermore function dm_rtc_set() is enabled by CONFIG_DM_RTC. There is no reason to require CONFIG_CMD_DATE when using a driver model RTC. The UEFI sub-system can consume the RTC functions even if there is not date command. Only check CONFIG_CMD_DATE when using a non-driver model RTC. Signed-off-by: Heinrich Schuchardt --- net/sntp.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -- 2.28.0 diff --git a/net/sntp.c b/net/sntp.c index d5d5671933..dac0f8ceea 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -57,18 +57,15 @@ static void sntp_timeout_handler(void) static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, unsigned src, unsigned len) { -#ifdef CONFIG_TIMESTAMP struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt; struct rtc_time tm; ulong seconds; -#endif debug("%s\n", __func__); if (dest != sntp_our_port) return; -#ifdef CONFIG_TIMESTAMP /* * As the RTC's used in U-Boot support second resolution only * we simply ignore the sub-second field. @@ -76,8 +73,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong)); rtc_to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm); -#if defined(CONFIG_CMD_DATE) -# ifdef CONFIG_DM_RTC +#ifdef CONFIG_DM_RTC struct udevice *dev; int ret; @@ -86,14 +82,12 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, printf("SNTP: cannot find RTC: err=%d\n", ret); else dm_rtc_set(dev, &tm); -# else +#elif defined(CONFIG_CMD_DATE) rtc_set(&tm); -# endif #endif printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n", tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); -#endif net_set_state(NETLOOP_SUCCESS); }