From patchwork Tue Dec 26 15:46:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 758382 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp3131859wrw; Tue, 26 Dec 2023 07:49:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEP+GprathbeLAhgMvA36tciIn+SfJui1pnf8cVazcLkykiVqt0jU0pGOboxt1Y6f7malDN X-Received: by 2002:a05:600c:168a:b0:40d:4329:d3f3 with SMTP id k10-20020a05600c168a00b0040d4329d3f3mr3614322wmn.22.1703605781635; Tue, 26 Dec 2023 07:49:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703605781; cv=none; d=google.com; s=arc-20160816; b=XEqHKE0NdnY91QWHvXSPRyNw8zWzmTfhiMx8N19N20o7PLAU8yohFYegORzMjW6Veg ihEr9SHUDm/PcEOQnG4+yed15J4egOiArB/ff61kapDJ86Vaeq/U9ANGpPp/vJpxC3kt s914de5UrI0VP/9nUZWAvPudlS2tQ3LBI8MWOc3QZJqOgqGChLaC7pl8GEcFy2qsnnD4 q99NtOFUsYFcRHJD3SJLOo6d6Mx+lYlptVqj6bTefnzHWlog8SXnxpWUDv5BJpOdvtNN FwNbrcfb+1D4DgcLK4q1x0A39F6Rx/tkF0cgcW8wwWcTa94t9D7n4mwWWLowaNTWIobM X0uQ== 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=IS8EywmUBWYRSEGFxwXEF+bHBu5X9bEjD7sG7c0kBHVqlY/NVLqQDey96PTtLC/ich SAIEoeTaTkZ/eO9976p9h1pi2gvIfEXdPXi3ExMZxajDaf72o7njyt1N9mmgjZ+jeR/c bXMFKDrcYA5Pyk5PpoS8iPwR6BWbtU7cfXOxuXVXqAV/m2pGqom2afJOf97OKwbaDL3q CpDXA72OmTlQ/VxzYXaWWuuPSFDI76EEdKgv1DfTq8XrnsnstzHcI/lO3wHt6h3cq4bP kD7UXafk8FXc+8F4cdTy8TlzLGeyWdWbGEq9CZhmGw0oULPjb8njn742UYA6aQvwmsLW oOgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=slb72ob8; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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. [85.214.62.61]) by mx.google.com with ESMTPS id l5-20020adffe85000000b003368bfe2cb7si5011353wrr.84.2023.12.26.07.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 07:49:41 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=slb72ob8; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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 2393386F87; Tue, 26 Dec 2023 16:48:59 +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="slb72ob8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAF6C86F56; Tue, 26 Dec 2023 16:48:57 +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,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) (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 AAFE387968 for ; Tue, 26 Dec 2023 16:48:55 +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-lf1-x136.google.com with SMTP id 2adb3069b0e04-50e7aed08f4so1322855e87.0 for ; Tue, 26 Dec 2023 07:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703605735; x=1704210535; 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=slb72ob8ODUgX3OxB7iItdmJ6ng9TuRBVyM1f3y5bRFejpQ2oiJ3DGcw0BUYW33njc fdCthGSKop/tvKHt/a6Bxh92Mv43G/SSrpXPs5R25N7jYgWgBcpa+takxbPCWQ8uV9pL ao56QZSmP2pvBWWwFX9C5eINsA2q14Kn9UnsTIkP1gdG9h0Yz0D8H9ZAGEHbhBrrCQR6 PbHd3oylpewFvduaTa2xN9enzcEwGvt/KwXSmyXBJa+14h4hSLeu4tCeBldNGyVNuM5r AZdk72T6evKB/HzunKRs1J3S12JtMwqmEPUNbpEwFXfTzFiQ8MRpSILTDTWyTCpSGTTo 8Qbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703605735; x=1704210535; 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=SmzxoGU5uLQykME1uOk55JIkO2+93Q4ndVs7TYGL0wrSevCo95OycYLTuhBbbeEFr3 MAWyuSmYqqSvjp9rqdRGXspHjF1MThsKpsvbLgoOcZE4+rPnvWQOs0vPzYuDBETu63cp 2fR+odYnIbGtvIGr/LtgtHoLunb5/g/yHwvlZJEqp2DagBqlPn/ju9OJAoSXgUC1q9P9 iCUymttDkkUweGqh6GXzlkFxD7wrUwqFADxacahfhkB5vLdt/OyCGJ5AkFiihsGkQLTe vMbBixE2f9Bi4FystzSZMmvxwUtUv/7JEMfiNMjp2xqsMTq92sms9wXIybSFujNsQ8fX mgPQ== X-Gm-Message-State: AOJu0YxYD5cZz0dp0SzjGtsNA+lSufPkZ5MWU8pPKT9NP4T1B+ow1wGk BHbXtFjVRJYV1q3rSA1b2G51yLeLYYaJNzSrstcbrJRHXdo= X-Received: by 2002:a05:6512:128b:b0:50e:7f5c:6c7f with SMTP id u11-20020a056512128b00b0050e7f5c6c7fmr1140310lfs.17.1703605734639; Tue, 26 Dec 2023 07:48:54 -0800 (PST) Received: from localhost.localdomain ([45.82.14.220]) by smtp.gmail.com with ESMTPSA id d25-20020a0565123d1900b0050e743b0b2csm1089336lfv.34.2023.12.26.07.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 07:48:54 -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: [PATHv3 6/8] bcm_ns3: use device specific naming for variables Date: Tue, 26 Dec 2023 21:46:17 +0600 Message-Id: <20231226154619.5071-7-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231226154619.5071-1-maxim.uvarov@linaro.org> References: <20231226154619.5071-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 \