From patchwork Tue Dec 24 16:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1215258 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MSZVLc9K"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47j2Lr6QZhz9sPn for ; Wed, 25 Dec 2019 03:52:04 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37A4F8163F; Tue, 24 Dec 2019 17:51:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MSZVLc9K"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B229981672; Tue, 24 Dec 2019 17:51:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DFED9815DC for ; Tue, 24 Dec 2019 17:51:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=roscaeugeniu@gmail.com Received: by mail-wm1-x343.google.com with SMTP id t14so2887953wmi.5 for ; Tue, 24 Dec 2019 08:51:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a/z/DjfeCOhiBxSb0gIzSo/HPm2P0tCiS7v/n5NcB7g=; b=MSZVLc9Klzp5j+fvWr7SW7DOoi4cGpvS9u4m1txpj6fIOx67UTPRKNDCPBGtpU4jt0 Vur+53EgUsxe4KuAuffz5vWLlehoqjBXvWE6P5f/HPjpxJFQQxFCLVMJGisUf2sITt0i v6XjreXz7Cgr1GJwuD3eceg9TnYenndJuHDa5+vz8HsB8nsgmvXdO+6Ww15fTme8vVn3 8lYD5RPo8fAEUBpbR+17HLEci3pdg5rFMgAp253pKLXRvOjLJhKqsdtDY02d9UQLvAtr a1elqf+XCm20LaWB3L6+ebSGuu5LN5EzDAs5QKflhj9c0uVV7qdOMi1x7rP24VwcLp74 lveQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/z/DjfeCOhiBxSb0gIzSo/HPm2P0tCiS7v/n5NcB7g=; b=nheEqh+GykHBJhSU9Qw5rN7tlDYrmqriOzs7ymsMBWldCamoM7ZJBIlNvAD9+Q3OjJ DpBCQkuUCeuBDqQ/wpNKZHb6sfO/EfS8Lin8wvJnYC6tsK0l5HB3dSjxBHl+BqTZUh4g kGj8AvtAso8/hvgNegf3du06bNMk5FtkjmS5G53W7Gfka0BWKZbPlRle4OH8PWyK+mmA NseKBYLGQf244cq5xdj+2HW1kXVncKFwGDXLVSUhts9XpjwyuTiSIRuGNzBBILTUApil d8rBkZvpkXih/RBHs13N8gm0qurmOgmhW/94Vk8tAkSj8A5EV1twz7+xrV0Iio8N40IP OQ2Q== X-Gm-Message-State: APjAAAVdOEvK1m3kwScklQsHEMaUdeOvEIEONp2NBf0jBqhDv2l+O+sb P18P+dofhTqztAlBrZhek5w= X-Google-Smtp-Source: APXvYqx3uChjKhUuAfvT3qqKgxiMJVDvPJTGkes088eqsfiKKHngENjhpTRCiciU3d8Nv3wq8JN3iA== X-Received: by 2002:a05:600c:54b:: with SMTP id k11mr5009459wmc.63.1577206313498; Tue, 24 Dec 2019 08:51:53 -0800 (PST) Received: from erosca.fritz.box (x4e37979c.dyn.telefonica.de. [78.55.151.156]) by smtp.gmail.com with ESMTPSA id s128sm3136376wme.39.2019.12.24.08.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 08:51:53 -0800 (PST) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Sam Protsenko , u-boot@lists.denx.de Subject: [PATCH 2/3] cmd: adtimg: Rename internal symbols Date: Tue, 24 Dec 2019 17:51:07 +0100 Message-Id: <20191224165108.2836-3-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191224165108.2836-1-erosca@de.adit-jv.com> References: <20191224165108.2836-1-erosca@de.adit-jv.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Rini , Eugeniu Rosca , Eugeniu Rosca Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean With 'dtimg.c' renamed to 'adtimg.c', now ensure the naming consistency in the internal implementation of 'adtimg.c'. No functional change intended. Cc: Sam Protsenko Signed-off-by: Eugeniu Rosca Reviewed-by: Simon Glass --- cmd/adtimg.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/cmd/adtimg.c b/cmd/adtimg.c index 6c5d53cc6808..22b4f5e1a83f 100644 --- a/cmd/adtimg.c +++ b/cmd/adtimg.c @@ -8,13 +8,13 @@ #include #include -enum cmd_dtimg_info { - CMD_DTIMG_START = 0, - CMD_DTIMG_SIZE, +enum cmd_adtimg_info { + CMD_ADTIMG_START = 0, + CMD_ADTIMG_SIZE, }; -static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_adtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { char *endp; ulong hdr_addr; @@ -38,7 +38,8 @@ static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, return CMD_RET_SUCCESS; } -static int dtimg_get_fdt(int argc, char * const argv[], enum cmd_dtimg_info cmd) +static int adtimg_get_fdt(int argc, char * const argv[], + enum cmd_adtimg_info cmd) { ulong hdr_addr; u32 index; @@ -71,14 +72,14 @@ static int dtimg_get_fdt(int argc, char * const argv[], enum cmd_dtimg_info cmd) return CMD_RET_FAILURE; switch (cmd) { - case CMD_DTIMG_START: + case CMD_ADTIMG_START: snprintf(buf, sizeof(buf), "%lx", fdt_addr); break; - case CMD_DTIMG_SIZE: + case CMD_ADTIMG_SIZE: snprintf(buf, sizeof(buf), "%x", fdt_size); break; default: - printf("Error: Unknown cmd_dtimg_info value: %d\n", cmd); + printf("Error: Unknown cmd_adtimg_info value: %d\n", cmd); return CMD_RET_FAILURE; } @@ -87,31 +88,31 @@ static int dtimg_get_fdt(int argc, char * const argv[], enum cmd_dtimg_info cmd) return CMD_RET_SUCCESS; } -static int do_dtimg_start(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_adtimg_start(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { - return dtimg_get_fdt(argc, argv, CMD_DTIMG_START); + return adtimg_get_fdt(argc, argv, CMD_ADTIMG_START); } -static int do_dtimg_size(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_adtimg_size(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { - return dtimg_get_fdt(argc, argv, CMD_DTIMG_SIZE); + return adtimg_get_fdt(argc, argv, CMD_ADTIMG_SIZE); } -static cmd_tbl_t cmd_dtimg_sub[] = { - U_BOOT_CMD_MKENT(dump, 2, 0, do_dtimg_dump, "", ""), - U_BOOT_CMD_MKENT(start, 4, 0, do_dtimg_start, "", ""), - U_BOOT_CMD_MKENT(size, 4, 0, do_dtimg_size, "", ""), +static cmd_tbl_t cmd_adtimg_sub[] = { + U_BOOT_CMD_MKENT(dump, 2, 0, do_adtimg_dump, "", ""), + U_BOOT_CMD_MKENT(start, 4, 0, do_adtimg_start, "", ""), + U_BOOT_CMD_MKENT(size, 4, 0, do_adtimg_size, "", ""), }; -static int do_dtimg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_adtimg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { cmd_tbl_t *cp; - cp = find_cmd_tbl(argv[1], cmd_dtimg_sub, ARRAY_SIZE(cmd_dtimg_sub)); + cp = find_cmd_tbl(argv[1], cmd_adtimg_sub, ARRAY_SIZE(cmd_adtimg_sub)); - /* Strip off leading 'dtimg' command argument */ + /* Strip off leading 'adtimg' command argument */ argc--; argv++; @@ -124,17 +125,17 @@ static int do_dtimg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } U_BOOT_CMD( - dtimg, CONFIG_SYS_MAXARGS, 0, do_dtimg, + adtimg, CONFIG_SYS_MAXARGS, 0, do_adtimg, "manipulate dtb/dtbo Android image", "dump \n" " - parse specified image and print its structure info\n" " : image address in RAM, in hex\n" - "dtimg start \n" + "adtimg start \n" " - get address (hex) of FDT in the image, by index\n" " : image address in RAM, in hex\n" " : index of desired FDT in the image\n" " : name of variable where to store address of FDT\n" - "dtimg size \n" + "adtimg size \n" " - get size (hex, bytes) of FDT in the image, by index\n" " : image address in RAM, in hex\n" " : index of desired FDT in the image\n"