From patchwork Wed Mar 21 09:03:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132195 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1889261ljb; Wed, 21 Mar 2018 02:06:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELulPX/NhyANXiTjfK7R/mm4khChD9U3ZyHR9OI3A0NXizaBVxSILvBWGAkVUFLfThvwnv/V X-Received: by 10.80.183.175 with SMTP id h44mr20922248ede.287.1521623167816; Wed, 21 Mar 2018 02:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521623167; cv=none; d=google.com; s=arc-20160816; b=G6uUrF+0Bk0SvJlb+zz+BEO4Ep66JcvT8yvaqrxnumdjKCyMobwynfb+EpbF6jfz9z JO0L24UfRQveW7yDNSvUAn3grAxUf8cdwjJekdtluGP9LNYfxZzcAFze0jmOEXL3g4Kv kj0RMfJ6sXOC6fy7OVtcpEMACRNs302bYmAlJNJMRhf3LZTbRGAqk6yaxKQvpui178Gm bzMPsD5SllNywJPiQ/nltloO1x6pQtOiQzpQfpWlr27Vrcp+bzTSCckZFNOVT8yqsWkI BLWHzkR3rKl1bep5hMuzhG2jqLUWQtWS34yueeZbDT1TQbPHS1FtstGJH4nGK2Tuvlkw PCzA== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=4SKseIgLUhyMePzw+xMktyvJ6AV58USV6vLgirxunlI=; b=TxURETGsDygs3MiSkrwW5P5pnh7zJy8RWn8mXj0KnQ/Q+kd73/qUMJ74CARK75ZUab x09lz8BbmP8ViQ4tc8jmAcWx2SvpnIMa/P0bhzrGx3GFs3ssDAJu6QBEgU471zrca3SL yGusoKcl9qGE06LbL5Ot/PpVEFhf8c5zBTfkOU8tgd+9RBvGcD3crNR5xdp4OdvLIpfy kmtAx9UV1d9HSeu20nX/1Y8apEXLSGEnjYfzVvbX8P4gOYBzc0FGiQu4CkMaVNoMnRUY UN0Xlzh3CjkvyPjj6d5RH/GqL4tY/OvEkyeIH8zq3Qn6ee4uNZttubXoudQojnBraJfq UJYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=BhXzLcGO; 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 t16si645849edt.510.2018.03.21.02.06.07; Wed, 21 Mar 2018 02:06:07 -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=BhXzLcGO; 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 616B6C21DB5; Wed, 21 Mar 2018 09:04:57 +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 62246C21DED; Wed, 21 Mar 2018 09:04:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0769FC21C29; Wed, 21 Mar 2018 09:04:15 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 565B2C21E42 for ; Wed, 21 Mar 2018 09:04:14 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2L93irH027481; Wed, 21 Mar 2018 18:03:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2L93irH027481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521623025; bh=bIudK+wkH48e2hQ7tRjUKQin9J6pEbi17j4fZSCL8SM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BhXzLcGOb963f6pIqYdTlcdz4nhddndtxn/Bnt+IUSp6HVup71ePgfRWfzCH5id1e +lVYYbrgYp37wrbboBlMpSQdVvJq4RCfhEuXkrcKpAHibrf38KlvykXh20ZQKk6BsU IuR/senbvrT1D7dUWXE9YHS+9gBmXWt0LSbNJ/pkCpe04zA80z3p05bWzVaMeRG07q chjlQcHs6C6FP1ZbXetC8qPgeNMaNZgnCs47h5wFBH8zSwY3MR/TFzsJnXIAl6vfq0 p0gzye/kRBEa0247DuPVVMt+IunC1MEsRNDYb7uK6eE7Rl6HN7Xb6lCrYu0x0Aal6k EMTrzCUsiQZTw== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 21 Mar 2018 18:03:33 +0900 Message-Id: <1521623017-29312-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> References: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 1/5] libfdt: move FDT_RAMDISK_OVERHEAD to image-fdt.c 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" This macro is locally referenced in common/image-fdt.c Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- common/image-fdt.c | 3 +++ include/linux/libfdt.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 25103ba..3dc02a1 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -21,6 +21,9 @@ #define CONFIG_SYS_FDT_PAD 0x3000 #endif +/* adding a ramdisk needs 0x44 bytes in version 2008.10 */ +#define FDT_RAMDISK_OVERHEAD 0x80 + DECLARE_GLOBAL_DATA_PTR; static void fdt_error(const char *msg) diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index 9e6eead..eeb2344 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -309,7 +309,4 @@ int fdt_add_alias_regions(const void *fdt, struct fdt_region *region, int count, 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 /* _INCLUDE_LIBFDT_H_ */ From patchwork Wed Mar 21 09:03:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132199 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1890512ljb; Wed, 21 Mar 2018 02:07:32 -0700 (PDT) X-Google-Smtp-Source: AG47ELtyih9fWsvATc9qWqA9TIBFlvmNGwYC3OU3IIMRY6jocS/wZ2gyQFHyfeL6w4j0cte3L42r X-Received: by 10.80.179.236 with SMTP id t41mr21047763edd.40.1521623252420; Wed, 21 Mar 2018 02:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521623252; cv=none; d=google.com; s=arc-20160816; b=yPZm+AFmqsZRZzOJ4v8BYCUQq3jmjVJujSDhSMX+FscSQ4eeTFpFAUJPa3ca9Y38av /unOJXVMkrD+XX35S7/dYCcFRyPcJSL5Y78hQtY7UEFH6kaL9HJ6cNz2hZYpjeADo1Kb 14x3kVfCRwBtp7x7c4BrAvwFiIncLOTE4h1Ik6WgHMY2xv0viV6T/QF8sFA/bptXMPA0 TOuTS6pObSIneyxyyqGZ0OqC65jIvHPE9VUFabdMJryiA4clLTmmf6oB5ZnQuXtaAfOH 0QhpPfH4ith7wOqAH6ZI/Dpe1RCwwwfYcrkSpBjXivpb5GOGsThzGJdUSbzZsdemmXq5 iZiw== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=NT/4AtFZJjTjWRAIel9WDupPAscBkN/vSZLgL6gOCMo=; b=BhGe8Xre8QXUZlgrfQ1MnSByGrjNTSAOwdsT6jd/MeJGCrxV3KDT0zY4BCRP7P1IfF X5K4T/Ii27PpC+RtAO5HDqWk1uk+x9NRXhlgczULBrM2RyHkSCk8uGyj5plDGeDTuGiH lTuVM0dTRqVXRNX/9V/Pq8maDUa2RUmGqD6Dh+00XANr+u3ulLlzulwgHjzNpapjiMML QoqQtzTfoU3OETg38GzZQiHzx0LdwB6xezB0TnfqOUvXiV5f+O4iilbKQmI5bMN7cxiX zBuxEMKXc8mgwz8J6vGFvrLJIfVMRRcTUCTsLlanmEgqrsM4YUaApGGUnDjjL+6lW1LB KXBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=lyH/0Byt; 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 w33si90195edm.154.2018.03.21.02.07.32; Wed, 21 Mar 2018 02:07:32 -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=lyH/0Byt; 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 058CBC21E53; Wed, 21 Mar 2018 09:05:29 +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 AF442C21E36; Wed, 21 Mar 2018 09:05:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BEDEEC21C6A; Wed, 21 Mar 2018 09:04:15 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 62C68C21E4E for ; Wed, 21 Mar 2018 09:04:14 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2L93irI027481; Wed, 21 Mar 2018 18:03:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2L93irI027481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521623025; bh=GX07sA/qEQ6+bZ0nEzpEna7fJWsBf4VA6/AKvZ1S/wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyH/0BytiBOYc6iIukjFoOXMDTPvZtrOkGQBgdtLKVv4qc59aoF/BwdHXZRxnxPeH APcJuvi4vT0hv2hOAS83oe63mhe6yRDgOlLIjoWhKjNzqSW0kJobMV9Do0CohcK6/I eSOtq+IeuuQvQO13PVnHM0DtTD/DhQbD5wdwCimUPQilWxE9vtxLsEGDQSosOxz6vm Y3AesaguICNoMuCpMbRY/VGTz6Uqq4j0TSQlSteGxhYMltjUsyZncf/AEXK09g3wgX CWWSAkHfz9IkYMKGf+QDATZ1SM1wKjCQtAf9f9cgTy9Ypx3zHWC4VG1Pdl8RtD5TvW ykOVgYCh1NJRQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 21 Mar 2018 18:03:34 +0900 Message-Id: <1521623017-29312-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> References: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 2/5] fdt_region: remove unneeded fdt_internal.h inclusion 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" fdt_region.c does not depend on anything in libfdt_internal.h Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- lib/libfdt/fdt_region.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c index 70914a4..054c4b3 100644 --- a/lib/libfdt/fdt_region.c +++ b/lib/libfdt/fdt_region.c @@ -14,8 +14,6 @@ #include "fdt_host.h" #endif -#include "libfdt_internal.h" - #define FDT_MAX_DEPTH 32 static int str_in_list(const char *str, char * const list[], int count) From patchwork Wed Mar 21 09:03:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132197 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1890064ljb; Wed, 21 Mar 2018 02:07:00 -0700 (PDT) X-Google-Smtp-Source: AG47ELtgkzCtOFMqSGvFSHfwFh+rsJPMz5mWWVeYSH6Jl+LGi4BBghC20dPr0W7tXbty4lgnBD9p X-Received: by 10.80.135.68 with SMTP id 4mr8204674edv.11.1521623220333; Wed, 21 Mar 2018 02:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521623220; cv=none; d=google.com; s=arc-20160816; b=JSzUyvPaWvTIKlYM2CQHi8vgkI1rq2Q80DHZMQXU1g0ethhK0aZdnrk+9zkpfVK9hN Jfwx01lWdIKKKgW7QCJGtNUV5Bc/Z/kMpFNACjIxvzNM0+I4STu78QF1hVq0kAxSRPSO SrFM5HI2qh7K3pBWvnoe85HMRVpgbe7MGZT8ld0rprkjsgeakhMuWyMIgy5qAK0qSkDk 2Nax1j2If7U1Zjwa4Atmsor4wRCI1LOIvKxGnA1duPOQ5LoYchMkZ18pMFG4nmiYfaca yHinH9qnx8yN79LVPkSlI6craAo0+4KZ2a7HSlMi+R7gSYqad3u7aURBASfmcqgYreSK Y4lQ== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=MNu74rFK6jLeiGX09Dsb82UcPC7N/dJbRxWbFlJz9Fk=; b=lgUXvbUfPV+WzRvHAQUF6ep/hH6fGoFJb5s2/Rrb2VCOFi0dGC8TWG6YSDp7v43wT5 JFspIBHAIKWewayOmioRLPug7QHl0CSy+bPdkkKrCDpGaVTe6kx9mSe2An5aLqH5fPTb qemviUW/wcVcT9OEk//0IWgKqTR2b+3nbOXoLaw3/Sv1SbKZnIeU1kFETJRnkLw/fhxt 4Hx7boP1TJLDEFZPwcbp/+9JYkWhIbTt/lzPabdzIaJ68aDjpdP3XFPx16lJ+8Bk9DA2 LVNRWLqXW7IQtEpt9HrVUuIx10gWeufgZMUClZtXokhCFUXWmMTZ9AlxwhsbScBstbqi jvtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=V5oUflTE; 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 e36si2643075eda.89.2018.03.21.02.07.00; Wed, 21 Mar 2018 02:07:00 -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=V5oUflTE; 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 ED03CC21DED; Wed, 21 Mar 2018 09:05:13 +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 E7EE1C21DB6; Wed, 21 Mar 2018 09:05:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B61BEC21C29; Wed, 21 Mar 2018 09:04:15 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 5D8BFC21E44 for ; Wed, 21 Mar 2018 09:04:14 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2L93irJ027481; Wed, 21 Mar 2018 18:03:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2L93irJ027481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521623026; bh=1W8P0dfFQESo9it8OwYIJAkyc69taDn/thdDD2GH/XY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5oUflTEaJLysxOuWSYAM5HGE0aCi/pKYaJEbWDLf02uDuEgHL0qg32tofnbG0XL4 pGghjM4Xs6TXUb53t8bseOKYhoWfAoCvD+9gqm3+KOT/X8HzTABkoiGUIbpQB/2uZX /sra029OPWwrZCQCDJaMQiBHsVBLqsJrY6ME/sVMt4X1jqBPJZ3svv4PWnnCcVB2z+ aLqz5aAfgrQxFY0frscof9edIq2mbtAQ6XvyVH9xo7/2bt5/hzqQ07ExTYjtWXkEWz /MgUaJpRgwbLCCmOi1H3PCm7X8Rz1or0qSuOdcJmpPR9S3ySOx+RRDXXY3KZU92295 NUCMRjIaok3hg== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 21 Mar 2018 18:03:35 +0900 Message-Id: <1521623017-29312-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> References: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 3/5] image.h: add forward declaration of struct fdt_region 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" This header needs to know 'fdt_region' is a struct for the fit_region_make_list() prototype. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- include/image.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/image.h b/include/image.h index 621abf6..a6f82ae 100644 --- a/include/image.h +++ b/include/image.h @@ -21,6 +21,7 @@ /* Define this to avoid #ifdefs later on */ struct lmb; +struct fdt_region; #ifdef USE_HOSTCC #include From patchwork Wed Mar 21 09:03:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132200 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1890525ljb; Wed, 21 Mar 2018 02:07:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELuy1+H53t3C3C/cCdyA1bFJ+pQ2Xw/wmb5ySOdCFqL9ZqXxr2fwq0rmTHlTU2usdbkA8oGV X-Received: by 10.80.178.166 with SMTP id p35mr20181159edd.75.1521623253092; Wed, 21 Mar 2018 02:07:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521623253; cv=none; d=google.com; s=arc-20160816; b=ZPdAi0Wi2RHbYga70Frfi7GkbjUIFgxi2/olTeBu8vFxB5W7TnWGx5EElkTX4D+uoI bylBVepVAAOqb1YpmbH9lsQmikFekSJnVHNhrLyub2sL10Mqc5tBY2k35UHZFi7OILxi W8ePjmw2IMpp5n0UE14rXKL4sNFTZJ+3DNeBNf6bTwHQ9c0QyQSgeA5xZ1Vc9iu6NGco 6xs27lANkuZ2+TahBTkdLWLL1/6TJdPZIUNkJjqhaKVXB8nCqdykd27NETr+sMKoi+GQ xJob/03cv2uMU0bx7JGFnphXOFhKqNJpR2Sb81f8FwuQKKkokal4z0UJ+rgDaRXNCpKD Q7Aw== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=K70MBCGEh9V2cGv3SYEXtJ+hwaPUay6aKQgwUnGaekY=; b=NnABdW9etFGLfZOebwfcZrwQumWrUqFddjOATtcvQzxZ5r3x3Nf/0tN0pmLBkkdGqK v3uJ9UENM+ZiKGO8uN6Ek5o70++DNzaBIo6oMC7Ob+fJJXFeAk2L3dVyVIQ2QDKaKCI1 O/RC3SQVrkvdujjm51vfHwAI3KqN0Xa8DDbFazdh/tFXV+NtgNM0XU+0YCO3gdDrnyYY UjZthwIAUlejGoQJmGxSHc/ld3N3To0O/Nr/CX+PFbpz7kekc8BY5Ycyf7mCWs7LfOE2 ONfX5sILwXENdQJysyJpxybQ3ElXsq3rjnDfDznxBhrHCUHCSeAD1bvgZlbht5AXFG7/ xfEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=S4+YPu0v; 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 i30si3012511edi.353.2018.03.21.02.07.32; Wed, 21 Mar 2018 02:07:33 -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=S4+YPu0v; 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 673CBC21DDC; Wed, 21 Mar 2018 09:07:16 +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 D2E8FC21C29; Wed, 21 Mar 2018 09:07:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A579C21E2F; Wed, 21 Mar 2018 09:04:27 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id C2FEFC21E12 for ; Wed, 21 Mar 2018 09:04:26 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2L93irK027481; Wed, 21 Mar 2018 18:03:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2L93irK027481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521623026; bh=jUR3qJWO2un4qQ66MZUZXq9Bsos5dgmNceJ4VitF0O4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S4+YPu0v+BGCUbiJIwRpniI9KyqxFqzgrJsEX9mskHUMkGac0NWze1aEcvkaZTdzj sNxIMNrzrVAmJeEMOnJ1hnTgnB6bk5xOjYel1M4QX4xkfXXVenT3NPrTKEn3EPaV7X prrdmv+w4CJIxHXmTRqoBQTuPVE9umBKjHeiI6teyCncKTrXO9H1SPraBNZ0XOrmZk h6rRdQyIEsjDBm1N/ho5u9Uh8wP3yTG1uCbaNSsp09/+GwoE5sVlCFfPDzreQ8x21J wDtOwTJG0t/+mO2QO2tD5xjdyHqIY7HB5ZELAo/ql/mNY2dsc4p34Qx1Jq4WJBk/jg DmVmy5GHKq5ng== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 21 Mar 2018 18:03:36 +0900 Message-Id: <1521623017-29312-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> References: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 4/5] fdt_region: move fdt_region.c to common/ from lib/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" My goal is to sync lib/libfdt/ with scripts/dtc/libfdt/, that is, make lib/libfdt/ contain only wrapper files. fdt_region.c was written only for U-Boot to implement the verified boot. So, this belongs to the same group as common/fdt_support.c, which is a collection of U-Boot own fdt helpers. Move lib/libfdt/fdt_region.c to common/fdt_region.c . This is necessary only when CONFIG_(SPL_)_FIT_SIGNATURE is enabled. Signed-off-by: Masahiro Yamada --- common/Makefile | 2 ++ {lib/libfdt => common}/fdt_region.c | 0 lib/libfdt/Makefile | 3 --- tools/Makefile | 5 +++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename {lib/libfdt => common}/fdt_region.c (100%) diff --git a/common/Makefile b/common/Makefile index 7011dad..bf1713b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BEDBUG) += bedbug.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o +obj-$(CONFIG_FIT_SIGNATURE) += fdt_region.o obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o @@ -75,6 +76,7 @@ obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o +obj-$(CONFIG_SPL_FIT_SIGNATURE) += fdt_region.o ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o diff --git a/lib/libfdt/fdt_region.c b/common/fdt_region.c similarity index 100% rename from lib/libfdt/fdt_region.c rename to common/fdt_region.c diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile index edd8e64..dd30d52 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -21,7 +21,4 @@ obj-$(CONFIG_OF_LIBFDT_OVERLAY) += fdt_overlay.o # TODO: split out the local modifiction. obj-y += fdt_ro.o -# U-Boot own file -obj-y += fdt_region.o - ccflags-y := -I$(srctree)/scripts/dtc/libfdt diff --git a/tools/Makefile b/tools/Makefile index 55efb74..e7f701a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -67,7 +67,7 @@ LIBFDT_SRCS_SYNCED := fdt.c fdt_wip.c fdt_sw.c fdt_rw.c \ fdt_strerror.c fdt_empty_tree.c fdt_addresses.c fdt_overlay.c # The following files are locally modified for U-Boot (unfotunately). # Use U-Boot own versions from lib/libfdt/. -LIBFDT_SRCS_UNSYNCED := fdt_ro.c fdt_region.c +LIBFDT_SRCS_UNSYNCED := fdt_ro.c LIBFDT_OBJS := $(addprefix libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_SYNCED))) \ $(addprefix lib/libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_UNSYNCED))) @@ -82,6 +82,7 @@ ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o dumpimage-mkimage-objs := aisimage.o \ atmelimage.o \ $(FIT_SIG_OBJS-y) \ + common/fdt_region.o \ common/bootm.o \ lib/crc32.o \ default_image.o \ @@ -192,7 +193,7 @@ hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela hostprogs-$(CONFIG_RISCV) += prelink-riscv hostprogs-y += fdtgrep -fdtgrep-objs += $(LIBFDT_OBJS) fdtgrep.o +fdtgrep-objs += $(LIBFDT_OBJS) common/fdt_region.o fdtgrep.o hostprogs-$(CONFIG_MIPS) += mips-relocs From patchwork Wed Mar 21 09:03:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132198 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1890228ljb; Wed, 21 Mar 2018 02:07:12 -0700 (PDT) X-Google-Smtp-Source: AG47ELtG0npDTMtDb2P4Mio/rQ9BBEqPtOwbDZWhRL9iVNJ7LtSYFl+h+k4PMnNlJ/aSdx8huMJ9 X-Received: by 10.80.201.76 with SMTP id p12mr21128661edh.199.1521623232600; Wed, 21 Mar 2018 02:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521623232; cv=none; d=google.com; s=arc-20160816; b=RSgBxTDZD6GdhrQd+xEROLOhoKVzPlJe60g0UbZTuuThR+6X5rAC0H0BtBv4fF1W+3 JuzSzN3m0t7udMI86EwrXaIbpb9Z9nxxN4EN7m6Bem1WrgMjHh1d4jr/14+Tk7hgbju8 1B7iAowDxcp8dZMlwP9STxUvt8IiaGeu5RvLkYuBltCHjRFH05mv/FOCqIt8DU6yfxEI +ojl9XmtuWmCea0x9bMLoFuFTQ7UBD5ur/wO0fBEaDQgNj2rGWzIRRd6hX8shrj2yCmT CNQfIxiAKaCoFNO3933KilrTigDm528jESgz9r2P9LGor5bOEVmoCortWGiE/c0apOiD 9GWg== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=CudI2REHPAhP7kWlrbZyj8luPSIYhUJG77Qa3Ise2Bk=; b=NDLQCkmNuYRuGtqGLf/I+8t8ANR/ZKuiQ1qw15eYRkg8ssz6rKUXFp2ixsaTxpuj8R 4BxqBZCnZHqBii2tdg8zt/ug5DfkoI2QS8Nq5dTtm1RqbKs+x4YzM475D9O8dmkp5xt9 RD8eIPVM98eSQuKU2HIUK/cBH/9u4Wjeke0+O7HhXI/69MlCpyNcla5sgdPRNR/jegAp SxV6wL857nNn5G6k/4pawwOYnNZrC+OBLYEs/KWnJSyd2vhgjJcRQ+N+O5uT6H6R+I+b cbahArRtEXVLrQBqS616UTOu2h+RL9+8X7oTCywJPZdlCNeKMrJg4G96ePEwcmwPqKiw 4CzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=b0/rA2hx; 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 l48si2284034edb.260.2018.03.21.02.07.12; Wed, 21 Mar 2018 02:07:12 -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=b0/rA2hx; 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 328E0C21E36; Wed, 21 Mar 2018 09:06:01 +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 18E84C21DF8; Wed, 21 Mar 2018 09:05:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B97BEC21E35; Wed, 21 Mar 2018 09:04:28 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 0F974C21E4F for ; Wed, 21 Mar 2018 09:04:26 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2L93irL027481; Wed, 21 Mar 2018 18:03:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2L93irL027481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521623027; bh=40q9x3KLFXGgVomrTzgV10KlJEcZC0MDbnrPYlv0boo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0/rA2hx5YOr3jkw1yek3eSj9p+F4qTUANWLs+SZ6P3iTqw0HL+ikMQd/RTcPjyhw TPd+UJCeqS8t2RAImeNES3kNCDzkX0KEvUeTQPoHJUA/zVJbGt22xRImqLEsOU9cc2 0xGKH3YKJ2XCmlqA4EuqmOK2aTQHSz66Uim69GtQWf4rUgiVh+clp522BPAaOuCRK1 i7XtEsSiUnedWnlSsBya5totjqo34XMX2uGIQpYmrEpmdCG1csA7x3F5+cluSFLMw3 KydobbKLC7ReMfNx3iafjjWhluSlOamcZVdC0aFE5mPnDiZJMeS8uFO/fReOvEKFnq L4Wz4M5FVAbpQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 21 Mar 2018 18:03:37 +0900 Message-Id: <1521623017-29312-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> References: <1521623017-29312-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 5/5] libfdt: split fdt_region declarations out to 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" fdt_region APIs are not part of libfdt. They are U-Boot extension for the verified boot. Split the declartions related to fdt_region out ot . This allows to become a simple wrapper file, like Linux does. Signed-off-by: Masahiro Yamada --- common/fdt_region.c | 1 + common/image-sig.c | 1 + include/fdt_region.h | 303 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/libfdt.h | 299 ------------------------------------------------ tools/fdtgrep.c | 1 + tools/image-host.c | 1 + 6 files changed, 307 insertions(+), 299 deletions(-) create mode 100644 include/fdt_region.h diff --git a/common/fdt_region.c b/common/fdt_region.c index 054c4b3..4a02ef4 100644 --- a/common/fdt_region.c +++ b/common/fdt_region.c @@ -6,6 +6,7 @@ */ #include +#include #ifndef USE_HOSTCC #include diff --git a/common/image-sig.c b/common/image-sig.c index d9f712f..921f378 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -12,6 +12,7 @@ #include DECLARE_GLOBAL_DATA_PTR; #endif /* !USE_HOSTCC*/ +#include #include #include #include diff --git a/include/fdt_region.h b/include/fdt_region.h new file mode 100644 index 0000000..2a5ca7d --- /dev/null +++ b/include/fdt_region.h @@ -0,0 +1,303 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _FDT_REGION_H +#define _FDT_REGION_H + +#ifndef SWIG /* Not available in Python */ +struct fdt_region { + int offset; + int size; +}; + +/* + * Flags for fdt_find_regions() + * + * Add a region for the string table (always the last region) + */ +#define FDT_REG_ADD_STRING_TAB (1 << 0) + +/* + * Add all supernodes of a matching node/property, useful for creating a + * valid subset tree + */ +#define FDT_REG_SUPERNODES (1 << 1) + +/* Add the FDT_BEGIN_NODE tags of subnodes, including their names */ +#define FDT_REG_DIRECT_SUBNODES (1 << 2) + +/* Add all subnodes of a matching node */ +#define FDT_REG_ALL_SUBNODES (1 << 3) + +/* Add a region for the mem_rsvmap table (always the first region) */ +#define FDT_REG_ADD_MEM_RSVMAP (1 << 4) + +/* Indicates what an fdt part is (node, property, value) */ +#define FDT_IS_NODE (1 << 0) +#define FDT_IS_PROP (1 << 1) +#define FDT_IS_VALUE (1 << 2) /* not supported */ +#define FDT_IS_COMPAT (1 << 3) /* used internally */ +#define FDT_NODE_HAS_PROP (1 << 4) /* node contains prop */ + +#define FDT_ANY_GLOBAL (FDT_IS_NODE | FDT_IS_PROP | FDT_IS_VALUE | \ + FDT_IS_COMPAT) +#define FDT_IS_ANY 0x1f /* all the above */ + +/* We set a reasonable limit on the number of nested nodes */ +#define FDT_MAX_DEPTH 32 + +/* Decribes what we want to include from the current tag */ +enum want_t { + WANT_NOTHING, + WANT_NODES_ONLY, /* No properties */ + WANT_NODES_AND_PROPS, /* Everything for one level */ + WANT_ALL_NODES_AND_PROPS /* Everything for all levels */ +}; + +/* Keeps track of the state at parent nodes */ +struct fdt_subnode_stack { + int offset; /* Offset of node */ + enum want_t want; /* The 'want' value here */ + int included; /* 1 if we included this node, 0 if not */ +}; + +struct fdt_region_ptrs { + int depth; /* Current tree depth */ + int done; /* What we have completed scanning */ + enum want_t want; /* What we are currently including */ + char *end; /* Pointer to end of full node path */ + int nextoffset; /* Next node offset to check */ +}; + +/* The state of our finding algortihm */ +struct fdt_region_state { + struct fdt_subnode_stack stack[FDT_MAX_DEPTH]; /* node stack */ + struct fdt_region *region; /* Contains list of regions found */ + int count; /* Numnber of regions found */ + const void *fdt; /* FDT blob */ + int max_regions; /* Maximum regions to find */ + int can_merge; /* 1 if we can merge with previous region */ + int start; /* Start position of current region */ + struct fdt_region_ptrs ptrs; /* Pointers for what we are up to */ +}; + +/** + * fdt_find_regions() - find regions in device tree + * + * Given a list of nodes to include and properties to exclude, find + * the regions of the device tree which describe those included parts. + * + * The intent is to get a list of regions which will be invariant provided + * those parts are invariant. For example, if you request a list of regions + * for all nodes but exclude the property "data", then you will get the + * same region contents regardless of any change to "data" properties. + * + * This function can be used to produce a byte-stream to send to a hashing + * function to verify that critical parts of the FDT have not changed. + * + * Nodes which are given in 'inc' are included in the region list, as + * are the names of the immediate subnodes nodes (but not the properties + * or subnodes of those subnodes). + * + * For eaxample "/" means to include the root node, all root properties + * and the FDT_BEGIN_NODE and FDT_END_NODE of all subnodes of /. The latter + * ensures that we capture the names of the subnodes. In a hashing situation + * it prevents the root node from changing at all Any change to non-excluded + * properties, names of subnodes or number of subnodes would be detected. + * + * When used with FITs this provides the ability to hash and sign parts of + * the FIT based on different configurations in the FIT. Then it is + * impossible to change anything about that configuration (include images + * attached to the configuration), but it may be possible to add new + * configurations, new images or new signatures within the existing + * framework. + * + * Adding new properties to a device tree may result in the string table + * being extended (if the new property names are different from those + * already added). This function can optionally include a region for + * the string table so that this can be part of the hash too. + * + * The device tree header is not included in the list. + * + * @fdt: Device tree to check + * @inc: List of node paths to included + * @inc_count: Number of node paths in list + * @exc_prop: List of properties names to exclude + * @exc_prop_count: Number of properties in exclude list + * @region: Returns list of regions + * @max_region: Maximum length of region list + * @path: Pointer to a temporary string for the function to use for + * building path names + * @path_len: Length of path, must be large enough to hold the longest + * path in the tree + * @add_string_tab: 1 to add a region for the string table + * @return number of regions in list. If this is >max_regions then the + * region array was exhausted. You should increase max_regions and try + * the call again. + */ +int fdt_find_regions(const void *fdt, char * const inc[], int inc_count, + char * const exc_prop[], int exc_prop_count, + struct fdt_region region[], int max_regions, + char *path, int path_len, int add_string_tab); + +/** + * fdt_first_region() - find regions in device tree + * + * Given a nodes and properties to include and properties to exclude, find + * the regions of the device tree which describe those included parts. + * + * The use for this function is twofold. Firstly it provides a convenient + * way of performing a structure-aware grep of the tree. For example it is + * possible to grep for a node and get all the properties associated with + * that node. Trees can be subsetted easily, by specifying the nodes that + * are required, and then writing out the regions returned by this function. + * This is useful for small resource-constrained systems, such as boot + * loaders, which want to use an FDT but do not need to know about all of + * it. + * + * Secondly it makes it easy to hash parts of the tree and detect changes. + * The intent is to get a list of regions which will be invariant provided + * those parts are invariant. For example, if you request a list of regions + * for all nodes but exclude the property "data", then you will get the + * same region contents regardless of any change to "data" properties. + * + * This function can be used to produce a byte-stream to send to a hashing + * function to verify that critical parts of the FDT have not changed. + * Note that semantically null changes in order could still cause false + * hash misses. Such reordering might happen if the tree is regenerated + * from source, and nodes are reordered (the bytes-stream will be emitted + * in a different order and many hash functions will detect this). However + * if an existing tree is modified using libfdt functions, such as + * fdt_add_subnode() and fdt_setprop(), then this problem is avoided. + * + * The nodes/properties to include/exclude are defined by a function + * provided by the caller. This function is called for each node and + * property, and must return: + * + * 0 - to exclude this part + * 1 - to include this part + * -1 - for FDT_IS_PROP only: no information is available, so include + * if its containing node is included + * + * The last case is only used to deal with properties. Often a property is + * included if its containing node is included - this is the case where + * -1 is returned.. However if the property is specifically required to be + * included/excluded, then 0 or 1 can be returned. Note that including a + * property when the FDT_REG_SUPERNODES flag is given will force its + * containing node to be included since it is not valid to have a property + * that is not in a node. + * + * Using the information provided, the inclusion of a node can be controlled + * either by a node name or its compatible string, or any other property + * that the function can determine. + * + * As an example, including node "/" means to include the root node and all + * root properties. A flag provides a way of also including supernodes (of + * which there is none for the root node), and another flag includes + * immediate subnodes, so in this case we would get the FDT_BEGIN_NODE and + * FDT_END_NODE of all subnodes of /. + * + * The subnode feature helps in a hashing situation since it prevents the + * root node from changing at all. Any change to non-excluded properties, + * names of subnodes or number of subnodes would be detected. + * + * When used with FITs this provides the ability to hash and sign parts of + * the FIT based on different configurations in the FIT. Then it is + * impossible to change anything about that configuration (include images + * attached to the configuration), but it may be possible to add new + * configurations, new images or new signatures within the existing + * framework. + * + * Adding new properties to a device tree may result in the string table + * being extended (if the new property names are different from those + * already added). This function can optionally include a region for + * the string table so that this can be part of the hash too. This is always + * the last region. + * + * The FDT also has a mem_rsvmap table which can also be included, and is + * always the first region if so. + * + * The device tree header is not included in the region list. Since the + * contents of the FDT are changing (shrinking, often), the caller will need + * to regenerate the header anyway. + * + * @fdt: Device tree to check + * @h_include: Function to call to determine whether to include a part or + * not: + * + * @priv: Private pointer as passed to fdt_find_regions() + * @fdt: Pointer to FDT blob + * @offset: Offset of this node / property + * @type: Type of this part, FDT_IS_... + * @data: Pointer to data (node name, property name, compatible + * string, value (not yet supported) + * @size: Size of data, or 0 if none + * @return 0 to exclude, 1 to include, -1 if no information is + * available + * @priv: Private pointer passed to h_include + * @region: Returns list of regions, sorted by offset + * @max_regions: Maximum length of region list + * @path: Pointer to a temporary string for the function to use for + * building path names + * @path_len: Length of path, must be large enough to hold the longest + * path in the tree + * @flags: Various flags that control the region algortihm, see + * FDT_REG_... + * @return number of regions in list. If this is >max_regions then the + * region array was exhausted. You should increase max_regions and try + * the call again. Only the first max_regions elements are available in the + * array. + * + * On error a -ve value is return, which can be: + * + * -FDT_ERR_BADSTRUCTURE (too deep or more END tags than BEGIN tags + * -FDT_ERR_BADLAYOUT + * -FDT_ERR_NOSPACE (path area is too small) + */ +int fdt_first_region(const void *fdt, + int (*h_include)(void *priv, const void *fdt, int offset, + int type, const char *data, int size), + void *priv, struct fdt_region *region, + char *path, int path_len, int flags, + struct fdt_region_state *info); + +/** fdt_next_region() - find next region + * + * See fdt_first_region() for full description. This function finds the + * next region according to the provided parameters, which must be the same + * as passed to fdt_first_region(). + * + * This function can additionally return -FDT_ERR_NOTFOUND when there are no + * more regions + */ +int fdt_next_region(const void *fdt, + int (*h_include)(void *priv, const void *fdt, int offset, + int type, const char *data, int size), + void *priv, struct fdt_region *region, + char *path, int path_len, int flags, + struct fdt_region_state *info); + +/** + * fdt_add_alias_regions() - find aliases that point to existing regions + * + * Once a device tree grep is complete some of the nodes will be present + * and some will have been dropped. This function checks all the alias nodes + * to figure out which points point to nodes which are still present. These + * aliases need to be kept, along with the nodes they reference. + * + * Given a list of regions function finds the aliases that still apply and + * adds more regions to the list for these. This function is called after + * fdt_next_region() has finished returning regions and requires the same + * state. + * + * @fdt: Device tree file to reference + * @region: List of regions that will be kept + * @count: Number of regions + * @max_regions: Number of entries that can fit in @region + * @info: Region state as returned from fdt_next_region() + * @return new number of regions in @region (i.e. count + the number added) + * or -FDT_ERR_NOSPACE if there was not enough space. + */ +int fdt_add_alias_regions(const void *fdt, struct fdt_region *region, int count, + int max_regions, struct fdt_region_state *info); +#endif /* SWIG */ + +#endif /* _FDT_REGION_H */ diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index eeb2344..39dbc88 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -8,305 +8,6 @@ #include "../../scripts/dtc/libfdt/libfdt.h" /* U-Boot local hacks */ - -#ifndef SWIG /* Not available in Python */ -struct fdt_region { - int offset; - int size; -}; - -/* - * Flags for fdt_find_regions() - * - * Add a region for the string table (always the last region) - */ -#define FDT_REG_ADD_STRING_TAB (1 << 0) - -/* - * Add all supernodes of a matching node/property, useful for creating a - * valid subset tree - */ -#define FDT_REG_SUPERNODES (1 << 1) - -/* Add the FDT_BEGIN_NODE tags of subnodes, including their names */ -#define FDT_REG_DIRECT_SUBNODES (1 << 2) - -/* Add all subnodes of a matching node */ -#define FDT_REG_ALL_SUBNODES (1 << 3) - -/* Add a region for the mem_rsvmap table (always the first region) */ -#define FDT_REG_ADD_MEM_RSVMAP (1 << 4) - -/* Indicates what an fdt part is (node, property, value) */ -#define FDT_IS_NODE (1 << 0) -#define FDT_IS_PROP (1 << 1) -#define FDT_IS_VALUE (1 << 2) /* not supported */ -#define FDT_IS_COMPAT (1 << 3) /* used internally */ -#define FDT_NODE_HAS_PROP (1 << 4) /* node contains prop */ - -#define FDT_ANY_GLOBAL (FDT_IS_NODE | FDT_IS_PROP | FDT_IS_VALUE | \ - FDT_IS_COMPAT) -#define FDT_IS_ANY 0x1f /* all the above */ - -/* We set a reasonable limit on the number of nested nodes */ -#define FDT_MAX_DEPTH 32 - -/* Decribes what we want to include from the current tag */ -enum want_t { - WANT_NOTHING, - WANT_NODES_ONLY, /* No properties */ - WANT_NODES_AND_PROPS, /* Everything for one level */ - WANT_ALL_NODES_AND_PROPS /* Everything for all levels */ -}; - -/* Keeps track of the state at parent nodes */ -struct fdt_subnode_stack { - int offset; /* Offset of node */ - enum want_t want; /* The 'want' value here */ - int included; /* 1 if we included this node, 0 if not */ -}; - -struct fdt_region_ptrs { - int depth; /* Current tree depth */ - int done; /* What we have completed scanning */ - enum want_t want; /* What we are currently including */ - char *end; /* Pointer to end of full node path */ - int nextoffset; /* Next node offset to check */ -}; - -/* The state of our finding algortihm */ -struct fdt_region_state { - struct fdt_subnode_stack stack[FDT_MAX_DEPTH]; /* node stack */ - struct fdt_region *region; /* Contains list of regions found */ - int count; /* Numnber of regions found */ - const void *fdt; /* FDT blob */ - int max_regions; /* Maximum regions to find */ - int can_merge; /* 1 if we can merge with previous region */ - int start; /* Start position of current region */ - struct fdt_region_ptrs ptrs; /* Pointers for what we are up to */ -}; - -/** - * fdt_find_regions() - find regions in device tree - * - * Given a list of nodes to include and properties to exclude, find - * the regions of the device tree which describe those included parts. - * - * The intent is to get a list of regions which will be invariant provided - * those parts are invariant. For example, if you request a list of regions - * for all nodes but exclude the property "data", then you will get the - * same region contents regardless of any change to "data" properties. - * - * This function can be used to produce a byte-stream to send to a hashing - * function to verify that critical parts of the FDT have not changed. - * - * Nodes which are given in 'inc' are included in the region list, as - * are the names of the immediate subnodes nodes (but not the properties - * or subnodes of those subnodes). - * - * For eaxample "/" means to include the root node, all root properties - * and the FDT_BEGIN_NODE and FDT_END_NODE of all subnodes of /. The latter - * ensures that we capture the names of the subnodes. In a hashing situation - * it prevents the root node from changing at all Any change to non-excluded - * properties, names of subnodes or number of subnodes would be detected. - * - * When used with FITs this provides the ability to hash and sign parts of - * the FIT based on different configurations in the FIT. Then it is - * impossible to change anything about that configuration (include images - * attached to the configuration), but it may be possible to add new - * configurations, new images or new signatures within the existing - * framework. - * - * Adding new properties to a device tree may result in the string table - * being extended (if the new property names are different from those - * already added). This function can optionally include a region for - * the string table so that this can be part of the hash too. - * - * The device tree header is not included in the list. - * - * @fdt: Device tree to check - * @inc: List of node paths to included - * @inc_count: Number of node paths in list - * @exc_prop: List of properties names to exclude - * @exc_prop_count: Number of properties in exclude list - * @region: Returns list of regions - * @max_region: Maximum length of region list - * @path: Pointer to a temporary string for the function to use for - * building path names - * @path_len: Length of path, must be large enough to hold the longest - * path in the tree - * @add_string_tab: 1 to add a region for the string table - * @return number of regions in list. If this is >max_regions then the - * region array was exhausted. You should increase max_regions and try - * the call again. - */ -int fdt_find_regions(const void *fdt, char * const inc[], int inc_count, - char * const exc_prop[], int exc_prop_count, - struct fdt_region region[], int max_regions, - char *path, int path_len, int add_string_tab); - -/** - * fdt_first_region() - find regions in device tree - * - * Given a nodes and properties to include and properties to exclude, find - * the regions of the device tree which describe those included parts. - * - * The use for this function is twofold. Firstly it provides a convenient - * way of performing a structure-aware grep of the tree. For example it is - * possible to grep for a node and get all the properties associated with - * that node. Trees can be subsetted easily, by specifying the nodes that - * are required, and then writing out the regions returned by this function. - * This is useful for small resource-constrained systems, such as boot - * loaders, which want to use an FDT but do not need to know about all of - * it. - * - * Secondly it makes it easy to hash parts of the tree and detect changes. - * The intent is to get a list of regions which will be invariant provided - * those parts are invariant. For example, if you request a list of regions - * for all nodes but exclude the property "data", then you will get the - * same region contents regardless of any change to "data" properties. - * - * This function can be used to produce a byte-stream to send to a hashing - * function to verify that critical parts of the FDT have not changed. - * Note that semantically null changes in order could still cause false - * hash misses. Such reordering might happen if the tree is regenerated - * from source, and nodes are reordered (the bytes-stream will be emitted - * in a different order and many hash functions will detect this). However - * if an existing tree is modified using libfdt functions, such as - * fdt_add_subnode() and fdt_setprop(), then this problem is avoided. - * - * The nodes/properties to include/exclude are defined by a function - * provided by the caller. This function is called for each node and - * property, and must return: - * - * 0 - to exclude this part - * 1 - to include this part - * -1 - for FDT_IS_PROP only: no information is available, so include - * if its containing node is included - * - * The last case is only used to deal with properties. Often a property is - * included if its containing node is included - this is the case where - * -1 is returned.. However if the property is specifically required to be - * included/excluded, then 0 or 1 can be returned. Note that including a - * property when the FDT_REG_SUPERNODES flag is given will force its - * containing node to be included since it is not valid to have a property - * that is not in a node. - * - * Using the information provided, the inclusion of a node can be controlled - * either by a node name or its compatible string, or any other property - * that the function can determine. - * - * As an example, including node "/" means to include the root node and all - * root properties. A flag provides a way of also including supernodes (of - * which there is none for the root node), and another flag includes - * immediate subnodes, so in this case we would get the FDT_BEGIN_NODE and - * FDT_END_NODE of all subnodes of /. - * - * The subnode feature helps in a hashing situation since it prevents the - * root node from changing at all. Any change to non-excluded properties, - * names of subnodes or number of subnodes would be detected. - * - * When used with FITs this provides the ability to hash and sign parts of - * the FIT based on different configurations in the FIT. Then it is - * impossible to change anything about that configuration (include images - * attached to the configuration), but it may be possible to add new - * configurations, new images or new signatures within the existing - * framework. - * - * Adding new properties to a device tree may result in the string table - * being extended (if the new property names are different from those - * already added). This function can optionally include a region for - * the string table so that this can be part of the hash too. This is always - * the last region. - * - * The FDT also has a mem_rsvmap table which can also be included, and is - * always the first region if so. - * - * The device tree header is not included in the region list. Since the - * contents of the FDT are changing (shrinking, often), the caller will need - * to regenerate the header anyway. - * - * @fdt: Device tree to check - * @h_include: Function to call to determine whether to include a part or - * not: - * - * @priv: Private pointer as passed to fdt_find_regions() - * @fdt: Pointer to FDT blob - * @offset: Offset of this node / property - * @type: Type of this part, FDT_IS_... - * @data: Pointer to data (node name, property name, compatible - * string, value (not yet supported) - * @size: Size of data, or 0 if none - * @return 0 to exclude, 1 to include, -1 if no information is - * available - * @priv: Private pointer passed to h_include - * @region: Returns list of regions, sorted by offset - * @max_regions: Maximum length of region list - * @path: Pointer to a temporary string for the function to use for - * building path names - * @path_len: Length of path, must be large enough to hold the longest - * path in the tree - * @flags: Various flags that control the region algortihm, see - * FDT_REG_... - * @return number of regions in list. If this is >max_regions then the - * region array was exhausted. You should increase max_regions and try - * the call again. Only the first max_regions elements are available in the - * array. - * - * On error a -ve value is return, which can be: - * - * -FDT_ERR_BADSTRUCTURE (too deep or more END tags than BEGIN tags - * -FDT_ERR_BADLAYOUT - * -FDT_ERR_NOSPACE (path area is too small) - */ -int fdt_first_region(const void *fdt, - int (*h_include)(void *priv, const void *fdt, int offset, - int type, const char *data, int size), - void *priv, struct fdt_region *region, - char *path, int path_len, int flags, - struct fdt_region_state *info); - -/** fdt_next_region() - find next region - * - * See fdt_first_region() for full description. This function finds the - * next region according to the provided parameters, which must be the same - * as passed to fdt_first_region(). - * - * This function can additionally return -FDT_ERR_NOTFOUND when there are no - * more regions - */ -int fdt_next_region(const void *fdt, - int (*h_include)(void *priv, const void *fdt, int offset, - int type, const char *data, int size), - void *priv, struct fdt_region *region, - char *path, int path_len, int flags, - struct fdt_region_state *info); - -/** - * fdt_add_alias_regions() - find aliases that point to existing regions - * - * Once a device tree grep is complete some of the nodes will be present - * and some will have been dropped. This function checks all the alias nodes - * to figure out which points point to nodes which are still present. These - * aliases need to be kept, along with the nodes they reference. - * - * Given a list of regions function finds the aliases that still apply and - * adds more regions to the list for these. This function is called after - * fdt_next_region() has finished returning regions and requires the same - * state. - * - * @fdt: Device tree file to reference - * @region: List of regions that will be kept - * @count: Number of regions - * @max_regions: Number of entries that can fit in @region - * @info: Region state as returned from fdt_next_region() - * @return new number of regions in @region (i.e. count + the number added) - * or -FDT_ERR_NOSPACE if there was not enough space. - */ -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 */ #endif /* _INCLUDE_LIBFDT_H_ */ diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 8d33205..bbdefe6 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "fdt_host.h" #include "libfdt_internal.h" diff --git a/tools/image-host.c b/tools/image-host.c index 8a7469e..fc63c9e 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -11,6 +11,7 @@ #include "mkimage.h" #include +#include #include #include