From patchwork Thu Mar 17 14:05:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?U8OhcmVuw61rIErDoW4=?= X-Patchwork-Id: 599061 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qQrDb4ZWdz9sCj for ; Fri, 18 Mar 2016 01:23:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 202CDA769F; Thu, 17 Mar 2016 15:22:53 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CNMtXAqBonaA; Thu, 17 Mar 2016 15:22:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BFD0A76D2; Thu, 17 Mar 2016 15:22:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 861CCA7686 for ; Thu, 17 Mar 2016 15:15:56 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X0-IgiPEc7pn for ; Thu, 17 Mar 2016 15:15:56 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from uho.ysoft.cz (uho.ysoft.cz [81.19.3.130]) by theia.denx.de (Postfix) with ESMTP id 40881A748A for ; Thu, 17 Mar 2016 15:15:52 +0100 (CET) Received: from APczBrno16.ysoft.local (apczbrno16.ysoft.local [10.0.0.90]) by uho.ysoft.cz (Postfix) with ESMTP id 49882A6A81 for ; Thu, 17 Mar 2016 15:06:00 +0100 (CET) Received: from APczBrno16.ysoft.local (10.0.0.90) by APczBrno16.ysoft.local (10.0.0.90) with Microsoft SMTP Server (TLS) id 15.0.913.22; Thu, 17 Mar 2016 15:05:59 +0100 Received: from APczBrno16.ysoft.local ([fe80::641b:9b18:e002:b3e2]) by APczBrno16.ysoft.local ([fe80::641b:9b18:e002:b3e2%12]) with mapi id 15.00.0913.011; Thu, 17 Mar 2016 15:05:59 +0100 From: =?iso-8859-1?Q?S=E1ren=EDk_J=E1n?= To: "u-boot@lists.denx.de" Thread-Topic: [PATCH] image-fit: Change FIT prefix for configurations Thread-Index: AQHRgFYDkkV6rfDAnkiFZ7wefdioLw== Date: Thu, 17 Mar 2016 14:05:59 +0000 Message-ID: <5cf027cfb8cb490a8c13408be1469100@APczBrno16.ysoft.local> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.1.8.250] x-gfi-smtp-submission: 1 x-gfi-smtp-hellodomain: APczBrno16.ysoft.local x-gfi-smtp-remoteip: 10.0.0.90 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 17 Mar 2016 15:22:39 +0100 Subject: [U-Boot] [PATCH] image-fit: Change FIT prefix for configurations X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Instead of `bootm ${loadaddr}#conf@1` one uses `bootm ${loadaddr}_conf@1` This fixes the bug with using just `bootm #conf@2` without $loadaddr where text starting with # is interpreted as a comment. --- cmd/bootm.c | 2 +- common/image-fit.c | 2 +- doc/uImage.FIT/command_syntax_extensions.txt | 2 +- include/configs/baltos.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.3 diff --git a/cmd/bootm.c b/cmd/bootm.c index 555ccbc..23740c5 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -124,7 +124,7 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * * Right now we assume the first arg should never be '-' */ -if ((*endp != 0) && (*endp != ':') && (*endp != '#')) +if ((*endp != 0) && (*endp != ':') && (*endp != '_')) return do_bootm_subcommand(cmdtp, flag, argc, argv); } diff --git a/common/image-fit.c b/common/image-fit.c index 25f8a11..e23796f 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -75,7 +75,7 @@ static int fit_parse_spec(const char *spec, char sepc, ulong addr_curr, int fit_parse_conf(const char *spec, ulong addr_curr, ulong *addr, const char **conf_name) { -return fit_parse_spec(spec, '#', addr_curr, addr, conf_name); +return fit_parse_spec(spec, '_', addr_curr, addr, conf_name); } /** diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index 6c99b1c..ef4db80 100644 --- a/doc/uImage.FIT/command_syntax_extensions.txt +++ b/doc/uImage.FIT/command_syntax_extensions.txt @@ -36,7 +36,7 @@ Old uImage: New uImage: 8. bootm 9. bootm []: -10. bootm []# +10. bootm []_ 11. bootm []: []: 12. bootm []: []: []: 13. bootm []: []: diff --git a/include/configs/baltos.h b/include/configs/baltos.h index b8c915c..8a01fe8 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -80,7 +80,7 @@ "ubifsmount ubi0:kernel; " \ "ubifsload $loadaddr kernel-fit.itb;" \ "ubifsumount; " \ -"bootm ${loadaddr}#conf${board_name}; " \ +"bootm ${loadaddr}_conf${board_name}; " \ "if test $? -ne 0; then echo Using default FIT config; " \ "bootm ${loadaddr}; fi;\0" #else