From patchwork Tue Oct 17 13:30:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116106 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4898702qgn; Tue, 17 Oct 2017 06:31:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBN+PcDU1jL78QxzZhDQ28kPLaG/REoBQFN4CPDfcrpk3hq76l5JtYntLSmxdERvPuKuUqE X-Received: by 10.80.205.155 with SMTP id p27mr14423623edi.255.1508247100436; Tue, 17 Oct 2017 06:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508247100; cv=none; d=google.com; s=arc-20160816; b=lB44kQVVXDRTrJCpZbzOtYuibJf1fhN3P56/lXTaEwcVFrke0IGXFrQW5YcUUrQB+J BEWiW/iHjy3e9otrfR63wVtwO9m6TqZ3+mJDCHYFfxUJGrrvpCZ6lSEUBMumtNFXHEdz 547RO2IM0PAuiATjQECNnBZCABqiQFKYhh9QaJCASmp7+wRyTNPo28kr74AQRDMgZFgp 8grqLOWTijwR3BLsaxVQTkmmx+4UtRqes4O001IBRsA0sG0K1YqThYchMZPTeaZ/0+RA 5nG2w6nACD32NWOD3d5sRqjBSggb2ctOtMVS5mdNHhvpzOasYnN1VoMGoPla9GknMmkM GwHw== 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=WgArozHUGaRFvbCSGFyK1AogRjqxNf10bmDhCbFOEPg=; b=GE2ZaEoLil8RyHDQFU03rCNkcLQRdii5R1W8+Px2DDDn5rPo6OPNOYr0FT83kFfFE3 F7pwLsl0AdxDlH5ds3cbN++rBkAK8NMSH1tALWM21zQZ7xPauA01vqhT5WO4SR6D3dQv y0QbnL/GMbKCjtL1wZ+WXPN2ikf94o7rfhVcaxay711AauaxXdGKDa3K08OhPtwcFyfY gyDGcdRkmT1sb4+tXkVPWjZiRyIXyinf/eSPcUJA1GNU/dnjy0EsOBwfi9hmHekJMUN3 zPnUKOXaxaPLq2rcBl8l203Sf6j6VmCWSC8pdxWpXnnOFNP8b9di7r+K74GHvipE6w0g hijg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=pPzAVSWv; 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 a6si4873546ede.278.2017.10.17.06.31.40; Tue, 17 Oct 2017 06:31:40 -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=pPzAVSWv; 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 DC303C21DDF; Tue, 17 Oct 2017 13:31:11 +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 027E2C21E33; Tue, 17 Oct 2017 13:31:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C752C21DA0; Tue, 17 Oct 2017 13:31:01 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 9643BC21DE1 for ; Tue, 17 Oct 2017 13:30:56 +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 v9HDUUVO009624; Tue, 17 Oct 2017 22:30:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v9HDUUVO009624 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508247031; bh=X9QOkN6DvRGQfq3b0SNyJ1IEvsplmsTnyuCKzYF3xRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pPzAVSWvb6z1mclNsOLZYZ5nAODpc3+bpyS7vT0avZEdwoAEL0SNIQih6dO2RopTO lVd42DVTfrO+WisG9zU1zMgAMKHfBOpCGZWbINY68hBCOpf3Bjs+HVa1jz7Kquvu/W aLqkSLCzGdbaGOdaCAVsuMyzMkLpG5xm6A46gwrkCHIzIEQ6+cOF5EU1Q0BjiVqdPv zcT8LCSNESrLL2b63/uGDL2N8BoswdLoJVxhb3I3/ulYPsvw4DKunPDN9Ul9Yhmb1E 4FSCAVk7w9r0tycmKEGLr2nQlOu6ahwtusvOownIkiOhpybsxISf8Ya0i8l0WdWUlz R44mOBOoyAgqg== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 22:30:17 +0900 Message-Id: <1508247020-28071-3-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 2/5] libfdt: change libfdt_internal.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 libfdt_internal.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 --- lib/libfdt/libfdt_internal.h | 51 +------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/lib/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h index 9a79fe8..5197c5d 100644 --- a/lib/libfdt/libfdt_internal.h +++ b/lib/libfdt/libfdt_internal.h @@ -1,50 +1 @@ -#ifndef _LIBFDT_INTERNAL_H -#define _LIBFDT_INTERNAL_H -/* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause - */ -#include - -#define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) -#define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE)) - -#define FDT_CHECK_HEADER(fdt) \ - { \ - int __err; \ - if ((__err = fdt_check_header(fdt)) != 0) \ - return __err; \ - } - -int _fdt_check_node_offset(const void *fdt, int offset); -int _fdt_check_prop_offset(const void *fdt, int offset); -const char *_fdt_find_string(const char *strtab, int tabsize, const char *s); -int _fdt_node_end_offset(void *fdt, int nodeoffset); - -static inline const void *_fdt_offset_ptr(const void *fdt, int offset) -{ - return (const char *)fdt + fdt_off_dt_struct(fdt) + offset; -} - -static inline void *_fdt_offset_ptr_w(void *fdt, int offset) -{ - return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset); -} - -static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n) -{ - const struct fdt_reserve_entry *rsv_table = - (const struct fdt_reserve_entry *) - ((const char *)fdt + fdt_off_mem_rsvmap(fdt)); - - return rsv_table + n; -} -static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n) -{ - return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n); -} - -#define FDT_SW_MAGIC (~FDT_MAGIC) - -#endif /* _LIBFDT_INTERNAL_H */ +#include "../../scripts/dtc/libfdt/libfdt_internal.h"