From patchwork Mon Dec 25 15:39:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 758224 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp2710102wrw; Mon, 25 Dec 2023 07:42:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFlhcJWqqJDp957JfjW+T/2SxPijYYnZ+Zl/TQUDSr61c8zBcI3M7oO2RfxSk1oIZhgdBb3 X-Received: by 2002:a05:600c:4593:b0:40c:2734:13cd with SMTP id r19-20020a05600c459300b0040c273413cdmr2281607wmo.43.1703518968931; Mon, 25 Dec 2023 07:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703518968; cv=none; d=google.com; s=arc-20160816; b=Qu5TmLfjPF6wVRQYGurdhBiqBKkdCL9K34zbO8qktxoxI+rj5mTJu3UgbdjfffDn/H trtDzmY7I+ZUpZibac0n1TnzeOUF2egFAo+0xhN2Vwix0cRqTFL7422Wc7eq2egDMtlh 5MEpnRQPjfFYnIoQiF9eaKheqYJjbXmcMmDy1dki17R3+qtpqqiXPTDTj4Jlxnjx5qrH KEHUldsj3n7sYTqAirjeFH5ZVzhH8agtAGl5NQvI2j4Ylrx+QTxIQmzdR0volJ9v9wS5 +rkW6DKdsH4eJ26ITeTSC3RhzuG8pcMPoX89PI7Svd7rG8Tz0FuBFX3VAQTbVJOx/yqh 8+jw== 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=MxFJwKL5zDs8b5aiVb6q3SDjOsJLBc/cfLiOxsIC9AE=; fh=al8TO5kxNSCLdK6Wct4/S1Ky9QCKGaknFfrx/Rr/20U=; b=jd/IjW4emvfJMdffIZB3MZqmhQDD5pRp9eRrR200Ti+6HJ+FYj1/hvS2urg33bW61f 9kgE+JhKNxwgC8edB3mDPVALemoIiaFOGKnSYmGB2DBL1xkrhKv1gf9rd+OnuxeERRrf f2ft7IAOlIpyu+ycVhgd2mvek8qKbfgcjDa5EA+8j3Q2S9/ZuWW9H7D/yl0uiha7Hr0b /dfWBQ040JSgeUgqD9pgbvikZre8TpLXBfC6nTQJDPoj75SpaHli7FP9JSMAfK33mCic X0PD/epHPt92XouizAfWGcyxTaCsMXvnPw7kLf4KYN6WYDs1+97j9ZTBZIkXOzMpAr3l +KLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fTWi75a/"; 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 e40-20020a05600c4ba800b0040d2da55815si6843080wmp.26.2023.12.25.07.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:42:48 -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="fTWi75a/"; 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 7C37987808; Mon, 25 Dec 2023 16:42:11 +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="fTWi75a/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 021678780F; Mon, 25 Dec 2023 16:42:10 +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-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (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 F004D8744F for ; Mon, 25 Dec 2023 16:42:07 +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-x233.google.com with SMTP id 38308e7fff4ca-2ccb923c4d2so11322711fa.1 for ; Mon, 25 Dec 2023 07:42:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703518926; x=1704123726; 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=MxFJwKL5zDs8b5aiVb6q3SDjOsJLBc/cfLiOxsIC9AE=; b=fTWi75a/dZ5pOlid97zusdR7OQemOXJvph9PjjcbNFAAfgZ2OnPunWnw7WFf1/sihd nTomjFcIcLfR2okjrsox1Foyky9+dXZ3CvtbjvnBcn643xQOuFMeXGccbv4c5po5n4vC l3SiXR/gvLLVR/NF9nCCBGhpK3/yQcDOPwhKYWpupbQzW0pDSbGRAKbV31/PyNcCZoSA HIbHA7UPGl7/wdq8a1meUVTeBrC/iEO5Wsymo1ZSQCeXAM9HVlj09+IP9oXu0AhpzXWM uTZBDTIAlKMe1wQca1t7DxW2secM2hrkuxsd6qBEgt4rZRd4OUJmRxbT+8+tdHqkVRDM E1DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703518926; x=1704123726; 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=MxFJwKL5zDs8b5aiVb6q3SDjOsJLBc/cfLiOxsIC9AE=; b=cuzJZGAQS8dcbW/UbSTUzNri+hFWNEwqrLZhJXnwedSr6wflZTVl+j26tZY8ADbyjD ZppRgA1HQJOMUp1zdFSX8TqUJ6SRBDyCWbXSt9GXS9x6gp9mb5If6Fg+UwQAdANFRAgG 6xw1KOor1r/Ci8DOaHsrQvQChrFBBBDGB22Co2fp0/fRg+U9doCrugERpU33WwbVT4rE jZkgEgvg1XsFemaOv0JeWyeaIOvlKMUL4hUdYVJDIjqUsU5pUTDUZKmW5P83xyJEsAhi m9gVk27HpPkQg4L6M6S9lqH/j68yGDRkzR1gRMvUVxaWl2Z64On3PXMvi4KZPSnzITCo xp4A== X-Gm-Message-State: AOJu0YyZhEPXpgGM/V+Bg5QsYNmzdl5EJeQavBSWdjnGlQNELFu3Yypl LTM2++Cm4Zq/HRIplDnI+y/I6NOrqg/g5KA8DCbe7PBYkVM= X-Received: by 2002:a05:651c:227:b0:2cc:8b49:6dbb with SMTP id z7-20020a05651c022700b002cc8b496dbbmr1439501ljn.62.1703518926692; Mon, 25 Dec 2023 07:42:06 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:42:06 -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: [PATHv2 6/9] mach-socfpga: do not overlap defines with lwip Date: Mon, 25 Dec 2023 21:39:26 +0600 Message-Id: <20231225153929.8284-7-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 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) {