Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812884/?format=api
{ "id": 812884, "url": "http://patchwork.ozlabs.org/api/patches/812884/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1505227539-17560-2-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-2-git-send-email-jjhiblot@ti.com>", "list_archive_url": null, "date": "2017-09-12T14:45:30", "name": "[U-Boot,v5,01/10] dts: renamed FIT_EMBED to MULTI_DTB_FIT and moved it to the dts Kconfig", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d5aeb642cf5b10102735d7a58e6701e10f8b59cd", "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-2-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/812884/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812884/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=\"lNkbSbRQ\";\n\tdkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xs70k0XJJz9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 00:46:46 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid AD5C4C21FB8; Tue, 12 Sep 2017 14:46:05 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 90F9EC220AB;\n\tTue, 12 Sep 2017 14:45:57 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 174DBC21E9C; Tue, 12 Sep 2017 14:45:48 +0000 (UTC)", "from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17])\n\tby lists.denx.de (Postfix) with ESMTPS id A71B5C21EC9\n\tfor <u-boot@lists.denx.de>; Tue, 12 Sep 2017 14:45:44 +0000 (UTC)", "from dlelxv90.itg.ti.com ([172.17.2.17])\n\tby fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CEje12005273; \n\tTue, 12 Sep 2017 09:45:40 -0500", "from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32])\n\tby dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjeg5012334; \n\tTue, 12 Sep 2017 09:45:40 -0500", "from DLEE109.ent.ti.com (157.170.170.41) by DLEE102.ent.ti.com\n\t(157.170.170.32) 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:40 -0500", "from dlep32.itg.ti.com (157.170.170.100) by DLEE109.ent.ti.com\n\t(157.170.170.41) 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:39 -0500", "from localhost (ileax41-snat.itg.ti.com [10.172.224.153])\n\tby dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjd9A015514;\n\tTue, 12 Sep 2017 09:45:39 -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=1505227540;\n\tbh=6IaI0iMIkDb3vs7qKf12r0uc5boH5X2wHuKNJxVGds8=;\n\th=From:To:CC:Subject:Date:In-Reply-To:References;\n\tb=lNkbSbRQn11V/5vSP4khWkzlr7FQsrDM55gAV/yIbNdwFeqmwLt8S/etdUroMNmSh\n\tQgSXul+bbS1T3npEkHUIonzborlb/GsWMWaFkOaxF3UEwTHKnqcdgH2V4iupHKQVog\n\tk7js9HuCPTWqp4NprNz0FdSwGyKLgN/kmlNNVlQY=", "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:30 +0200", "Message-ID": "<1505227539-17560-2-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 01/10] dts: renamed FIT_EMBED to MULTI_DTB_FIT\n\tand moved it to the dts Kconfig", "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": "CONFIG_FIT_EMBED might be confused with CONFIG_OF_EMBED, rename it\nMULTI_DTB_FIT as it is able to get a DTB from a FIT image containing\nmultiple DTBs. Also move the option to the Kconfig dedicated to the DTS\noptions and create a README for this feature.\n\nSigned-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>\nReviewed-by: Tom Rini <trini@konsulko.com>\nReviewed-by: Simon Glass <sjg@chromium.org>\n---\n Makefile | 2 +-\n board/ti/ks2_evm/board_k2e.c | 2 +-\n board/ti/ks2_evm/board_k2g.c | 2 +-\n board/ti/ks2_evm/board_k2hk.c | 2 +-\n board/ti/ks2_evm/board_k2l.c | 2 +-\n common/Kconfig | 16 ----------------\n common/Makefile | 2 +-\n configs/k2e_evm_defconfig | 2 +-\n configs/k2g_evm_defconfig | 2 +-\n configs/k2hk_evm_defconfig | 2 +-\n configs/k2l_evm_defconfig | 2 +-\n doc/README.multi-dtb-fit | 15 +++++++++++++++\n dts/Kconfig | 20 +++++++++++++++++++-\n lib/fdtdec.c | 2 +-\n 14 files changed, 45 insertions(+), 28 deletions(-)\n create mode 100644 doc/README.multi-dtb-fit", "diff": "diff --git a/Makefile b/Makefile\nindex 8086f3c..833aad2 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -877,7 +877,7 @@ dts/dt.dtb: checkdtc u-boot\n quiet_cmd_copy = COPY $@\n cmd_copy = cp $< $@\n \n-ifeq ($(CONFIG_FIT_EMBED),y)\n+ifeq ($(CONFIG_MULTI_DTB_FIT),y)\n \n fit-dtb.blob: dts/dt.dtb FORCE\n \t$(call if_changed,mkimage)\ndiff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c\nindex 266a66b..6c77d91 100644\n--- a/board/ti/ks2_evm/board_k2e.c\n+++ b/board/ti/ks2_evm/board_k2e.c\n@@ -166,7 +166,7 @@ int get_num_eth_ports(void)\n }\n #endif\n \n-#if defined(CONFIG_FIT_EMBED)\n+#if defined(CONFIG_MULTI_DTB_FIT)\n int board_fit_config_name_match(const char *name)\n {\n \tif (!strcmp(name, \"keystone-k2e-evm\"))\ndiff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c\nindex 15f0f54..5120b2c 100644\n--- a/board/ti/ks2_evm/board_k2g.c\n+++ b/board/ti/ks2_evm/board_k2g.c\n@@ -216,7 +216,7 @@ int board_mmc_init(bd_t *bis)\n }\n #endif\n \n-#if defined(CONFIG_FIT_EMBED)\n+#if defined(CONFIG_MULTI_DTB_FIT)\n int board_fit_config_name_match(const char *name)\n {\n \tbool eeprom_read = board_ti_was_eeprom_read();\ndiff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c\nindex c733099..e99e635 100644\n--- a/board/ti/ks2_evm/board_k2hk.c\n+++ b/board/ti/ks2_evm/board_k2hk.c\n@@ -150,7 +150,7 @@ int board_early_init_f(void)\n }\n #endif\n \n-#if defined(CONFIG_FIT_EMBED)\n+#if defined(CONFIG_MULTI_DTB_FIT)\n int board_fit_config_name_match(const char *name)\n {\n \tif (!strcmp(name, \"keystone-k2hk-evm\"))\ndiff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c\nindex 166367b..c65f331 100644\n--- a/board/ti/ks2_evm/board_k2l.c\n+++ b/board/ti/ks2_evm/board_k2l.c\n@@ -138,7 +138,7 @@ int board_early_init_f(void)\n }\n #endif\n \n-#if defined(CONFIG_FIT_EMBED)\n+#if defined(CONFIG_MULTI_DTB_FIT)\n int board_fit_config_name_match(const char *name)\n {\n \tif (!strcmp(name, \"keystone-k2l-evm\"))\ndiff --git a/common/Kconfig b/common/Kconfig\nindex 4d8cae9..972b12b 100644\n--- a/common/Kconfig\n+++ b/common/Kconfig\n@@ -384,22 +384,6 @@ config SYS_STDIO_DEREGISTER\n \n endmenu\n \n-config DTB_RESELECT\n-\tbool \"Support swapping dtbs at a later point in boot\"\n-\tdepends on FIT_EMBED\n-\thelp\n-\t It is possible during initial boot you may need to use a generic\n-\t dtb until you can fully determine the board your running on. This\n-\t config allows boards to implement a function at a later point\n-\t during boot to switch to the \"correct\" dtb.\n-\n-config FIT_EMBED\n-\tbool \"Support a FIT image embedded in the U-boot image\"\n-\thelp\n-\t This option provides hooks to allow U-boot to parse an\n-\t appended FIT image and enable board specific code to then select\n-\t the correct DTB to be used.\n-\n config DEFAULT_FDT_FILE\n \tstring \"Default fdt file\"\n \thelp\ndiff --git a/common/Makefile b/common/Makefile\nindex 1b56cf9..c3d8d3f 100644\n--- a/common/Makefile\n+++ b/common/Makefile\n@@ -103,7 +103,7 @@ obj-y += image.o\n obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o\n obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o\n obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o\n-obj-$(CONFIG_FIT_EMBED) += boot_fit.o common_fit.o\n+obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o\n obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-sig.o\n obj-$(CONFIG_IO_TRACE) += iotrace.o\n obj-y += memsize.o\ndiff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig\nindex fed6add..b6a5282 100644\n--- a/configs/k2e_evm_defconfig\n+++ b/configs/k2e_evm_defconfig\n@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"keystone-k2e-evm\"\n CONFIG_OF_BOARD_SETUP=y\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_DTB_RESELECT=y\n-CONFIG_FIT_EMBED=y\n+CONFIG_MULTI_DTB_FIT=y\n CONFIG_VERSION_VARIABLE=y\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL=y\ndiff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig\nindex 2b29bf4..9c8b66d 100644\n--- a/configs/k2g_evm_defconfig\n+++ b/configs/k2g_evm_defconfig\n@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"keystone-k2g-evm\"\n CONFIG_OF_BOARD_SETUP=y\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_DTB_RESELECT=y\n-CONFIG_FIT_EMBED=y\n+CONFIG_MULTI_DTB_FIT=y\n CONFIG_VERSION_VARIABLE=y\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL=y\ndiff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig\nindex 80546ec..bfb95ab 100644\n--- a/configs/k2hk_evm_defconfig\n+++ b/configs/k2hk_evm_defconfig\n@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"keystone-k2hk-evm\"\n CONFIG_OF_BOARD_SETUP=y\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_DTB_RESELECT=y\n-CONFIG_FIT_EMBED=y\n+CONFIG_MULTI_DTB_FIT=y\n CONFIG_VERSION_VARIABLE=y\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL=y\ndiff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig\nindex 732c9d2..7ab0d47 100644\n--- a/configs/k2l_evm_defconfig\n+++ b/configs/k2l_evm_defconfig\n@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"keystone-k2l-evm\"\n CONFIG_OF_BOARD_SETUP=y\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_DTB_RESELECT=y\n-CONFIG_FIT_EMBED=y\n+CONFIG_MULTI_DTB_FIT=y\n CONFIG_VERSION_VARIABLE=y\n CONFIG_BOARD_EARLY_INIT_F=y\n CONFIG_SPL=y\ndiff --git a/doc/README.multi-dtb-fit b/doc/README.multi-dtb-fit\nnew file mode 100644\nindex 0000000..0d4f068\n--- /dev/null\n+++ b/doc/README.multi-dtb-fit\n@@ -0,0 +1,15 @@\n+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+\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+The relevant DTBs are packed into a FIT (list provided by CONFIG__OF_LIST). The\n+FIT is automatically generated at the end of the compilation and appended to\n+u-boot.bin so that U-Boot can locate it and select the correct DTB from inside\n+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().\ndiff --git a/dts/Kconfig b/dts/Kconfig\nindex b4b7ddc..31cbc1f 100644\n--- a/dts/Kconfig\n+++ b/dts/Kconfig\n@@ -98,7 +98,7 @@ config DEFAULT_DEVICE_TREE\n \n config OF_LIST\n \tstring \"List of device tree files to include for DT control\"\n-\tdepends on SPL_LOAD_FIT || FIT_EMBED\n+\tdepends on SPL_LOAD_FIT || MULTI_DTB_FIT\n \tdefault DEFAULT_DEVICE_TREE\n \thelp\n \t This option specifies a list of device tree files to use for DT\n@@ -108,6 +108,24 @@ config OF_LIST\n \t device tree files (without the directory or .dtb suffix)\n \t separated by <space>.\n \n+\n+config DTB_RESELECT\n+\tbool \"Support swapping dtbs at a later point in boot\"\n+\tdepends on MULTI_DTB_FIT\n+\thelp\n+\t It is possible during initial boot you may need to use a generic\n+\t dtb until you can fully determine the board your running on. This\n+\t config allows boards to implement a function at a later point\n+\t during boot to switch to the \"correct\" dtb.\n+\n+config MULTI_DTB_FIT\n+\tbool \"support embedding several DTBs in a FIT image for u-boot\"\n+\thelp\n+\t This option provides hooks to allow U-boot to parse an\n+\t appended FIT image and enable board specific code to then select\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 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 107a892..630e040 100644\n--- a/lib/fdtdec.c\n+++ b/lib/fdtdec.c\n@@ -1217,7 +1217,7 @@ int fdtdec_setup(void)\n \telse\n \t\tgd->fdt_blob = (ulong *)&__bss_end;\n \n-# elif defined CONFIG_FIT_EMBED\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", "prefixes": [ "U-Boot", "v5", "01/10" ] }