From patchwork Mon Dec 25 15:39:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 758225 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp2710154wrw; Mon, 25 Dec 2023 07:42:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTRa1dRFOsh3Di1HRaZ8SJ/7bBeZQs40k7OM/BGH32LLAUQBCPJakXOzQb+dyizdJACTKc X-Received: by 2002:a05:600c:3ba7:b0:40c:909:fdb4 with SMTP id n39-20020a05600c3ba700b0040c0909fdb4mr4284282wms.90.1703518979626; Mon, 25 Dec 2023 07:42:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703518979; cv=none; d=google.com; s=arc-20160816; b=i/b8E6kVSMq23Xp1QTxjd7BoCPTObAPt+Hr7Z5utyYwdOGEFWUIiR/lS8CoNAkpx+J 2rmwvPKzlkd/PbCa9u/BYCES6l4QrZY/0vGJl/Sv39VyRD12haDzNdT2o8mB2pWFkKJD ONGle1K1JksrMbGdPksuZxArxSUo62LAPFR5k8FYaRfiP3xPzGL59Rw8iULUI/teXXFc OS/49iIZS8Nn7gdCZ8ufJTekibnQ4STzVTUvYz3WvQ1BHyz+pC5Qy4muu7NW3GTOUBn/ aSc9eals2X8+UwEtqDoQJmwms/HAE9FEfbuiQ7q4SRZZHUksbrl73n0ZJerqxsxTqFe3 ak9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CvQDLylMZZyItYAARaG/slPihLAB8fb3RjCohXg8958=; fh=du56ke/iOw6lsNCEmJDrBFX+K8LhVFYcHyq+zob6aA0=; b=UXIakipVd2ACVgRlDy28B7BIi0eu3OIZ3fRX7DbwvOxck/I52OtHWIFZeBk5na4rbm 2D1T0G5/JThMAjojAfb/aD+IW1RreteEyhqKWYiYknR48EfqYfzGOxZQfhF0zKgwUor0 yIPBZdmfNlok6hCnETHY2qcu8usStDO4BW/iwkpJcy9zSdFVo7b2nUS8omq7qQIqrFKS qb12hfCaU+l/QZ1+hemfOM3hsS8LzqPUmAblhff7vEyJqSpPITZseqOFucA+a+0oPQVh VlJovwHI1kM24NI/E/XDdOs9oYvxQjldPaJsukalijZtVVz8i93GN1IKRVD1NvVBuxw0 ictA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ff38fPYe; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id fk14-20020a05600c0cce00b0040c3300b745si5363437wmb.162.2023.12.25.07.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:42:59 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ff38fPYe; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 15B6E8781D; Mon, 25 Dec 2023 16:42:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ff38fPYe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E95088773D; Mon, 25 Dec 2023 16:42:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E858987831 for ; Mon, 25 Dec 2023 16:42:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=maxim.uvarov@linaro.org Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2ccbaea0a6cso11969041fa.2 for ; Mon, 25 Dec 2023 07:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703518931; x=1704123731; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CvQDLylMZZyItYAARaG/slPihLAB8fb3RjCohXg8958=; b=ff38fPYeqzsV/pzlyxOiaMDB/OJZVAawJHfnmWKPcLjh3jQsUDr1gwx68F0mH5epae k0pdMa0BnmPfheRR1wBQctUdUVFL9L2pk/7+jShQRP0SOO94yB4YdsrfP+e726i2tbkv Ap+32nNlDDNslFnztz5TKEh2tHdkqMzn8T14DmwWOo2eNjiMkU0Qz3krMwEFIH6RiDOw /pBkmO0dQEw4zH5T0vQqnl+RWXmA+R178QgtjAwBX/mcT4TI2mPDFfHGYjcE9v9TV3jb 1cKXaMWkWG2HbXKDjeW1RrBIIeT6kDpbRuIqspI2VLqoZkTV6tgAINV6Z2qcZbfc75UN 3XcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703518931; x=1704123731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CvQDLylMZZyItYAARaG/slPihLAB8fb3RjCohXg8958=; b=qBbEInq8BcMrWY5mDOVcMAPDYBaZROfUeWLNDF9f/+hdvoGD9BWo6UIeW2J1VMIJyp FqSeaFXh1EzpD06YKMDtIi+Hv2CyTlhla7Kz4espb1u3NEE7/Jn5FstWX6I0RL+92lTc fln4QdpRiWWcDhoH14KOrsjJgldzQwLRApZtx+H5L37FRB/rKSMggIzpr3Lp0dPCozbZ 76ZS8AqfTY0uwWRC0Yay4qaMoa0Fs5Gfd0M3n2pSwOKPCPAxEDVP58T6m6Rm+a3Drbqy UWvrstgaVqpX3+hTVBt8rtPRVn4oBDAcnsix0NzgaTQQ/GkOc406WXGOyNKGz+nQ/Lex qNog== X-Gm-Message-State: AOJu0YxrUJlHDDv0uptnZJiZz02b4So/aZgxUItaaT92pzxa1EW57yxH YhmTl4fDLGVP7PoIdj57PnsDremiG429s/RLVWEJhKjgoCI= X-Received: by 2002:a05:651c:2044:b0:2cc:9ec8:fc60 with SMTP id t4-20020a05651c204400b002cc9ec8fc60mr2030658ljo.9.1703518931649; Mon, 25 Dec 2023 07:42:11 -0800 (PST) Received: from localhost.localdomain ([45.82.14.220]) by smtp.gmail.com with ESMTPSA id a17-20020a2ebe91000000b002cca6eafc44sm1425644ljr.113.2023.12.25.07.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:42:11 -0800 (PST) From: Maxim Uvarov To: u-boot@lists.denx.de Cc: simon.k.r.goldschmidt@gmail.com, tien.fong.chee@intel.com, sjg@chromium.org, joe.hershberger@ni.com, rfried.dev@gmail.com, bharat.gooty@broadcom.com, rayagonda.kokatanur@broadcom.com, trini@konsulko.com, Maxim Uvarov , Peter Robinson Subject: [PATHv2 7/9] bcm_ns3: use device specific naming for variables Date: Mon, 25 Dec 2023 21:39:27 +0600 Message-Id: <20231225153929.8284-8-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231225153929.8284-1-maxim.uvarov@linaro.org> References: <20231225153929.8284-1-maxim.uvarov@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean Use device specific naming for variables so as to not overlap with common function names. Signed-off-by: Maxim Uvarov Reviewed-by: Tom Rini Reviewed-by: Peter Robinson --- include/configs/bcm_ns3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index 47de4bc201..7c6e0725a6 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -45,11 +45,11 @@ #define PCIE_ARGS "pcie_args=pci=pcie_bus_safe pcie_ports=native vfio_pci.disable_idle_d3=1\0" #ifdef CONFIG_BCM_SF2_ETH -#define ETH_ADDR "ethaddr=00:0A:F7:95:65:A4\0" +#define BCM_ETH_ADDR "ethaddr=00:0A:F7:95:65:A4\0" #define NET_ARGS "bgmac_platform.ethaddr=${ethaddr} " \ "ip=${ipaddr}::${gatewayip}:${netmask}::${ethif}:off" #else -#define ETH_ADDR +#define BMC_ETH_ADDR #define NET_ARGS #endif @@ -749,7 +749,7 @@ OS_LOG_LEVEL \ EXTRA_ARGS \ PCIE_ARGS \ - ETH_ADDR \ + BMC_ETH_ADDR \ RESERVED_MEM \ SETBOOTARGS \ UPDATEME_FLASH_PARAMS \