Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812895/?format=api
{ "id": 812895, "url": "http://patchwork.ozlabs.org/api/patches/812895/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1505227539-17560-10-git-send-email-jjhiblot@ti.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1505227539-17560-10-git-send-email-jjhiblot@ti.com>", "list_archive_url": null, "date": "2017-09-12T14:45:38", "name": "[U-Boot,v5,09/10] spl: dm: Make it possible for the SPL to pick its own DTB from a FIT", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e35ef0c9da770f37fe34f38594c4d973f4a52656", "submitter": { "id": 70508, "url": "http://patchwork.ozlabs.org/api/people/70508/?format=api", "name": "Jean-Jacques Hiblot", "email": "jjhiblot@ti.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1505227539-17560-10-git-send-email-jjhiblot@ti.com/mbox/", "series": [ { "id": 2721, "url": "http://patchwork.ozlabs.org/api/series/2721/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=2721", "date": "2017-09-12T14:45:29", "name": "spl: dm: Make it possible for the SPL to pick its own DTB from a FIT", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/2721/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812895/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812895/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ti.com header.i=@ti.com header.b=\"nDyHROPr\";\n\tdkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xs74n4S6lz9sNV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 00:50:17 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 58F1CC22235; Tue, 12 Sep 2017 14:48:40 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 80637C221E3;\n\tTue, 12 Sep 2017 14:46:38 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid BEE6EC22124; Tue, 12 Sep 2017 14:45:57 +0000 (UTC)", "from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80])\n\tby lists.denx.de (Postfix) with ESMTPS id 88B1AC220D3\n\tfor <u-boot@lists.denx.de>; Tue, 12 Sep 2017 14:45:53 +0000 (UTC)", "from dlelxv90.itg.ti.com ([172.17.2.17])\n\tby lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CEjoPv024419; \n\tTue, 12 Sep 2017 09:45:50 -0500", "from DLEE101.ent.ti.com (dlee101.ent.ti.com [157.170.170.31])\n\tby dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjoFe012598; \n\tTue, 12 Sep 2017 09:45:50 -0500", "from DLEE108.ent.ti.com (157.170.170.38) by DLEE101.ent.ti.com\n\t(157.170.170.31) with Microsoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34;\n\tTue, 12 Sep 2017 09:45:50 -0500", "from dflp32.itg.ti.com (10.64.6.15) by DLEE108.ent.ti.com\n\t(157.170.170.38) with Microsoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend\n\tTransport; Tue, 12 Sep 2017 09:45:50 -0500", "from localhost (ileax41-snat.itg.ti.com [10.172.224.153])\n\tby dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjnDi025478;\n\tTue, 12 Sep 2017 09:45:49 -0500" ], "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=RCVD_IN_DNSWL_NONE,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com;\n\ts=ti-com-17Q1; t=1505227550;\n\tbh=ZdpkmYWqbvnmM8dGq4kiOhRUO/anp7r3XpoDtfZ5Mzk=;\n\th=From:To:CC:Subject:Date:In-Reply-To:References;\n\tb=nDyHROPr/BJOE13vTBHQZye9/jOcSD9wmw39ga73lvUQPbToHydFx7Nk/ItkAS9fp\n\t1KTkLk1U0bXw+5QbXbxXMwr/nliaR5AmCJn6woqO2lGOL5CdebIzEM7VElZVX627lG\n\tqHfsDhYV0pvJq+TZD9+GuQxPPBs588a0fAn5vkRk=", "From": "Jean-Jacques Hiblot <jjhiblot@ti.com>", "To": "<trini@konsulko.com>, <lokeshvutla@ti.com>, <sjg@chromium.org>,\n\t<fcooper@ti.com>", "Date": "Tue, 12 Sep 2017 16:45:38 +0200", "Message-ID": "<1505227539-17560-10-git-send-email-jjhiblot@ti.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1505227539-17560-1-git-send-email-jjhiblot@ti.com>", "References": "<1505227539-17560-1-git-send-email-jjhiblot@ti.com>", "MIME-Version": "1.0", "X-EXCLAIMER-MD-CONFIG": "e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180", "Cc": "u-boot@lists.denx.de", "Subject": "[U-Boot] [PATCH v5 09/10] spl: dm: Make it possible for the SPL to\n\tpick its own DTB from a FIT", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "u-boot can be embedded within a FIT image with multiple DTBs. It then\nselects at run-time which one is best suited for the platform.\nUse the same principle here for the SPL: put the DTBs in a FIT image,\ncompress it (LZO, GZIP, or no compression) and append it at the end of the\nSPL.\n\nSigned-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>\n---\n doc/README.multi-dtb-fit | 56 ++++++++++++++++++++++++++++--\n dts/Kconfig | 83 +++++++++++++++++++++++++++++++++++++++++++++\n lib/fdtdec.c | 88 +++++++++++++++++++++++++++++++++++++++++++-----\n scripts/Makefile.spl | 35 ++++++++++++++++++-\n 4 files changed, 249 insertions(+), 13 deletions(-)", "diff": "diff --git a/doc/README.multi-dtb-fit b/doc/README.multi-dtb-fit\nindex 0d4f068..6cc4965 100644\n--- a/doc/README.multi-dtb-fit\n+++ b/doc/README.multi-dtb-fit\n@@ -1,8 +1,11 @@\n-MULTI DTB FIT\n+MULTI DTB FIT and SPL_MULTI_DTB_FIT\n \n-The purpose of this feature is to enable u-boot to select its DTB from a FIT\n-appended at the end of the binary.\n+The purpose of this feature is to enable U-Boot or the SPL to select its DTB\n+from a FIT appended at the end of the binary.\n+It comes in two flavors: U-Boot (CONFIG_MULTI_DTB_FIT) and SPL\n+(CONFIG_SPL_MULTI_DTB_FIT).\n \n+U-Boot flavor:\n Usually the DTB is selected by the SPL and passed down to U-Boot. But some\n platforms don't use the SPL. In this case MULTI_DTB_FIT can used to provide\n U-Boot with a choice of DTBs.\n@@ -13,3 +16,50 @@ the FIT.\n The selection is done using board_fit_config_name_match() (same as what the SPL\n uses to select the DTB for U-Boot). The selection happens during fdtdec_setup()\n which is called during before relocation by board_init_f().\n+\n+SPL flavor:\n+the SPL uses only a small subset of the DTB and it usually depends more\n+on the SOC than on the board. So it's usually fine to include a DTB in the\n+SPL that doesn't exactly match the board. There are howerver some cases\n+where it's not possible. In the later case, in order to support multiple\n+boards (or board revisions) with the same SPL binary, SPL_MULTI_DTB_FIT\n+can be used.\n+The relevant DTBs are packed into a FIT. This FIT is automatically generated\n+at the end of the compilation, compressed and appended to u-boot-spl.bin, so\n+that SPL can locate it and select the correct DTB from inside the FIT.\n+CONFIG_SPL__OF_LIST is used to list the relevant DTBs.\n+The compression stage is optional but reduces the impact on the size of the\n+SPL. LZO and GZIP compressions are supported. By default, the area where the\n+FIT is uncompressed is dynamicaly allocated but this behaviour can be changed\n+for platforms that don't provide a HEAP big enough to contain the uncompressed\n+FIT.\n+The SPL uses board_fit_config_name_match() to find the correct DTB within the\n+FIT (same as what the SPL uses to select the DTB for U-Boot).\n+Uncompression and selection stages happen in fdtdec_setup() which is called\n+during the early initialization stage of the SPL (spl_early_init() or\n+spl_init())\n+\n+Impacts and performances (SPL flavor):\n+The impact of this option is relatively small. Here are some numbers measured\n+for a TI DRA72 platform:\n+\n+ +----------+------------+-----------+------------+\n+ | size | size delta | SPL boot | boot time |\n+ | (bytes) | (bytes) | time (s) | delta (s) |\n++---------------------------+----------+------------+-----------+------------+\n+| 1 DTB | | | | |\n++---------------------------+----------+------------+-----------+------------+\n+| reference | 125305 | 0 | 1.389 | 0 |\n+| LZO (dynamic allocation) | 125391 | 86 | 1.381 | -0.008 |\n++---------------------------+----------+------------+-----------+------------+\n+| 4 DTBs (DRA7, DRA71, | | | | |\n+| DRA72, DRA72 revC) | | | | |\n++---------------------------+----------+------------+-----------+------------+\n+| LZO (dynamic allocation) | 125991 | 686 | 1.39 | 0.001 |\n+| LZO (user defined area) | 125927 | 622 | 1.403 | 0.014 |\n+| GZIP (user defined area) | 133880 | 8575 | 1.421 | 0.032 |\n+| No compression (in place) | 137472 | 12167 | 1.412 | 0.023 |\n++---------------------------+----------+------------+-----------+------------+\n+\n+Note: SPL boot time is the time elapsed between the 'reset' command is entered\n+and the time when the first U-Boot (not SPL) version string is displayed.\ndiff --git a/dts/Kconfig b/dts/Kconfig\nindex 31cbc1f..979f14f 100644\n--- a/dts/Kconfig\n+++ b/dts/Kconfig\n@@ -126,6 +126,89 @@ config MULTI_DTB_FIT\n \t the correct DTB to be used. Use this if you need to support\n \t multiple DTBs but don't use the SPL.\n \n+\n+config SPL_MULTI_DTB_FIT\n+\tdepends on SPL_LOAD_FIT && SPL_OF_CONTROL && !SPL_OF_PLATDATA\n+\tbool \"support embedding several DTBs in a FIT image for the SPL\"\n+\thelp\n+\t This option provides the SPL with the ability to select its own\n+\t DTB at runtime from an appended FIT image containing several DTBs.\n+\t This allows using the same SPL binary on multiple platforms.\n+\t The primary purpose is to handle different versions of\n+\t the same platform without tweaking the platform code if the\n+\t differences can be expressed in the DTBs (common examples are: bus\n+\t capabilities, pad configurations).\n+\n+config SPL_OF_LIST\n+\tstring \"List of device tree files to include for DT control in SPL\"\n+\tdepends on SPL_MULTI_DTB_FIT\n+\tdefault OF_LIST\n+\thelp\n+\t This option specifies a list of device tree files to use for DT\n+\t control in the SPL. These will be packaged into a FIT. At run-time,\n+\t the SPL will select the correct DT to use by examining the\n+\t hardware (e.g. reading a board ID value). This is a list of\n+\t device tree files (without the directory or .dtb suffix)\n+\t separated by <space>.\n+\n+choice\n+\tprompt \"SPL OF LIST compression\"\n+\tdepends on SPL_MULTI_DTB_FIT\n+\tdefault SPL_MULTI_DTB_FIT_LZO\n+\n+config SPL_MULTI_DTB_FIT_LZO\n+\tbool \"LZO\"\n+\tdepends on SYS_MALLOC_F\n+\tselect SPL_LZO\n+\thelp\n+\t Compress the FIT image containing the DTBs available for the SPL\n+\t using LZO compression. (requires lzop on host).\n+\n+config SPL_MULTI_DTB_FIT_GZIP\n+\tbool \"GZIP\"\n+\tdepends on SYS_MALLOC_F\n+\tselect SPL_GZIP\n+\thelp\n+\t Compress the FIT image containing the DTBs available for the SPL\n+\t using GZIP compression. (requires gzip on host)\n+\n+config SPL_MULTI_DTB_FIT_NO_COMPRESSION\n+\tbool \"No compression\"\n+\thelp\n+\t Do not compress the FIT image containing the DTBs available for the SPL.\n+\t Use this options only if LZO is not available and the DTBs are very small.\n+endchoice\n+\n+choice\n+\tprompt \"location of uncompressed DTBs \"\n+\tdepends on (SPL_MULTI_DTB_FIT_GZIP || SPL_MULTI_DTB_FIT_LZO)\n+\n+config SPL_MULTI_DTB_FIT_DYN_ALLOC\n+\tbool \"Dynamically allocate the memory\"\n+\tdepends on SYS_MALLOC_F\n+\tdefault y\n+\n+config SPL_MULTI_DTB_FIT_USER_DEFINED_AREA\n+\tbool \"user-defined location\"\n+endchoice\n+\n+config SPL_MULTI_DTB_FIT_UNCOMPRESS_SZ\n+\thex \"Size of memory reserved to uncompress the DTBs\"\n+\tdepends on (SPL_MULTI_DTB_FIT_GZIP || SPL_MULTI_DTB_FIT_LZO)\n+\tdefault 0x8000\n+\thelp\n+\t This is the size of this area where the DTBs are uncompressed.\n+\t If this area is dynamically allocated, make sure that\n+\t SPL_SYS_MALLOC_F_LEN is big enough to contain it.\n+\n+config SPL_MULTI_DTB_FIT_USER_DEF_ADDR\n+\thex \"Address of memory where dtbs are uncompressed\"\n+\tdepends on SPL_MULTI_DTB_FIT_USER_DEFINED_AREA\n+\thelp\n+\t the FIT image containing the DTBs is uncompressed in an area defined\n+\t at compilation time. This is the address of this area. It must be\n+\t aligned on 2-byte boundary.\n+\n config OF_SPL_REMOVE_PROPS\n \tstring \"List of device tree properties to drop for SPL\"\n \tdepends on SPL_OF_CONTROL\ndiff --git a/lib/fdtdec.c b/lib/fdtdec.c\nindex ee398d1..b7261bd 100644\n--- a/lib/fdtdec.c\n+++ b/lib/fdtdec.c\n@@ -14,7 +14,9 @@\n #include <fdt_support.h>\n #include <libfdt.h>\n #include <linux/ctype.h>\n+#include <linux/lzo.h>\n #include <serial.h>\n+#include <spl.h>\n \n DECLARE_GLOBAL_DATA_PTR;\n \n@@ -1203,9 +1205,66 @@ int fdtdec_setup_memory_banksize(void)\n }\n #endif\n \n+#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)\n+# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\\\n+\tCONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO)\n+static int uncompress_blob(const void *src, ulong sz_src, void **dstp)\n+{\n+\tsize_t sz_out = CONFIG_SPL_MULTI_DTB_FIT_UNCOMPRESS_SZ;\n+\tulong sz_in = sz_src;\n+\tvoid *dst;\n+\tint rc;\n+\n+\tif (CONFIG_IS_ENABLED(GZIP))\n+\t\tif (gzip_parse_header(src, sz_in) < 0)\n+\t\t\treturn -1;\n+\tif (CONFIG_IS_ENABLED(LZO))\n+\t\tif (!lzop_is_valid_header(src))\n+\t\t\treturn -EBADMSG;\n+\n+\tif (CONFIG_IS_ENABLED(MULTI_DTB_FIT_DYN_ALLOC)) {\n+\t\tdst = malloc(sz_out);\n+\t\tif (!dst) {\n+\t\t\tputs(\"uncompress_blob: Unable to allocate memory\\n\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t} else {\n+# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_USER_DEFINED_AREA)\n+\t\tdst = (void *)CONFIG_VAL(MULTI_DTB_FIT_USER_DEF_ADDR);\n+# else\n+\t\treturn -ENOTSUPP;\n+# endif\n+\t}\n+\n+\tif (CONFIG_IS_ENABLED(GZIP))\n+\t\trc = gunzip(dst, sz_out, (u8 *)src, &sz_in);\n+\telse if (CONFIG_IS_ENABLED(LZO))\n+\t\trc = lzop_decompress(src, sz_in, dst, &sz_out);\n+\n+\tif (rc < 0) {\n+\t\t/* not a valid compressed blob */\n+\t\tputs(\"uncompress_blob: Unable to uncompress\\n\");\n+\t\tif (CONFIG_IS_ENABLED(MULTI_DTB_FIT_DYN_ALLOC))\n+\t\t\tfree(dst);\n+\t\treturn -EBADMSG;\n+\t}\n+\t*dstp = dst;\n+\treturn 0;\n+}\n+# else\n+static int uncompress_blob(const void *src, ulong sz_src, void **dstp)\n+{\n+\treturn -ENOTSUPP;\n+}\n+# endif\n+#endif\n+\n int fdtdec_setup(void)\n {\n #if CONFIG_IS_ENABLED(OF_CONTROL)\n+# if CONFIG_IS_ENABLED(MULTI_DTB_FIT)\n+\tvoid *fdt_blob;\n+# endif\n # ifdef CONFIG_OF_EMBED\n \t/* Get a pointer to the FDT */\n \tgd->fdt_blob = __dtb_dt_begin;\n@@ -1216,15 +1275,6 @@ int fdtdec_setup(void)\n \t\tgd->fdt_blob = (ulong *)&_image_binary_end;\n \telse\n \t\tgd->fdt_blob = (ulong *)&__bss_end;\n-\n-# elif defined CONFIG_MULTI_DTB_FIT\n-\tgd->fdt_blob = locate_dtb_in_fit(&_end);\n-\n-\tif (gd->fdt_blob == NULL || gd->fdt_blob <= ((void *)&_end)) {\n-\t\tputs(\"Failed to find proper dtb in embedded FIT Image\\n\");\n-\t\treturn -1;\n-\t}\n-\n # else\n \t/* FDT is at end of image */\n \tgd->fdt_blob = (ulong *)&_end;\n@@ -1243,7 +1293,27 @@ int fdtdec_setup(void)\n \tgd->fdt_blob = (void *)env_get_ulong(\"fdtcontroladdr\", 16,\n \t\t\t\t\t\t(uintptr_t)gd->fdt_blob);\n # endif\n+\n+# if CONFIG_IS_ENABLED(MULTI_DTB_FIT)\n+\t/*\n+\t *try and uncompress the blob.\n+\t * Unfortunately there is no way to know how big the input blob really\n+\t * is. So let us set the maximum input size arbitrarily high. 16MB\n+\t * ought to be more than enough for packed DTBs.\n+\t */\n+\tif (uncompress_blob(gd->fdt_blob, 0x1000000, &fdt_blob) == 0)\n+\t\tgd->fdt_blob = fdt_blob;\n+\n+\t/*\n+\t * Check if blob is a FIT images containings DTBs.\n+\t * If so, pick the most relevant\n+\t */\n+\tfdt_blob = locate_dtb_in_fit(gd->fdt_blob);\n+\tif (fdt_blob)\n+\t\tgd->fdt_blob = fdt_blob;\n+# endif\n #endif\n+\n \treturn fdtdec_prepare_fdt();\n }\n \ndiff --git a/scripts/Makefile.spl b/scripts/Makefile.spl\nindex dd8065d..18bd091 100644\n--- a/scripts/Makefile.spl\n+++ b/scripts/Makefile.spl\n@@ -209,10 +209,21 @@ cmd_cat = cat $(filter-out $(PHONY), $^) > $@\n quiet_cmd_copy = COPY $@\n cmd_copy = cp $< $@\n \n+ifneq ($(CONFIG_SPL_MULTI_DTB_FIT),y)\n+FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).dtb\n+else ifeq ($(CONFIG_SPL_MULTI_DTB_FIT_LZO),y)\n+FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit.lzo\n+else ifeq ($(CONFIG_SPL_MULTI_DTB_FIT_GZIP),y)\n+FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit.gz\n+else\n+FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit\n+endif\n+\n+\n ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)\n $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \\\n \t\t$(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \\\n-\t\t$(obj)/$(SPL_BIN).dtb FORCE\n+\t\t$(FINAL_DTB_CONTAINER) FORCE\n \t$(call if_changed,cat)\n \n $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE\n@@ -382,6 +393,28 @@ checkdtoc: tools\n PHONY += FORCE\n FORCE:\n \n+PHONY += dtbs\n+dtbs:\n+\t$(Q)$(MAKE) $(build)=dts dtbs\n+\n # Declare the contents of the .PHONY variable as phony. We keep that\n # information in a variable so we can use it in if_changed and friends.\n .PHONY: $(PHONY)\n+\n+SHRUNK_ARCH_DTB = $(patsubst %,$(obj)/dts/%.dtb,$(subst \",,$(CONFIG_SPL_OF_LIST)))\n+.SECONDEXPANSION:\n+$(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, arch/$(ARCH)/dts/%, $$@)\n+\t$(call if_changed,fdtgrep)\n+\n+MKIMAGEFLAGS_$(SPL_BIN).multidtb.fit = -f auto -A $(ARCH) -T firmware -C none -O u-boot \\\n+\t-n \"Multi DTB fit image for $(SPL_BIN)\" -E \\\n+\t$(patsubst %,-b %,$(SHRUNK_ARCH_DTB))\n+\n+$(obj)/$(SPL_BIN).multidtb.fit: /dev/null $(SHRUNK_ARCH_DTB) FORCE\n+\t$(call if_changed,mkimage)\n+\n+$(obj)/$(SPL_BIN).multidtb.fit.gz: $(obj)/$(SPL_BIN).multidtb.fit\n+\t@gzip -kf9 $< > $@\n+\n+$(obj)/$(SPL_BIN).multidtb.fit.lzo: $(obj)/$(SPL_BIN).multidtb.fit\n+\t@lzop -f9 $< > $@\n", "prefixes": [ "U-Boot", "v5", "09/10" ] }