From patchwork Mon Nov 27 12:57:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 747558 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp3136217wru; Mon, 27 Nov 2023 05:05:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEsekvf7WNNtenxlOgyeZ9z54/2BnPiQ5VIxzD8wHWM0P8VgO+0B4tBEXrjcR2/tGT40CtA X-Received: by 2002:a05:6a21:998e:b0:18c:a9d3:4f96 with SMTP id ve14-20020a056a21998e00b0018ca9d34f96mr2098151pzb.32.1701090341132; Mon, 27 Nov 2023 05:05:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701090341; cv=none; d=google.com; s=arc-20160816; b=Xk9Mg8aHcM7cZ5Lf6jU2Yd15jT4T/jsCGSI16v7hzK8eNnQlfB5XhyW3Nn0onyOycn LltOmWeMI+MrrVBOvBnvd+1Ajx/7lx+QPm96FG18EQA5UpQgl6ieM8AcnX9bKE0hnyID o5euaU21beHuVlvR7f8e1pCoq4+mJ+v8YSpJ5qoV4fq4Eut5w1GwC3X4x8CPNEQyWy1c VmV0xApbrLVB8ngRYcmM6ERFod9MPA3djeO6QhsvBSkYNmubFuSgKp3CuZT8ew4G0WSy bYwO7kIHHOSbfzlqW86f4+xlAdNWA/UHjMEi5Gw1EafXICICndCz89rxesEoEI7ETr66 IkCQ== 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=7/ApHZZokfYNAhQkIrUJHXefSMXsGfI8Z1dkA9PV0nk=; fh=QyNHqymfSLfpkarWtc7IKVRHBXLRqHmsXw8S5qDkAYI=; b=tFRFW40L7732+6ZJvq9Q5ae+6vmESlCMlmF1J86nZpvVT1JZ7gQEvF5LopmuCOZOQR CndgcVJgiI/ZIGRgthghXtKUgrpAJ3Pc2dcBX/eC2q8HwwiOVj21YZ+J0KmOVNv4qo+6 tn+EEFTinoV8vtd1hl4lAg7S8CGbH4CFqWkXG7nqTtHvMy/MDOfYES79rj3C3GL3c1Sl m6m6nkJi++pO+Izykz285fDQPTwCXqpk38JVfPOhcWwARamo4kXj4RRBhXz9DxNyPYbL gvToZhzi0VpTQLNzZ5tf+JN5rvrJ+NcYzY0tVDfXa7hVCdT4b36lZ0kVSY/dnWjwQwNN I4Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WcihVUXQ; 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 c32-20020a630d20000000b005bd27be66e1si9723304pgl.719.2023.11.27.05.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:05:41 -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=WcihVUXQ; 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 94645876D7; Mon, 27 Nov 2023 14:01:05 +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="WcihVUXQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29D8C87633; Mon, 27 Nov 2023 14:01:04 +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-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) (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 9A17C876D7 for ; Mon, 27 Nov 2023 14:01:01 +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-x130.google.com with SMTP id 2adb3069b0e04-507c5249d55so6338709e87.3 for ; Mon, 27 Nov 2023 05:01:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701090060; x=1701694860; 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=7/ApHZZokfYNAhQkIrUJHXefSMXsGfI8Z1dkA9PV0nk=; b=WcihVUXQ7Mqev/v3gs8epfn9cZ4qs94uSKdL8zCFgPYYlySrI5mH0spM3exr2kVu50 Djie+4k0yaZSlVsNC0CDp/TCCvGtGc0eWEFKyUeNcqLMp5uzezYXTfEtFBY1iHWxsfyC 8GXiB/MB4omEJM150sSmXJigofThoiCAQ31aOoK5/x0mUvLD2/m5VaIPgAW/RhyPfunK ZnecpSOAi0hs31zO9Px7Vzv4wU4UrnHnojdTeUnHSgQ+qLhBj/RHsaNdCjIQnFjS3nd6 MD7vtcZJlx9qdAq5HE2SdW5XnutO++9QiXEr8LStrICdErjK6gUGK5VNu2/QVYIOcczV O9Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701090060; x=1701694860; 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=7/ApHZZokfYNAhQkIrUJHXefSMXsGfI8Z1dkA9PV0nk=; b=UxTfEjxijRFEuNtLax6lpsfrDp1A5D+PtYf+A1B4LIG2Ln+o3wfBsKs2CaBm38BrWz /HrHj2K5/B8PyiCTyPFE/bKlduJyYkzEp6JULm3YwWfJS+pifGyWd0+JEYOyxkWGk8an weQHofwHfoegVP0MUIPoMKa2Zg1JtnfEaEjohy58TclKIkr6YrnGsksc14RGWLzsNTfU 03TTR7a6FiMEgJvhdi7yr71+YxM5tdEQ9lww+m9rvcVM0y0wetddtNA0Hi4F0R9QeHjo lYQCtIVAi2GhoVGAgOvCc5srBPbq7bBGzUDIqsSCdYHXktJ657GdTAwqwZ/mTpAWsNqk 8gmw== X-Gm-Message-State: AOJu0YylLy58bFxZBPOpu3COjyXJF1kTONX8KvQoAaT/Flb0b6vTxvuB ZASY+7EE6Nksi9ku6wPq05xg26l5Lk/zX6LF3x+mOQ== X-Received: by 2002:a05:6512:909:b0:50a:aa80:546e with SMTP id e9-20020a056512090900b0050aaa80546emr7117109lft.59.1701090060204; Mon, 27 Nov 2023 05:01:00 -0800 (PST) Received: from localhost.localdomain ([45.82.14.220]) by smtp.gmail.com with ESMTPSA id f16-20020a19ae10000000b005092b887ba2sm1482489lfc.201.2023.11.27.05.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:00:59 -0800 (PST) From: Maxim Uvarov To: u-boot@lists.denx.de Cc: pbrobinson@gmail.com, ilias.apalodimas@linaro.org, trini@konsulko.com, goldsimon@gmx.de, Maxim Uvarov Subject: [PATHv11 22/43] bcm_ns3: fix overlap define with lwip Date: Mon, 27 Nov 2023 18:57:05 +0600 Message-Id: <20231127125726.3735-23-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231127125726.3735-1-maxim.uvarov@linaro.org> References: <20231127125726.3735-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 --- 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 \