From patchwork Tue Oct 17 13:30:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116108 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4899770qgn; Tue, 17 Oct 2017 06:32:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDoJ7s1XQ/QUxPaxxjqxyLy2XMglxJ16We1b5o0dQvRcu799mziSGuiZIiyJsNhgInmVkC2 X-Received: by 10.80.240.72 with SMTP id u8mr17311463edl.5.1508247154782; Tue, 17 Oct 2017 06:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508247154; cv=none; d=google.com; s=arc-20160816; b=ozv4BN9LpkxI7EAmnuLpgXLeOs5yN98Tfvt9RjStMvbjyQLpSIzLHI9AftvHhOPF9o YciUy8UZ9Jqm+tOCMnI92WSr3iaOQjsWrkppEXSXHhrzbjT7i9BP/vzSDjJ3XBEP/0Le 2pRdT17COgaJxNIRD12oRGq0dMpfxwcsMb756l2UdbANfvcVt4+FNzTI1MFVaPqoXaCE 5uN7epzVJt40pEBlifmZPRtpk4X5h3HYpI/lqsTImQREaZfnRuxvWQw7jnRIsGmgM6Tf GvkQe1NP/IszC0hM1VuymxhwuQkZVK+sqo/22HzBnDMxUohrjL5rpkEhZPSEbifvonnB POnQ== 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=+y7Lv4MnAjuOdg5+YKg/OCZ0Drj56L7aCcPOGN6fMQA=; b=SPjAWyBVGOuoxUrZR8ffZ/+TwlBlhqTUhdPq7Oce0aQlAXi699XguuhwBYzz8sb6vu 1p9mGHvbXAeVETNW8eKhxsdhv57pra2cDd9lNuJ0lm777FIJgaCLc9lLfSwLtA9OwUIM +qqHIit/nIxRASKo2+af2uPiYPaEiQOVtyjs7WSNqIBdy3jo+0z7hVT0xNUJ6HDMym26 nqS60AM4HyGbmXsE7NXCUe6Rss1QA0MnlEu2yclzk83is6p4RMR/SHqlE/GZnCbY7Zqz Z17WJn2IOA7CwOh69fXquG+VPTy7hYSxPjjxF7COdGG2dodjh+vuiySnuq8V3ZHIVEFY 8jCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=S1liucjr; 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 j24si256134edh.441.2017.10.17.06.32.33; Tue, 17 Oct 2017 06:32:34 -0700 (PDT) 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=S1liucjr; 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 8BFF1C21E45; Tue, 17 Oct 2017 13:31:30 +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 0212DC21D80; Tue, 17 Oct 2017 13:31:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2697CC21D19; Tue, 17 Oct 2017 13:30:59 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id A9A08C21DF3 for ; Tue, 17 Oct 2017 13:30:55 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-10.nifty.com with ESMTP id v9HDUUVN009624; Tue, 17 Oct 2017 22:30:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v9HDUUVN009624 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508247031; bh=KySWCey4rPXpwM8wAgnbyze+KEiuFXVywq0PNtsqtmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S1liucjrULdOrMwx1nx3Prj1LAgLdOxinS1rr3G4/Yi7jg+pSDXQnMPRMznLhM/T+ 94BVANTzZNNXoCX2rZftmJg5chnBloteyq65DoxUmJcipA/zK8HqVstWtEII0jKG89 JzCiH4WR/d+vTozCzY57ygEI2w7wYL4lBvIKQokcfWakvRiMhT/ahKnrqZ4MT0D3WF UM+Ogm3e+5C+7ffbVxahZwyUGZz3ldUny6DYpFLMEEHwjtX+2trVfyfPxcLxcPCV8D tKekeTaC7qsEAtw2HFZZ4dLm53HE1IxaXDxRq0P3rsKcfLl5gWvttsVB3etPad6xKE N/iYrII+5EwJA== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 22:30:16 +0900 Message-Id: <1508247020-28071-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508247020-28071-1-git-send-email-yamada.masahiro@socionext.com> References: <1508247020-28071-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 1/5] libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/* 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" Fortunately, U-Boot did not modify fdt.h locally. Change it to a wrapper of scripts/dtc/libfdt/fdt.h, which will be periodically synced with the upstream DTC (or kernel). Signed-off-by: Masahiro Yamada --- include/fdt.h | 2 +- lib/libfdt/fdt.h | 67 -------------------------------------------------------- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 lib/libfdt/fdt.h diff --git a/include/fdt.h b/include/fdt.h index 7ead62e..caeadbf 100644 --- a/include/fdt.h +++ b/include/fdt.h @@ -1 +1 @@ -#include <../lib/libfdt/fdt.h> +#include <../scripts/dtc/libfdt/fdt.h> diff --git a/lib/libfdt/fdt.h b/lib/libfdt/fdt.h deleted file mode 100644 index 3134d78..0000000 --- a/lib/libfdt/fdt.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef _FDT_H -#define _FDT_H -/* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. - * Copyright 2012 Kim Phillips, Freescale Semiconductor. - * - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause - */ - -#ifndef __ASSEMBLY__ - -struct fdt_header { - fdt32_t magic; /* magic word FDT_MAGIC */ - fdt32_t totalsize; /* total size of DT block */ - fdt32_t off_dt_struct; /* offset to structure */ - fdt32_t off_dt_strings; /* offset to strings */ - fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ - fdt32_t version; /* format version */ - fdt32_t last_comp_version; /* last compatible version */ - - /* version 2 fields below */ - fdt32_t boot_cpuid_phys; /* Which physical CPU id we're - booting on */ - /* version 3 fields below */ - fdt32_t size_dt_strings; /* size of the strings block */ - - /* version 17 fields below */ - fdt32_t size_dt_struct; /* size of the structure block */ -}; - -struct fdt_reserve_entry { - fdt64_t address; - fdt64_t size; -}; - -struct fdt_node_header { - fdt32_t tag; - char name[0]; -}; - -struct fdt_property { - fdt32_t tag; - fdt32_t len; - fdt32_t nameoff; - char data[0]; -}; - -#endif /* !__ASSEMBLY */ - -#define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ -#define FDT_TAGSIZE sizeof(fdt32_t) - -#define FDT_BEGIN_NODE 0x1 /* Start node: full name */ -#define FDT_END_NODE 0x2 /* End node */ -#define FDT_PROP 0x3 /* Property: name off, - size, content */ -#define FDT_NOP 0x4 /* nop */ -#define FDT_END 0x9 - -#define FDT_V1_SIZE (7*sizeof(fdt32_t)) -#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(fdt32_t)) -#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(fdt32_t)) -#define FDT_V16_SIZE FDT_V3_SIZE -#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) - -#endif /* _FDT_H */