From patchwork Tue Jan 9 09:34:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 857334 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="ZPfktLlX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zG6Td5nySz9s75 for ; Tue, 9 Jan 2018 20:36:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 67133C21F98; Tue, 9 Jan 2018 09:35:56 +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=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 B8166C220A9; Tue, 9 Jan 2018 09:35:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AB433C21C4F; Tue, 9 Jan 2018 09:35:31 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 536FDC21F98 for ; Tue, 9 Jan 2018 09:35:30 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w099YtdF013772; Tue, 9 Jan 2018 18:34:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w099YtdF013772 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515490496; bh=B0gFjm+ifP0ya74hnAIlmKFdbGtcvhXTIDGzAHMetvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZPfktLlXH81x8S7eabzxYv3rXsQvXlgFLpb9OelA5ys4CzFkEMHqvajgkqHTDLtSv 6u6QqH++tjwKRh5VM7Z8DiIAr8kyGaJz6CRmMzo2Ksi5OQ8Ry6NY2gpXhavVn6qUGT 0W00mskSrIML42ZuFm98NBGcQeW4EB1AUdWiD8f5nxqXj71OTSgS4R2k6T2uzA+yZ+ 2fo74LQY66oAxpDASHdofwjO0K7SlovuJNQfFDxm0knA5W2jR9P/QxNvceKBIuKgqK gmRomlVZhnS4tSF7ScDbZJGNj1yMT+45k9BZkhaWWnN+wHh70qCj+KV48hAaeWvmvi 1KTGt3+2gDV1A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 Jan 2018 18:34:47 +0900 Message-Id: <1515490492-29434-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515490492-29434-1-git-send-email-yamada.masahiro@socionext.com> References: <1515490492-29434-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 2/7] 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 --- include/linux/libfdt.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index 2a663c6..27ba06e 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -1,17 +1,9 @@ -#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/fdt.h" +#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_ */