From patchwork Mon Dec 4 12:04:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 750022 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1087765wrc; Mon, 4 Dec 2023 04:08:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPPnMRrFm/qoVL1tXYR+CqCJD3XNeXcRLxjjxWeVOXTlWHo63On7E6XRnkc0afaTWU42Sa X-Received: by 2002:a17:90a:bc08:b0:286:6cc1:7816 with SMTP id w8-20020a17090abc0800b002866cc17816mr2641655pjr.89.1701691727811; Mon, 04 Dec 2023 04:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701691727; cv=none; d=google.com; s=arc-20160816; b=i4FviQkBx8x1IFdm43nAGUIZc2l5HTZBzQ0mFOFUhHi9I7xTVAoBEg00XWTPuSJzsG 47yu4Vi4yVJVpDNbE4+VspYsQ6ngfn78BiLMsmn5wcVsUjRY7z2S39WVEUUKCtnVVWLR Qb20EiDTMVE2Z7S1uT0ZtedfYj7CVxh3wLpUUil56gB2VfnZhfwa1A6+XSvw7Bxij2YX ZTcv+vd5jvA8HZy6J45d2WLt1X5WKeeKo+2CnvInyEnG1mcTJvEc8PtwCqbiLlNvOp9r afIddJ/X1WyBcuM0H5fUu1rlsH1LEAt2UlNGaPNh4HYroiU1iylww7nWrHo/0a0W1bDZ gj8A== 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=vD97G0JJPrjstx9DxxLj3RhYbyE5f2FSKSx/K3ncJMM=; fh=al8TO5kxNSCLdK6Wct4/S1Ky9QCKGaknFfrx/Rr/20U=; b=LvOWynmdUqO/EW2Uq+0/Wvyys5rj9vmYW0ITP+3sJFoSG/ARLHVqeOA5jgiBn52YzW luZh8Au12c5vlt9D2iFAv7cQkb4jTPGLFnQETrVMn5/DYwqie8vdYi6b0VjoFE3UnmYU c1XiC/ReO/21Oq5O2OFqRb71ai+eTQhoQZKqQPl9kUym/RBD2BlP4URNvtwSjpYlF1px xMVeq0ezvKjdlFAvnYYjm7O8AdjV2aCUrc6fcwfzMGGPH77rt9oTAyotzO1tO9/ujhTh OWQ0lilRGf1poPWgYdGCBTts71nOjg2gXDU6H84oQJi9kM2AKrJqelkxqpXH8kpHk0eO HWvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QclteVqN; 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 pw9-20020a17090b278900b00286ab91a312si1735487pjb.79.2023.12.04.04.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:08:47 -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=QclteVqN; 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 739BE876D7; Mon, 4 Dec 2023 13:07:33 +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="QclteVqN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F771876FB; Mon, 4 Dec 2023 13:07:31 +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-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (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 A0848876D7 for ; Mon, 4 Dec 2023 13:07:29 +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-x12f.google.com with SMTP id 2adb3069b0e04-50be24167efso2497344e87.3 for ; Mon, 04 Dec 2023 04:07:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701691649; x=1702296449; 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=vD97G0JJPrjstx9DxxLj3RhYbyE5f2FSKSx/K3ncJMM=; b=QclteVqNaDvZAnTvnEUw9mzHMcaLT99lR1P566li1NL7PCIcFGus+8MdL8hPsqS288 t2q5fVGyC1iHZ5+gnQ3VmDk72psHIQD4u+Pfo5MQrZj1yMwBqLXzBaC6+K2w2v1yO3ss p3uoYtWtnxuZduSAqxsdafzGzFL8bEoz9SAx9bRChp/L/RZxvVw+LIOD4yUYtVeesH2n /J0nTFESLUnIqwfscxrzrGT3gaesOj9IFRIw1bwarHZxj4b0J+tcTe4h0oJfANdn7VXB P8afC0AMOuwaJIbmbea9UasIk383DuDumD/IoXjYxb9sFS7P7AZzXhuL3mA4RgbPKYjC BzXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701691649; x=1702296449; 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=vD97G0JJPrjstx9DxxLj3RhYbyE5f2FSKSx/K3ncJMM=; b=vJzHcuNnIv6FxXk6KBIqIpWX1DJIzzzECGInPo6Lit64jNazwW+65hQsYuJxcH0xYl A0Xdvz4gTdCYWIp0dRuURn3gaKwNBj2S1F9Y/3m5JqI45FGfzV9pcxIcwKmuJVT+GP8A zRVUJq+pPz4fvi3t1gvkM/5iFe96vV4uobjVYGWrhwrDjI2F92JEEGKMztXczobNVXrc 0tMTLE1qsizCgtkCt0BQEjeCGjp6PeGUPmKiTDFcnm89pCqLLgVjVQpdIfhVwpZ0Lose Z2IiKDGKbj7oyWlYeSE/oB1w2KxEh4E0q+5yR4YPc2quEzcuCESp6PomKQbXeHdiJ+nk LJVg== X-Gm-Message-State: AOJu0YzSlkgVAgmSMT+GbR3YJOowjwMjkZ9QySKJXBQ6q57CgYKY1l/J KBHbhY5ReFvP0fKtfKU+6VDR1uw1E8VIrytEagTcdA== X-Received: by 2002:a05:6512:1388:b0:50b:f304:3bed with SMTP id fc8-20020a056512138800b0050bf3043bedmr518647lfb.49.1701691648830; Mon, 04 Dec 2023 04:07:28 -0800 (PST) Received: from localhost.localdomain ([45.82.14.220]) by smtp.gmail.com with ESMTPSA id g33-20020a0565123ba100b0050befebf0ccsm541675lfv.292.2023.12.04.04.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:07:28 -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 Subject: [PATHv1 7/9] bcm_ns3: fix overlap define with lwip Date: Mon, 4 Dec 2023 18:04:44 +0600 Message-Id: <20231204120446.3277-8-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231204120446.3277-1-maxim.uvarov@linaro.org> References: <20231204120446.3277-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 Rename declaration to not overlap with lwip. aarch64: + bcm_ns3 +In file included from net/lwip/lwip-external/src/include/lwip/etharp.h:53, + from net/lwip/lwip-external/src/core/init.c:55: +net/lwip/lwip-external/src/include/lwip/prot/ethernet.h:69: error: "ETH_ADDR" redefined [-Werror] + 69 | #define ETH_ADDR(b0, b1, b2, b3, b4, b5) {{b0, b1, b2, b3, b4, b5}} + | +In file included from include/config.h:3, + from arch/arm/include/asm/string.h:4, + from include/linux/string.h:21, + from include/malloc.h:369, + from include/stdlib.h:9, + from net/lwip/lwip-external/src/include/lwip/arch.h:83, + from net/lwip/lwip-external/src/include/lwip/debug.h:40, + from net/lwip/lwipopts.h:93, + from net/lwip/lwip-external/src/include/lwip/opt.h:51, + from net/lwip/lwip-external/src/core/init.c:38: +include/configs/bcm_ns3.h:52: note: this is the location of the previous definition + 52 | #define ETH_ADDR 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 \