From patchwork Tue Jan 9 09:34:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 857333 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="mnINZc40"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zG6Sq664sz9sNV for ; Tue, 9 Jan 2018 20:35:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6A111C220D2; Tue, 9 Jan 2018 09:35:36 +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 F391BC21F98; Tue, 9 Jan 2018 09:35:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 93198C22072; 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 46A59C21C4F 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 w099YtdI013772; Tue, 9 Jan 2018 18:34:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w099YtdI013772 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515490499; bh=6Rvh8P1aud9nP6WJ/9CnOtsqdIqW1ad6WXMKTcfsUqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mnINZc40AXKqPBgWuk20O6WO+mtwUVIT9c4/Sv8DG9O7Dd21o3+ZAIPYJbJsvMhjD MehdqL2KpqcYBiiJcDO2pRX9kxFwqeE9qtNycIzKmCcMyFGs0D/rklOlbwwqHbIJJ/ C8K6tpkS0hELhcKmkz5uiMHMzEEVnYVIF4/JIRDN3pDi9JSRR0NsUeXwx0tXvwuw4t 4FrFhwQZf45nnk67l0vdWJrwml+1AkQNgHXQn+7TCtRNdWpvB3gIWPgIDXg2LRhUtN 91MdFXFhZwKSAA/WJXOL08CagsS2ZwQrWUkzc/paZ5Jft49RGRhHpMi7rHo5Dhy93W jWS/jUy2TSKWQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 Jan 2018 18:34:50 +0900 Message-Id: <1515490492-29434-5-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 5/7] libfdt: move working_fdt and FDT_RAMDISK_OVERHEAD to include/libfdt.h 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" libfdt_env.h exists to contain system-dependent defines: - typedef of fdt*_t - fdt*_to_cpu(), cpu_to_fdt* working_fdt and FDT_RAMDISK_OVERHEAD are unrelated to the environment, so they must get out of this header. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- include/libfdt.h | 5 +++++ include/libfdt_env.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libfdt.h b/include/libfdt.h index 4e2c841..59da5bc 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -2150,4 +2150,9 @@ int fdt_add_alias_regions(const void *fdt, struct fdt_region *region, int count, int max_regions, struct fdt_region_state *info); #endif /* SWIG */ +extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ + +/* adding a ramdisk needs 0x44 bytes in version 2008.10 */ +#define FDT_RAMDISK_OVERHEAD 0x80 + #endif /* _LIBFDT_H */ diff --git a/include/libfdt_env.h b/include/libfdt_env.h index 273b5d3..ea26979 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -12,8 +12,6 @@ #include "compiler.h" #include "linux/types.h" -extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ - typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; @@ -23,7 +21,4 @@ typedef __be64 fdt64_t; #define fdt64_to_cpu(x) be64_to_cpu(x) #define cpu_to_fdt64(x) cpu_to_be64(x) -/* adding a ramdisk needs 0x44 bytes in version 2008.10 */ -#define FDT_RAMDISK_OVERHEAD 0x80 - #endif /* _LIBFDT_ENV_H */