From patchwork Mon Nov 27 12:57:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 747557 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp3135994wru; Mon, 27 Nov 2023 05:05:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IHwNed7Tumt/DdG6368syLwDswbAKYbQ4LfDqDXbYluq/9OIVsIA2DCW93Xes7JleqQ7930 X-Received: by 2002:a05:600c:4ed0:b0:40a:4436:e037 with SMTP id g16-20020a05600c4ed000b0040a4436e037mr8499546wmq.35.1701090324662; Mon, 27 Nov 2023 05:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701090324; cv=none; d=google.com; s=arc-20160816; b=f3ECTEl+lQtQQJFcDliMGX3BL/QRRCGSMjL6oL7C2uz4+4TympVg3CTAhWrVZFz5aA aXk3i/9QabtmPHZ83Fhetv5BhwyqjirWiQm1u4HUMoEe/FgoHdkAUtfiXNILK5pgTaKV a5VZfVhB2dHJHsABS6R43ekur4JPvgk4SN7Uh88vj3asa+2pZd2/Ufv9s1F1Rc8PZhzx 4m9emmvdVOx7vylL98haYxtRgq1TgboUWKsw6Sj4Egcktk8n2aM2uNa4gQzHZRn79AfY 0zFdCUT0rZMOgbffkzIif+Fwuy7AmCtvcpDEM56xSe2DHej9p3+/Jsuz7/aE10ydKQcg DcOA== 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=QyNHqymfSLfpkarWtc7IKVRHBXLRqHmsXw8S5qDkAYI=; b=m/3yvDe1I/eK+tMCSYc0UIRdtVY4J+/Fv6KfJzIJ3RyYAcOa6qTpURzeEI/AHq8FWa aSANg95dF19OXYCIW7DsNDOPBw2Po0dX65+G0axvRLxk5EeEO62wRuOuN61+HiSNUGxm bEY49MztSSvY6IbxPHG64TnGDwF6FjT8eBis6uUMEx1AeL+OHu3RNrtTLlW39sifMWDE +d/3QIaBfPWdYi10rtRfLcROrNSIZBO4LYktQXK8cSKjaUlZ2SiQ0JYiJKaZmLpGKqqy JYnXeYpOg3Fqdo23KDDjXBUa7/Tj1v/I6ICS5pUP6dPbjvv/4lkrwgAxD82AHl0DEZRX Ac8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=joBekW7w; 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 t21-20020a05600c2ad500b0040a46a61658si5743459wme.214.2023.11.27.05.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:05:24 -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=joBekW7w; 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 341F58770A; Mon, 27 Nov 2023 14:01:03 +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="joBekW7w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F1B93876D7; Mon, 27 Nov 2023 14:01:00 +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-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) (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 EC4E087634 for ; Mon, 27 Nov 2023 14:00:58 +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-x135.google.com with SMTP id 2adb3069b0e04-50970c2115eso5645873e87.1 for ; Mon, 27 Nov 2023 05:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701090058; x=1701694858; 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=joBekW7wre4X2ODfdVkmVK88Qob7OLfRImlmLvoleDMhvElX2eBIPKsCxqJDwNvhM3 FxMLSOT+3H8Nqt56BF5e4NWJwFqF6HCyRDMF3lWHKIz8bf95Zexi9s8dBcqTtN83QIHd cVtJX7UWlU5FB3BxARd7VgZiyag7wE4rQ0O8n5Zjm5I8ZtVN5blO1Bg3QYTyfjo7icQD OY1Ihe68BRMRDu1nTwI9Y96PRXItcRUdHDKcsnqmcyOcEAZzx6MX74ZWOwHQ5FNSAwuu iszoiJ32CttfXdcu2gsMm5ITk5Epz6A8+07zzGzS9Wqv5Pwcnm3OjAd+gUP8wnceuQyS sOug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701090058; x=1701694858; 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=nDhA/4Eq7Z8rtl1cUGzbIympSIZs1hJVeirc/2/tvEycAcrh9j30TBDFoE0FgpNygc l+GAeoiAbW1JNMODYU2SlzigvgQ7ToKS49PcQXDZi7ru9ntZfSZ674yAUYn5r5fn9JnK keGXxNf92rn97kRkqzXAhJiQya1cvh+VkjaEg3+CgKD+FSeQpXSh7apHGp4dW2rFH1u6 LUlKHwLO5Qbt7cK/XOTMZXs+wkd7dQB92dm+eh9gj7joMlpaRHqagssBlkcJ7Xt2FYu2 T/G6zqn+tuoxW0X4xPfUDNL8MBX71d+D5PXzcQsYsziBWRJcsgM3G2ppNkz25/5fw+hF z+Eg== X-Gm-Message-State: AOJu0YwoiD5aBwvgxZ3wA1g5kMLG60q/UvqVjEFH4hKTgW9ZwsT8T7V+ ZnomAimzRPJ/BcOmrrkOhicZgoMNYOvSR2+vO8g3Dw== X-Received: by 2002:a05:6512:923:b0:50a:71e1:e1c9 with SMTP id f3-20020a056512092300b0050a71e1e1c9mr5745992lft.42.1701090057984; Mon, 27 Nov 2023 05:00:57 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:00:57 -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 21/43] mach-socfpga: do not overlap defines with lwip Date: Mon, 27 Nov 2023 18:57:04 +0600 Message-Id: <20231127125726.3735-22-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 Fix compilation issue with overlapping lwip and march defines. Signed-off-by: Maxim Uvarov --- 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) {