From patchwork Tue Oct 22 08:18:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aabyzov@slb.com X-Patchwork-Id: 1181133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=slb.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="H7gT2zp5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=slb.com header.i=@slb.com header.b="RyEgSxlw"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46y5yH6x23z9sNx for ; Tue, 22 Oct 2019 19:19:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=COmPJamn61xPVVeRJ2kfGacM/ZRXpqaInrdsI1z9as0=; b=H7gT2zp5vME3VQ xTg6CnzeyzDMP2OPOL5vMbZWARhHKMjo9Bk0ploe5Uo9/AdqUpVE6ZVv6eNF11R2HlVjrFe0kjSCN 6+sjzEC+u97RyUOk2gloeqjbI+S/jV7MVQTaOjjw5Qu8woqBs7j5jxMOxJgMhkt4HsU2pYyKQntCx 4oX3wA0DdStv2XvFjckxWN2ACPP6PRVywPetlRWRh5IiSUf1hFgEY1r8NBMLPaFyQ6epLs7e7tX4k K34sBiZbuxSpFmd/7PrAwsFiDy8daVeB1kozg5mImuFDHwWCq/37sTEr3vsl4RoRK+sJzRZFVzeK3 cs7+Oy/ZI2C+G8ln8HrA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMpNr-00019J-IL; Tue, 22 Oct 2019 08:19:15 +0000 Received: from mta4.mail.slb.com ([192.23.68.89]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMpNo-00018Y-Qn for linux-mtd@lists.infradead.org; Tue, 22 Oct 2019 08:19:14 +0000 Received: from pps.filterd (us1190pfpoint09.mail.slb.com [127.0.0.1]) by us1190pfpoint09.mail.slb.com (8.16.0.27/8.16.0.27) with SMTP id x9M8DNBZ021388; Tue, 22 Oct 2019 08:19:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=slb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=20180320pps; bh=Srw8mBTghadJ5UhaxRpQWzFH/AFDWbxSuV7u7Nb3mK0=; b=RyEgSxlwx08FVLZKKcHtR+zul+yv38E+GKMkeNL0MYHbq57LVgLP5ISplWeLhuT3aqMq nHb/y7jZJLVycCPpZwJRcqf+tkG4q1er6Wy9neYJ9ABzBhIUdcZpwRjBqoMrEziYS3iE 3aLolPAnne3mISlRzjvq9HOIAaBhrxOydCK6qnWxSjQI/2EZ7QF4hMZEt8Zh6NowQWRA pkx1uEg+4T3ocRZQ5wjfIm+n9SZQb0OFC19J/AoRQOIhUm2brIb/bvoYEiaUq0MmGFTl qirF6EIG4pqTYwHIym7YpsKMTGcxz56YfU+JZNIbahQ00dO4CDV5Moc9DDu1okKx9MdA PQ== Received: from mmsbuildserver2.dir.slb.com ([136.254.53.89]) by us1190pfpoint09.mail.slb.com with ESMTP id 2vqu80vhyd-1; Tue, 22 Oct 2019 08:19:04 +0000 From: aabyzov@slb.com To: linux-mtd@lists.infradead.org Subject: [PATCH v2] flashcp: Add option -A/--erase-all Date: Tue, 22 Oct 2019 10:18:57 +0200 Message-Id: <20191022081857.128874-1-aabyzov@slb.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-10-22_03:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191022_011912_960185_6BE32E20 X-CRM114-Status: GOOD ( 14.55 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [192.23.68.89 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrij Abyzov Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Andrij Abyzov Sometimes there's a need to erase the whole device when programming an image, and not just the area under the image itself. Therefore, option -A/--erase-all has been added which erases the whole device before writing the image. Signed-off-by: Andrij Abyzov --- misc-utils/flashcp.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c index c46a5b4..b6ad2f9 100644 --- a/misc-utils/flashcp.c +++ b/misc-utils/flashcp.c @@ -66,6 +66,7 @@ #define FLAG_HELP 0x02 #define FLAG_FILENAME 0x04 #define FLAG_DEVICE 0x08 +#define FLAG_ERASE_ALL 0x10 /* error levels */ #define LOG_NORMAL 1 @@ -89,12 +90,13 @@ static NORETURN void showusage(bool error) "\n" "Flash Copy - Written by Abraham van der Merwe \n" "\n" - "usage: %1$s [ -v | --verbose ] \n" + "usage: %1$s [ -v | --verbose | -A | --erase-all ] \n" " %1$s -h | --help\n" " %1$s -V | --version\n" "\n" " -h | --help Show this help message\n" " -v | --verbose Show progress reports\n" + " -A | --erase-all Erases the whole device regardless of the image size\n" " -V | --version Show version information and exit\n" " File which you want to copy to flash\n" " Flash device to write to (e.g. /dev/mtd0, /dev/mtd1, etc.)\n" @@ -179,10 +181,11 @@ int main (int argc,char *argv[]) for (;;) { int option_index = 0; - static const char *short_options = "hvV"; + static const char *short_options = "hvAV"; static const struct option long_options[] = { {"help", no_argument, 0, 'h'}, {"verbose", no_argument, 0, 'v'}, + {"erase-all", no_argument, 0, 'A'}, {"version", no_argument, 0, 'V'}, {0, 0, 0, 0}, }; @@ -202,6 +205,10 @@ int main (int argc,char *argv[]) flags |= FLAG_VERBOSE; DEBUG("Got FLAG_VERBOSE\n"); break; + case 'A': + flags |= FLAG_ERASE_ALL; + DEBUG("Got FLAG_ERASE_ALL\n"); + break; case 'V': common_print_version(); exit(EXIT_SUCCESS); @@ -257,8 +264,16 @@ int main (int argc,char *argv[]) #warning "Check for smaller erase regions" erase.start = 0; - erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; - erase.length *= mtd.erasesize; + + if (flags & FLAG_ERASE_ALL) + { + erase.length = mtd.size; + } + else + { + erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; + erase.length *= mtd.erasesize; + } if (flags & FLAG_VERBOSE) {