[{"id":1758001,"web_url":"http://patchwork.ozlabs.org/comment/1758001/","msgid":"","list_archive_url":null,"date":"2017-08-26T13:37:01","subject":"Re: [U-Boot] [PATCH v2 04/10] fdt-overlay: Spit out a descriptive\n\tfailure warning","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/","name":"Simon Glass","email":"sjg@chromium.org"},"content":"On 11 August 2017 at 02:52, Pantelis Antoniou\n wrote:\n> The most common trouble with overlays appears to be miscompiled\n> blobs without the -@ option.\n>\n> In case of an error, spit out a descriptive error message.\n>\n> Signed-off-by: Pantelis Antoniou \n> ---\n> cmd/fdt.c | 8 ++++++++\n> common/image-fit.c | 12 +++++++++++-\n> 2 files changed, 19 insertions(+), 1 deletion(-)\n>\n> diff --git a/cmd/fdt.c b/cmd/fdt.c\n> index 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> unsigned long addr;\n> struct fdt_header *blob;\n> int ret;\n> + bool has_symbols;\n>\n> if (argc != 3)\n> return CMD_RET_USAGE;\n> @@ -666,9 +667,16 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n> if (!fdt_valid(&blob))\n> return CMD_RET_FAILURE;\n>\n> + ret = fdt_path_offset(working_fdt, \"/__symbols__\");\n> + has_symbols = ret >= 0;\n> +\n> ret = fdt_overlay_apply(working_fdt, blob);\n> if (ret) {\n> printf(\"fdt_overlay_apply(): %s\\n\", fdt_strerror(ret));\n> + if (!has_symbols) {\n> + printf(\"working fdt does did not have a /__symbols__ node\\n\");\n> + printf(\"make sure you've compiled with -@\\n\");\n> + }\n> return CMD_RET_FAILURE;\n> }\n> }\n> diff --git a/common/image-fit.c b/common/image-fit.c\n> index 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> const char *uname;\n> void *base, *ov;\n> int i, err, noffset, ov_noffset;\n> + bool has_symbols;\n> #endif\n>\n> fit_uname = fit_unamep ? *fit_unamep : NULL;\n> @@ -2038,9 +2039,18 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr,\n> fdt_noffset = err;\n> goto out;\n> }\n> +\n> + err = fdt_path_offset(base, \"/__symbols__\");\n> + has_symbols = err >= 0;\n> +\n> err = fdt_overlay_apply(base, ov);\n> if (err < 0) {\n> - printf(\"failed on fdt_overlay_apply\\n\");\n> + printf(\"failed on fdt_overlay_apply(): %s\\n\",\n> + fdt_strerror(err));\n> + if (!has_symbols) {\n> + printf(\"base fdt does did not have a /__symbols__ node\\n\");\n> + printf(\"make sure you've compiled with -@\\n\");\n> + }\n\nCan you put this code in a common function and call it from both places?\n\nRegards,\nSimon","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\" (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"ClbrQsLt\"; \n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"JQgicAH5\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xffSz1WB1z9t4c\n\tfor ;\n\tSat, 26 Aug 2017 23:46:27 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid D040DC2208A; Sat, 26 Aug 2017 13:38:19 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 1DC73C2209A;\n\tSat, 26 Aug 2017 13:37:53 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid CA70EC2209B; Sat, 26 Aug 2017 13:37:27 +0000 (UTC)","from mail-qt0-f173.google.com (mail-qt0-f173.google.com\n\t[209.85.216.173])\n\tby lists.denx.de (Postfix) with ESMTPS id D6C24C22094\n\tfor ; Sat, 26 Aug 2017 13:37:23 +0000 (UTC)","by mail-qt0-f173.google.com with SMTP id d15so9752539qta.4\n\tfor ; Sat, 26 Aug 2017 06:37:23 -0700 (PDT)","by 10.200.52.117 with HTTP; Sat, 26 Aug 2017 06:37:01 -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_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n\ts=20161025; \n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=5ZaEIXDS0j/dIg8a/CjWnY9mReh5TqhCTNUTkRzsFG8=;\n\tb=ClbrQsLtMlUQA8NekpEvgVDPl485CoPzKpBQ3nGmWTUoUS2el3qLzbt/CiQbD1M7bf\n\tcgSsbPotru6XT6DuycLomqMoi8JcSHHp23NzeMsYw1a7cicCVwuAb5Gh5y9f/XfbHMJM\n\tG4kIVLrzahwxTMcdxJSg2AC2HrkvD1tKjTmdst+oDfo7sOv5sl6VzxgdjgK4EMnUl4Zl\n\tr34M2qx9VOnA9wbqzRljBH2cVELJROyMlbAUOaSwzsZXZ4TkT5nGZBH0Ih1gIsjrGOiL\n\trdLqof1BjzI5FNUbjbcCiLUr+6ozbHUUmDsCOl6NQ/wDv8yWaWoAVW5YZts6XpbbU1g1\n\t2zNg==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=5ZaEIXDS0j/dIg8a/CjWnY9mReh5TqhCTNUTkRzsFG8=;\n\tb=JQgicAH5eCSEjuVsl3P3fmfBIBNingOY8Qt+f6WoVR3I7xgLlyp+xXsZSYONtITfGw\n\tEyvenQe+4qi211E5aJNULn9xC/dQhj7r/Un3VmF39JHQ/oPj0fZyWa/y0hx6FjDR/2W5\n\tXo8Npc4RUOyUxDuL4Q42V0xO+ufGvx+GvxUro="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:sender:in-reply-to:references:from\n\t:date:message-id:subject:to:cc;\n\tbh=5ZaEIXDS0j/dIg8a/CjWnY9mReh5TqhCTNUTkRzsFG8=;\n\tb=oliCkPtfAD6HmWRZJJ+Pn4bWU8VxrSUfRd7i9yfF6TxG3911AqNj2dCVELBVe5LaXo\n\tXLw3qhf/GIWy+IYGrMVyO3F4TCpzo85pONxK38jB0R9sJpFMqeqktxGVK1855NSgFmtk\n\tFHBTfIipmJkssu1lfuCXyUC6GmB7k6/Tx4OFNINdDd0OIc3U0bmoaQJO/sOhM0LRhUT6\n\thmtwtmIKXxYb4GpEC3KP6g8us9BgrZ153hMsIQ8p5p4yLsOMZIkMro5IauHP+5Qq1gdR\n\tcdbkB5qWlstAaOzDYmSH0T+RJxIKaLJbi2tdu+Ip2TNxNI/wLkwoJigLTh/zPOpqlqz+\n\tyYGw==","X-Gm-Message-State":"AHYfb5ip6SNqWassM2Bfeov9vSZH2Y2DSw4vFd4/9FLCrLYhUDq4LfUD\n\tR6W6I91Mob8wWqvrHaeKpZrytUOAmswm","X-Google-Smtp-Source":"ADKCNb5Ou5OulhtcbToYZ48w1JyhgNFxVlgwllgWSPbzs7C0ptPAsN7BYxojOdlgGjDZd1K9IHzs5PHNh29FApVZDms=","X-Received":"by 10.237.37.42 with SMTP id v39mr2108158qtc.0.1503754642597;\n\tSat, 26 Aug 2017 06:37:22 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com>","References":"<1502441568-22896-1-git-send-email-pantelis.antoniou@konsulko.com>\n\t<1502441568-22896-5-git-send-email-pantelis.antoniou@konsulko.com>","From":"Simon Glass ","Date":"Sat, 26 Aug 2017 07:37:01 -0600","X-Google-Sender-Auth":"0jR2T4gxN_KN8B9tLC2hV6vPdgY","Message-ID":"","To":"Pantelis Antoniou ","Cc":"Marek Vasut , Tom Rini ,\n\tTero Kristo ,\n\tU-Boot Mailing List , \n\tMaxime Ripard ,\n\tStefan Roese , Alan Ott ","Subject":"Re: [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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "}}]