From patchwork Sat Jan 6 15:39:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 856393 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="sOKEIcJh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zDQhs6sPQz9s75 for ; Sun, 7 Jan 2018 02:40:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8BC62C21EE6; Sat, 6 Jan 2018 15:40:09 +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 B9B97C21C41; Sat, 6 Jan 2018 15:40:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9023BC21C41; Sat, 6 Jan 2018 15:40:04 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 861D4C21C39 for ; Sat, 6 Jan 2018 15:40:03 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-09.nifty.com with ESMTP id w06FdpZa008486; Sun, 7 Jan 2018 00:39:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w06FdpZa008486 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515253192; bh=H8A6KbLbjZ1gbYYoYhu91fy8vXkyjZ6JVoO33Zzvr/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sOKEIcJhI27K9tBIdOeOHU8+DkBYTQXFhIDYNjztIIca0lRlhRAKT3BEc0GL5wOCY G4AGRLPmfU8QaCBFLvACUA848pIKivTEtdoBRZlgXtLs39JppmgHyvRJbeoF7aFM+B jjmkplLXJo3eK+NCmpw4NfLoEvXAGqYAgRsCiPteKG8tI7xqqK620gbwWcDVUptg9u YJMlb1mBrADMr5YLq8I2SO0fBtXBE1iTnf7wwQqtR7d6kvdB6TOUTxFp1pTSbCHg16 y1bwpkLVtzTJQDpERbeh6j/bhy1zmm/IVyxq9UdUXJJl5Bo8huPz7diwEe24B1yv6D 5CG23HoH8QjRQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 7 Jan 2018 00:39:41 +0900 Message-Id: <1515253181-8190-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515253181-8190-1-git-send-email-yamada.masahiro@socionext.com> References: <1515253181-8190-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 2/2] 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 copy-paste mistake. The file name is libfdt.h, but its content is that of libfdt_env.h Sync it with upstream Linux. Signed-off-by: Masahiro Yamada --- 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_ */