From patchwork Sun Jan 21 10:19:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 125268 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp631537ljf; Sun, 21 Jan 2018 02:20:39 -0800 (PST) X-Google-Smtp-Source: AH8x2241Jk+vN0YsMDHJvlZkWpE44vkBzaHdmikyg+9PVSVNJRaqRgehNpCeKv5CulteGt6CiCEd X-Received: by 10.80.140.66 with SMTP id p60mr7708727edp.272.1516530039729; Sun, 21 Jan 2018 02:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516530039; cv=none; d=google.com; s=arc-20160816; b=AT03OGNvx6q1FI/upoyPe0ME66MjKyCsj5D+IiKYxgKBXNlm5QA0y7znCrKMR7E0/Y 5ekfUWdzu3rab3BE2wfi3dSb9hD2zFZ7KkqnyC3oS7+CQT2PwUobTQITJSi/hFHPYb7j vUG/suuUxa4PURdHDARgnHvGxovz1K9Rdi5W5dYDEvtSQUi4GylUtABUXZZAh+dB/zO+ QnC8EQDeNGK80W5ygAnwU0aXGTnVa/sT7KIkHOgL5NNRNhL/wU5qRfKD9BpwSXn5vYzi TLk43cWQ8tT1pm+u9U6/gVMKyEzn/qWyBl9UD8go+4PDt3nwjqeW8UlbM4pertFoNXwM h91Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=EVj6Iig34WvwxDPJDhy6PEiVBL9ILDgvr1jY4W9r/F8=; b=S1NQXvmuANdAM5CKXkbf4NwyqVmSPgRY6L4enxRiRrGks2HLCwTi5beXJJpr68s1Hx WdqIZT/jEPKOOd6hlhpJ4r9P+87SVXOcCTxprN/JhLf3dbjj6mqlzJW0kwzzZZDwct1J EjPF1XnqmwqN35LP8W+2D89ho6jzI1qQzGz8TtJDpL7hhedQjvGPyFbAefcDbqiMMYRi Ve/btim6CCV9CbcmrkfV2qAv7HhDM1n7xDBw8lmpc0bGlIRlY4X8H7XTGnC3EYxUiWZy OsBdFzH1Sr1xijtfhPqfOpZI8udR32Wj+1VfbZ4h0eqcsTHfLL082BrsUEK4WWl+RAHd i23w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=1O68/tHs; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k49si2587788edb.160.2018.01.21.02.20.39; Sun, 21 Jan 2018 02:20:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=1O68/tHs; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 5150EC22027; Sun, 21 Jan 2018 10:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9BB66C21FCD; Sun, 21 Jan 2018 10:19:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C832FC21C29; Sun, 21 Jan 2018 10:19:56 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id BB64DC21C29 for ; Sun, 21 Jan 2018 10:19:55 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0LAJUZf005764; Sun, 21 Jan 2018 19:19:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0LAJUZf005764 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1516529972; bh=fZDQVzuK5e+9X3L5uHWH9ZjLdssI8NHsI3yFxKkzwBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1O68/tHsn5Di9AuaKYqMNLc1/8fSRm8HcVARN6qiSfIBjBjGshiOblc3hG2d8fKhW 98O9tNS8wTk10vtCM3Z47f4Ev+HELd5GCYgoExK41jwRWgBpbk6yJBXMqf7d1x86Zs shUKzwf1W8Vv8uEw66Tp5rc5AuitHibkShOumy2aIOtPFP2JZb5Q1wAQPe5GOl7L5w nkv26jsd9jMeMONcsuqa3y7pEDv8RQiN8Bq+A07oa7r3yxDt4b7NP8+tnXmK0l1i04 MxT61/kmLclJKd1xNe3w3xCAJ60eeYPJx++Q3j9spKJ2hSrFgcyWcmU1g9nuACy/lU D118lPoqIvmyw== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 21 Jan 2018 19:19:14 +0900 Message-Id: <1516529958-16441-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516529958-16441-1-git-send-email-yamada.masahiro@socionext.com> References: <1516529958-16441-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v3 2/6] libfdt: fix X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" I do not remember why, but this is apparently a file-copy mistake. The file name is libfdt.h, but its content is that of libfdt_env.h Re-import it from upstream Linux. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- Changes in v3: - Re-import from linux-next include/linux/libfdt.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index 2a663c6..90ed4eb 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -1,17 +1,8 @@ -#ifndef _LIBFDT_ENV_H -#define _LIBFDT_ENV_H +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _INCLUDE_LIBFDT_H_ +#define _INCLUDE_LIBFDT_H_ -#include +#include +#include "../../scripts/dtc/libfdt/libfdt.h" -#include - -typedef __be16 fdt16_t; -typedef __be32 fdt32_t; -typedef __be64 fdt64_t; - -#define fdt32_to_cpu(x) be32_to_cpu(x) -#define cpu_to_fdt32(x) cpu_to_be32(x) -#define fdt64_to_cpu(x) be64_to_cpu(x) -#define cpu_to_fdt64(x) cpu_to_be64(x) - -#endif /* _LIBFDT_ENV_H */ +#endif /* _INCLUDE_LIBFDT_H_ */