{"id":800479,"url":"http://patchwork.ozlabs.org/api/1.2/patches/800479/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","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":"<1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com>","list_archive_url":null,"date":"2017-08-11T08:52:42","name":"[U-Boot,v2,04/10] fdt-overlay: Spit out a descriptive failure warning","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"53e6231cc056854e7711723f6238d47bd7f15cfd","submitter":{"id":64098,"url":"http://patchwork.ozlabs.org/api/1.2/people/64098/?format=json","name":"Pantelis Antoniou","email":"pantelis.antoniou@konsulko.com"},"delegate":{"id":3184,"url":"http://patchwork.ozlabs.org/api/1.2/users/3184/?format=json","username":"sjg","first_name":"Simon","last_name":"Glass","email":"sjg@chromium.org"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/800479/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/800479/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=konsulko.com header.i=@konsulko.com\n\theader.b=\"kpI8WOtf\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xTJsM5MVhz9t2W\n\tfor ;\n\tFri, 11 Aug 2017 19:01:43 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 81177C21DB3; Fri, 11 Aug 2017 08:58:06 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id A3226C21DF9;\n\tFri, 11 Aug 2017 08:56:04 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid CD407C21D7D; Fri, 11 Aug 2017 08:55:46 +0000 (UTC)","from mail-wr0-f175.google.com (mail-wr0-f175.google.com\n\t[209.85.128.175])\n\tby lists.denx.de (Postfix) with ESMTPS id 4AF2DC21C4F\n\tfor ; Fri, 11 Aug 2017 08:55:43 +0000 (UTC)","by mail-wr0-f175.google.com with SMTP id k71so11172603wrc.2\n\tfor ; Fri, 11 Aug 2017 01:55:43 -0700 (PDT)","from localhost.localdomain ([195.97.110.117])\n\tby smtp.gmail.com with ESMTPSA id\n\to71sm759811wmg.15.2017.08.11.01.55.41\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 11 Aug 2017 01:55:42 -0700 (PDT)"],"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\tRCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=ov7QMgBR6DpT4Gf9v5+uwKAEp+hqDJUXmZZFY7hh39Q=;\n\tb=kpI8WOtfbZ3IkzPHVqbJiltqkC07Zxi6kOop8c8wa4fBEcwT0v3bgpSj9IT4izR6yu\n\tXE1lLH9toXP5HxfcL3AUiT5pil3wjmbuhgGnPSYjpb3WziuwTZo9nOpWJkt4l4oDOEZk\n\tTC9fh+496mU2UVc4yzbynQAkYpyi7gQX3NM14=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=ov7QMgBR6DpT4Gf9v5+uwKAEp+hqDJUXmZZFY7hh39Q=;\n\tb=X+F4H/9nOfz3O1pW7TZJLJKFOubOGtz4eZszQBjQfTugF2p5pULlEU8U22ar7UKvhl\n\tBPQ0XnqVM0Co+naq1RhpAZKvkKwYwKcCIXsMVK5pumcYFWjVKcS7dAZK4ThbXHrEKJ42\n\t1ldYQD/zsK7Z1+CdeRQCST72U4sD5FgFLu0cEXUcSCiPqCD7Gub5E75dZ5O4EAnGTaxC\n\txeaUtR7t1YNz3b6QKgcpCea3k1dtaQWHOlRBq6y5t2A1lAwKyVZevDdLRBID3w04661x\n\tB4Jg2XnoLUH8k/dwl6bcDRk9JSuVvcsXUBPMdxKszdkP8a1v/zEbocRuU1Q1oZIxhPBl\n\tQWUg==","X-Gm-Message-State":"AHYfb5hgAs6ifaxQ6IBe/WInuvGntM/lBmBbPav1tuMSVu0N4moGjbbj\n\t/7PZnSbCqCkm7SqA","X-Received":"by 10.223.146.164 with SMTP id 33mr10809631wrn.134.1502441742838;\n\tFri, 11 Aug 2017 01:55:42 -0700 (PDT)","From":"Pantelis Antoniou ","To":"Tom Rini ","Date":"Fri, 11 Aug 2017 11:52:42 +0300","Message-Id":"<1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1502441568-22896-1-git-send-email-pantelis.antoniou@konsulko.com>","References":"<1502441568-22896-1-git-send-email-pantelis.antoniou@konsulko.com>","Cc":"Marek Vasut ,\n\tPantelis Antoniou ,\n\tTero Kristo , u-boot@lists.denx.de,\n\tMaxime Ripard ,\n\tStefan Roese , Alan Ott ","Subject":"[U-Boot] [PATCH v2 04/10] fdt-overlay: Spit out a descriptive\n\tfailure warning","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"The most common trouble with overlays appears to be miscompiled\nblobs without the -@ option.\n\nIn case of an error, spit out a descriptive error message.\n\nSigned-off-by: Pantelis Antoniou \n---\n cmd/fdt.c | 8 ++++++++\n common/image-fit.c | 12 +++++++++++-\n 2 files changed, 19 insertions(+), 1 deletion(-)","diff":"diff --git a/cmd/fdt.c b/cmd/fdt.c\nindex 05e19f8..9f192be 100644\n--- a/cmd/fdt.c\n+++ b/cmd/fdt.c\n@@ -654,6 +654,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \t\tunsigned long addr;\n \t\tstruct fdt_header *blob;\n \t\tint ret;\n+\t\tbool has_symbols;\n \n \t\tif (argc != 3)\n \t\t\treturn CMD_RET_USAGE;\n@@ -666,9 +667,16 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \t\tif (!fdt_valid(&blob))\n \t\t\treturn CMD_RET_FAILURE;\n \n+\t\tret = fdt_path_offset(working_fdt, \"/__symbols__\");\n+\t\thas_symbols = ret >= 0;\n+\n \t\tret = fdt_overlay_apply(working_fdt, blob);\n \t\tif (ret) {\n \t\t\tprintf(\"fdt_overlay_apply(): %s\\n\", fdt_strerror(ret));\n+\t\t\tif (!has_symbols) {\n+\t\t\t\tprintf(\"working fdt does did not have a /__symbols__ node\\n\");\n+\t\t\t\tprintf(\"make sure you've compiled with -@\\n\");\n+\t\t\t}\n \t\t\treturn CMD_RET_FAILURE;\n \t\t}\n \t}\ndiff --git a/common/image-fit.c b/common/image-fit.c\nindex cb089ea..28140f1 100644\n--- a/common/image-fit.c\n+++ b/common/image-fit.c\n@@ -1946,6 +1946,7 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr,\n \tconst char *uname;\n \tvoid *base, *ov;\n \tint i, err, noffset, ov_noffset;\n+\tbool has_symbols;\n #endif\n \n \tfit_uname = fit_unamep ? *fit_unamep : NULL;\n@@ -2038,9 +2039,18 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr,\n \t\t\tfdt_noffset = err;\n \t\t\tgoto out;\n \t\t}\n+\n+\t\terr = fdt_path_offset(base, \"/__symbols__\");\n+\t\thas_symbols = err >= 0;\n+\n \t\terr = fdt_overlay_apply(base, ov);\n \t\tif (err < 0) {\n-\t\t\tprintf(\"failed on fdt_overlay_apply\\n\");\n+\t\t\tprintf(\"failed on fdt_overlay_apply(): %s\\n\",\n+\t\t\t\t\tfdt_strerror(err));\n+\t\t\tif (!has_symbols) {\n+\t\t\t\tprintf(\"base fdt does did not have a /__symbols__ node\\n\");\n+\t\t\t\tprintf(\"make sure you've compiled with -@\\n\");\n+\t\t\t}\n \t\t\tfdt_noffset = err;\n \t\t\tgoto out;\n \t\t}\n","prefixes":["U-Boot","v2","04/10"]}