From patchwork Tue Dec 26 15:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 758381 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp3131789wrw; Tue, 26 Dec 2023 07:49:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWACSk6bqQTMdhBFqSC53htvO3CY7owxjdEuTe8XAY6fC2tMoZs1ZgJCElFoLIXVI8Mo5k X-Received: by 2002:a05:600c:1e8e:b0:40d:5c9a:d652 with SMTP id be14-20020a05600c1e8e00b0040d5c9ad652mr113661wmb.3.1703605771048; Tue, 26 Dec 2023 07:49:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703605771; cv=none; d=google.com; s=arc-20160816; b=QUvTaEqCvmGAqVXUOeEItY1OQcXNiatTaFEtvc99NBSgzsMbwdOMP4O63PIZrTCNKC xIGI/xeK+zwIQQqqsFREKc3HABzKcvC9+KznoMCr47lp/QCzzS6eUueGGFNoyEDpCusI NO2O6zmi0HyA8946nzqW2JiJ7l0geEdSXvYlmaywg51OFGLROEbaDyEpwXRymW6ZBtvW B99ZboQu3QwsuWAOZTa4DYYw4QYHLYcA3zbqXU/jz0dixWkASNsPgowSjIVXIRjiXk+O GEYvV5YG30jifkx5IVj8F39AHafTWG+9AMrVlSYvCNteRPkWlqVLzOAsDLO7s55BDpEO GZIw== 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=TzhVvu4KOX9lb9FC/p/xGfIliODPGAPJO6VrkmdDfSU=; fh=al8TO5kxNSCLdK6Wct4/S1Ky9QCKGaknFfrx/Rr/20U=; b=TotwknQYEBHkWSd3I7enIoThnP8LDINz5Fon5Z5l2iv8mfdQZspwbyHv6kCyvAs3uE OqnmoktQ/dIM5PCOwEWHvwo19twooLcEDHw4GGOpL0RdYKSFBEbUZlK7NUxiWfir9bUV rPafj1xaJhqwu0WZtZ6og2uMnJsvFkgcka8sse9a4SOzHsU+qFC7JM5NbSu/hX1iArbF 5pMgqe1cc+Q3n28SewhZSHghPun4TsdZFwPGFmWv++1htJ2B18Jvy363p6H9yjlMOofm yAYoENRgGqzRi2noLXMxxkGct0n+c/gdXWcwYPYpmBKjuniMPj0Pwhfgo/3iHN1ZT16k H+2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HKiOmC91; 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 c5-20020a05600c0a4500b0040c6334acb6si6204771wmq.196.2023.12.26.07.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 07:49:31 -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=HKiOmC91; 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 ABB6E878FC; Tue, 26 Dec 2023 16:48:54 +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="HKiOmC91"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8E6AD86F56; Tue, 26 Dec 2023 16:48:53 +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-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 7FC1C86F87 for ; Tue, 26 Dec 2023 16:48:51 +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-50e49a0b5caso4846504e87.0 for ; Tue, 26 Dec 2023 07:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703605730; x=1704210530; 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=TzhVvu4KOX9lb9FC/p/xGfIliODPGAPJO6VrkmdDfSU=; b=HKiOmC917rwYw/hzb0/cR4H1/c3lZ/kBOfCBGCeJrCidPFNp/PJJzYtUuiytBIzhfU pbkpmM+yr0t1DKBi+Z6LqoFjxYCewyOAxXbHH8JDbSyXqfa3AUXV9jdxTxLDuVfLG0g7 yr0oYbJp04ciwpSpMPxid2RdCrFCQa4uOMhHo5IIGQC0MpViOIcyvzGEDr9IPJwL0c3w r1lxtzIfC6GkJEOf3BJBIGRO/gbnUUwtAEhsu1l+CW6XmU/kBQiHzfdLjH0b215PZWZz hJeZ8vGs6Hn2LTtNAkROj6iEhuFrEZnLT8q/6fK8CZoaECOd9Li5mqMFOcXWgYPIQL1O Z5kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703605730; x=1704210530; 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=TzhVvu4KOX9lb9FC/p/xGfIliODPGAPJO6VrkmdDfSU=; b=B79N1/DBnoFaocz/LiOPKi6OxNvu046Co2lwJ/awFespa8VrfNQNXBowBOhfCs0Mv/ q5rpS/tlRCemT1Qxbc9+roVOqM/m8EhQuxMwkSjGhqkCfeS4uAAcePBT8TOp/5osZB3i 7+5FRPD7mqfDn9QhqiJjtOdu92jx+NpDwzenphnpxcrR8M2Owr3o2Xk0UzeFGBW0KOMT QFVpFwM7DYjBLIQf63O5k4ZdNhRCvRpNQgtnnXGUu5BadAY29Fv6dVUlu0tFwzDyqv8+ L8P+kbeTAUyjh9M0216jXyXd0FxHqfu04/DbFuUU1RFhxMJkSDXO94Y85Q6+8Ln9+MlY s5eQ== X-Gm-Message-State: AOJu0Yzt4FFVp4BR0Na7mtvfwr9RNK0t+VUEfEdl/Bz+HWp6a9TU2fUr EMDjfwQ8bYmbJ9Nbzf0AZpi7Xen73V7DM9Qhejmp8SuGhOE= X-Received: by 2002:a05:6512:1114:b0:50e:84a5:f794 with SMTP id l20-20020a056512111400b0050e84a5f794mr89589lfg.94.1703605730593; Tue, 26 Dec 2023 07:48:50 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 07:48:50 -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: [PATHv3 5/8] mach-socfpga: do not overlap defines with lwip Date: Tue, 26 Dec 2023 21:46:16 +0600 Message-Id: <20231226154619.5071-6-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 Fix compilation issue with overlapping lwip and march defines. Signed-off-by: Maxim Uvarov Reviewed-by: Simon Glass --- arch/arm/mach-socfpga/include/mach/handoff_soc64.h | 6 ------ arch/arm/mach-socfpga/wrap_handoff_soc64.c | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/handoff_soc64.h b/arch/arm/mach-socfpga/include/mach/handoff_soc64.h index 902fc6bfb5..9b85e5865b 100644 --- a/arch/arm/mach-socfpga/include/mach/handoff_soc64.h +++ b/arch/arm/mach-socfpga/include/mach/handoff_soc64.h @@ -78,12 +78,6 @@ #ifndef __ASSEMBLY__ #include -enum endianness { - LITTLE_ENDIAN = 0, - BIG_ENDIAN, - UNKNOWN_ENDIANNESS -}; - int socfpga_get_handoff_size(void *handoff_address); int socfpga_handoff_read(void *handoff_address, void *table, u32 table_len); #endif diff --git a/arch/arm/mach-socfpga/wrap_handoff_soc64.c b/arch/arm/mach-socfpga/wrap_handoff_soc64.c index e7cb5ea89c..df0701ec85 100644 --- a/arch/arm/mach-socfpga/wrap_handoff_soc64.c +++ b/arch/arm/mach-socfpga/wrap_handoff_soc64.c @@ -10,6 +10,15 @@ #include #include "log.h" +#ifndef __ASSEMBLY__ +#include +enum endianness { + LITTLE_ENDIAN = 0, + BIG_ENDIAN, + UNKNOWN_ENDIANNESS +}; +#endif + static enum endianness check_endianness(u32 handoff) { switch (handoff) {