From patchwork Fri Nov 22 13:03:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1199471 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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="VFv2riLH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47KGr8750Mz9sPL for ; Sat, 23 Nov 2019 00:05:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A7A4AC220E2; Fri, 22 Nov 2019 13:04:44 +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_H2, 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 F406BC220E5; Fri, 22 Nov 2019 13:04:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6C043C220C4; Fri, 22 Nov 2019 13:04:07 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 20C44C2203F for ; Fri, 22 Nov 2019 13:04:04 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id b18so8511441wrj.8 for ; Fri, 22 Nov 2019 05:04:04 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=TJGsITgaA8uq9tXCxn2snVsvevdKdOCQL+a17s24hHo=; b=VFv2riLH0+pWrHZgc95HtjIXraojhyAAuqhKJZRoaOh8OMLyuaKoV2YSuGlXJ+sraB 4ZyjxhyO2GC2VkkQI4tlMZbgneXkykE3ZQIJmv45POUl2Ea2Yw5UnsUde1Tx3nQOtcnL DXcuyzaqj6LUmJBnWe+uSwGjLwrnxfCwMN7RqfrQonHhV/lD6VAjEhUK5phXGZCyrUkz rDAV1+xAlzl2LLJ1c1PXMJ6zK4F3RE1f/9tM3g2xOX886/4Pu2xqTUdatP1BV25cvPS7 gabhn58OE8pHU5nGpRJ1ev3qjZylp2COhIsgiFNTp2m7TuiilNXo/7Z4eMdczO2Gtb9S mUyA== 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:mime-version:content-transfer-encoding; bh=TJGsITgaA8uq9tXCxn2snVsvevdKdOCQL+a17s24hHo=; b=Z1TwkJb+6CU+gJ++qGlm0rDOshbjDy6dYv3NgskkjQEVpsbjiJVmKxDDhi0X1f+E4I b9GbChk6cFftyDLAR+k5ZQXSGKcYEnHdixZFFucg1CSJeutWRZI8QGTUWdbBg7qZ+rjd Tju79+Ns4iYTmNYRj+Tbt9wvaYt+ukSMsGEZo11y/Zuc5NeNV34eggATTkrzf5pQXweI XUIICO/rLHZzCA+FnAvJ53EUknXxUg/gXy3sY6N9DFqSycT3gR0VD0kA3sN3eGFmccSm Bp2HX/CFX37jSkA4nJjqMHfGMMCv7EQ0v02qIAtmM38e9LI9NRx1gTizCqzQsF2OrKUm bpyQ== X-Gm-Message-State: APjAAAWP58WKDT74OKoy/ODegMo875dqjjanky+7KDces+ZtrB3b+VnO c7fr+xQK7sZqJVr43hnPUFA= X-Google-Smtp-Source: APXvYqxzhThR8nGDxLbyzfNYsKd6rBjSvO1HvWF+5w3WE6qyQ64zhGJd3FUgJsfndz1zbrqLzynSjA== X-Received: by 2002:a5d:6550:: with SMTP id z16mr17675468wrv.66.1574427843753; Fri, 22 Nov 2019 05:04:03 -0800 (PST) Received: from mamamia.internal (a89-183-130-53.net-htp.de. [89.183.130.53]) by smtp.gmail.com with ESMTPSA id o187sm3533171wmo.20.2019.11.22.05.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2019 05:04:03 -0800 (PST) From: Andre Heider To: Jagan Teki , Maxime Ripard Date: Fri, 22 Nov 2019 14:03:59 +0100 Message-Id: <20191122130400.2155457-3-a.heider@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122130400.2155457-1-a.heider@gmail.com> References: <20191122130400.2155457-1-a.heider@gmail.com> MIME-Version: 1.0 Cc: Ondrej Jirman , u-boot@lists.denx.de, Jernej Skrabec Subject: [U-Boot] [PATCH 3/4] sunxi: board: Use eth_env_set_enetaddr_by_index() 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" That helper takes care of assembling the correct name and doesn't allow overwriting existing env vars, so drop the checks here. Signed-off-by: Andre Heider --- board/sunxi/board.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index e3b2d13892..bb35d6b66e 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -807,14 +807,6 @@ static void setup_environment(const void *fdt) if (!fdt_get_alias(fdt, ethaddr)) continue; - if (i == 0) - strcpy(ethaddr, "ethaddr"); - else - sprintf(ethaddr, "eth%daddr", i); - - if (env_get(ethaddr)) - continue; - /* Non OUI / registered MAC address */ mac_addr[0] = (i << 4) | 0x02; mac_addr[1] = (sid[0] >> 0) & 0xff; @@ -823,7 +815,7 @@ static void setup_environment(const void *fdt) mac_addr[4] = (sid[3] >> 8) & 0xff; mac_addr[5] = (sid[3] >> 0) & 0xff; - eth_env_set_enetaddr(ethaddr, mac_addr); + eth_env_set_enetaddr_by_index("eth", i, mac_addr); } if (!env_get("serial#")) {