From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2A25C433F5 for ; Fri, 1 Oct 2021 06:22:12 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 63A7761A54 for ; Fri, 1 Oct 2021 06:22:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 63A7761A54 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2ADED832AF; Fri, 1 Oct 2021 08:22:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1633069330; bh=Afh5vpR53gjnuf8aEUDBedbOUJcX6JvHYfwokHk1WOI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=tKusHxfkHgE/ygB9W026BUAPKnjqIcUDAL4vNwe7nn5dmL6ZhjGp/vkoqcWHWnKjY kD3Z4kBEvyIkcrbK28O3Klcvf2O0Dv09KvT23A3/VQRkzaQAac0R3C3IjcUTG9S26V cTj2YqVxjX4xMklPtnn3hnq8HWUef5+PqM/PnhX8rSsMXb0ok67ex5xngd7+C0mvkW iMY+HBD4Pn6KnaJAJbA6IadOL3fygrwwCRNZdvaGeBRZSmCVBz+u6z7D8rxiX9qPiZ PxFdZBBTHDzMH1cGUjm0G92tz0xk4wu7TcRud807PwO8qEWa7QQYK8CyGYWlgxW4He WwGLCBGM36Z/w== Received: by phobos.denx.de (Postfix, from userid 109) id 62EAF83257; Fri, 1 Oct 2021 08:22:08 +0200 (CEST) Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [IPv6:2001:67c:2050:1::465:204]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7DF4083257 for ; Fri, 1 Oct 2021 08:22:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4HLKlK35D0zQkd6; Fri, 1 Oct 2021 08:22:05 +0200 (CEST) Subject: Re: [PATCH u-boot-marvell v3 18/39] tools: kwboot: Always call kwboot_img_patch_hdr() To: =?UTF-8?Q?Marek_Beh=c3=ban?= Cc: u-boot@lists.denx.de, pali@kernel.org, Chris Packham , Baruch Siach , Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?Q?Marek_Beh=c3=ban?= References: <20210924210716.29752-1-kabel@kernel.org> <20210924210716.29752-19-kabel@kernel.org> From: Stefan Roese Message-ID: Date: Fri, 1 Oct 2021 08:22:01 +0200 MIME-Version: 1.0 In-Reply-To: <20210924210716.29752-19-kabel@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 332CC1841 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 24.09.21 23:06, Marek Behún wrote: > From: Pali Rohár > > The kwboot_img_patch_hdr() function already decides if header patching > is needed. Always call this function and deprecate the unneeded command > line option `-p`. > > Signed-off-by: Pali Rohár > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese Thanks, Stefan > --- > tools/kwboot.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/tools/kwboot.c b/tools/kwboot.c > index ad91afd075..9394a51380 100644 > --- a/tools/kwboot.c > +++ b/tools/kwboot.c > @@ -709,9 +709,9 @@ out: > } > > static void * > -kwboot_mmap_image(const char *path, size_t *size, int prot) > +kwboot_mmap_image(const char *path, size_t *size) > { > - int rc, fd, flags; > + int rc, fd; > struct stat st; > void *img; > > @@ -726,9 +726,7 @@ kwboot_mmap_image(const char *path, size_t *size, int prot) > if (rc) > goto out; > > - flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED; > - > - img = mmap(NULL, st.st_size, prot, flags, fd, 0); > + img = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); > if (img == MAP_FAILED) { > img = NULL; > goto out; > @@ -833,7 +831,6 @@ kwboot_usage(FILE *stream, char *progname) > fprintf(stream, "\n"); > fprintf(stream, > " -b : boot with preamble (Kirkwood, Armada 370/XP)\n"); > - fprintf(stream, " -p: patch to type 0x69 (uart boot)\n"); > fprintf(stream, > " -D : boot without preamble (Dove)\n"); > fprintf(stream, " -d: enter debug mode\n"); > @@ -853,7 +850,7 @@ int > main(int argc, char **argv) > { > const char *ttypath, *imgpath; > - int rv, rc, tty, term, prot, patch; > + int rv, rc, tty, term; > void *bootmsg; > void *debugmsg; > void *img; > @@ -867,7 +864,6 @@ main(int argc, char **argv) > imgpath = NULL; > img = NULL; > term = 0; > - patch = 0; > size = 0; > speed = B115200; > > @@ -894,7 +890,7 @@ main(int argc, char **argv) > break; > > case 'p': > - patch = 1; > + /* nop, for backward compatibility */ > break; > > case 't': > @@ -934,9 +930,6 @@ main(int argc, char **argv) > if (!bootmsg && !term && !debugmsg) > goto usage; > > - if (patch && !imgpath) > - goto usage; > - > if (argc - optind < 1) > goto usage; > > @@ -949,16 +942,12 @@ main(int argc, char **argv) > } > > if (imgpath) { > - prot = PROT_READ | (patch ? PROT_WRITE : 0); > - > - img = kwboot_mmap_image(imgpath, &size, prot); > + img = kwboot_mmap_image(imgpath, &size); > if (!img) { > perror(imgpath); > goto out; > } > - } > > - if (patch) { > rc = kwboot_img_patch_hdr(img, size); > if (rc) { > fprintf(stderr, "%s: Invalid image.\n", imgpath); > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de