From patchwork Tue Dec 24 16:51:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1215257 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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="ksMyjG/+"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 47j2Lk46Mjz9sPn for ; Wed, 25 Dec 2019 03:51:58 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B4D0815A2; Tue, 24 Dec 2019 17:51:51 +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="ksMyjG/+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DFFE1815A2; Tue, 24 Dec 2019 17:51:49 +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-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 58933815DC for ; Tue, 24 Dec 2019 17:51:44 +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-wr1-x441.google.com with SMTP id y11so20250531wrt.6 for ; Tue, 24 Dec 2019 08:51:44 -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=Mw19+srLRj7YLbbsFLsCwdM9jUfVU+jv9+xDjPtLRTA=; b=ksMyjG/+94iEO7nC0+N1ivd0eFQw1HiEYQYCMZlNPU1cUbLtMP6TAckPHjehpj1mZm 597BnajRpGIKx5kB1uCASwyE2QKA7vfLcwcm1IH6zE9hYP9+ETYSDFoLLWrm8VKuxMiJ JhIJfF2oZxzKiqM2mspkZb3vrrnHUROL5dpm/vXxnPhbrAnNm5WjYA79f1gTSgLOOpP9 QwQ8Z5fStxGV52itSlZIKLqI1qKoTK5yjhX3pndm6t1N6oYVoyRGig8vyiT4xtqtLbGt NBuiPR3gI3ismDFVyFAJHViQgoqbdo5MJiCFR4RBPb3ldtav+W9zVpowqbESXK/ZlsEG hGgA== 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=Mw19+srLRj7YLbbsFLsCwdM9jUfVU+jv9+xDjPtLRTA=; b=H0hlIK6UaP7iAbXyFwBIjz3VMA1OGk92voZZtjMAXbZO0AwnQpzIpaGYOZOo/y51pJ 32cBvg/AJDUowA/xUNhejUpVd25glfjz2NulpGX0rNwX42Adh4aH4/1lWB6ENU1DiJ8z Er9rHKVEfo4Xtpa8XKrl2H30It3m1GVbkGBc8pC17PBG5O6WUR0MGUVs9JHxGYPkLf7T hnbJckLXWCYsgYnyqW8kI8bVv2OAojA0o3zz7di828KGfThQm1x5Xnju+hAToqktPuRW Y/+2o/WuXeOkRtnETYOycmigvqU1qKtbsKJoM17TXs0LSYZ2fq06hR4NSG8WBxItkIYm hAFQ== X-Gm-Message-State: APjAAAW+YOh8QTXTuHiJfWCOsBuENniW8hisC1cYj5e0qRX3wfwElOxX Ecnl3FQIbUBppKeovlMJtNE= X-Google-Smtp-Source: APXvYqwShYs0ebTP5jbcYFnqrBJ0sweKBk2flqGiq0yEgW25XuBZcjREX8Bq9B5JCO3pEKwh/nPJZg== X-Received: by 2002:adf:90e1:: with SMTP id i88mr34497946wri.95.1577206303887; Tue, 24 Dec 2019 08:51:43 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 08:51:43 -0800 (PST) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Sam Protsenko , u-boot@lists.denx.de Subject: [PATCH 1/3] dtimg/am57xx_evm_defconfig: Rename dtimg to adtimg Date: Tue, 24 Dec 2019 17:51:06 +0100 Message-Id: <20191224165108.2836-2-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 Rename the existing 'dtimg' command to 'adtimg', in order to: - Suggest the Android origins and scope - Be consistent with the upcoming 'abootimg' command (naming suggested by Simon [*]) The change in _not_ backward compatible, but its benefits outweigh its downsides, given that we don't expect active users of 'dtimg' today. Perform the rename in several steps: 1. Rename *.c file and Kconfig symbol. This should allow 'git log --follow' to properly track the history of 'adtimg.c' 2. 's/dtimg/adtimg/g' in the internal namespace of 'adtimg.c' ELF comparison [**] before and after shows no functional change. [*] https://patchwork.ozlabs.org/patch/1182212/#2291600 [**] diff -u <(objdump -d cmd/dtimg.o) <(objdump -d cmd/adtimg.o) Cc: Tom Rini Cc: Sam Protsenko Cc: Simon Glass Signed-off-by: Eugeniu Rosca Reviewed-by: Simon Glass --- cmd/Kconfig | 4 ++-- cmd/Makefile | 2 +- cmd/{dtimg.c => adtimg.c} | 0 common/Makefile | 2 +- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- configs/am57xx_hs_evm_usb_defconfig | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename cmd/{dtimg.c => adtimg.c} (100%) diff --git a/cmd/Kconfig b/cmd/Kconfig index 1e4cf146c509..f63adbdc3a31 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -348,8 +348,8 @@ config CMD_BOOTMENU help Add an ANSI terminal boot menu command. -config CMD_DTIMG - bool "dtimg" +config CMD_ADTIMG + bool "adtimg" help Android DTB/DTBO image manipulation commands. Read dtb/dtbo files from image into RAM, dump image structure information, etc. Those dtb/dtbo diff --git a/cmd/Makefile b/cmd/Makefile index 3ac710454652..c17ee20b25c6 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_CMD_SOUND) += sound.o ifdef CONFIG_POST obj-$(CONFIG_CMD_DIAG) += diag.o endif -obj-$(CONFIG_CMD_DTIMG) += dtimg.o +obj-$(CONFIG_CMD_ADTIMG) += adtimg.o obj-$(CONFIG_CMD_ECHO) += echo.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o obj-$(CONFIG_CMD_EEPROM) += eeprom.o diff --git a/cmd/dtimg.c b/cmd/adtimg.c similarity index 100% rename from cmd/dtimg.c rename to cmd/adtimg.c diff --git a/common/Makefile b/common/Makefile index 302d8beaf356..029cc0f2ce6b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -117,7 +117,7 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o -obj-$(CONFIG_CMD_DTIMG) += image-android-dt.o +obj-$(CONFIG_CMD_ADTIMG) += image-android-dt.o ifdef CONFIG_CMD_EEPROM_LAYOUT obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index ae183e9b562c..0c6a2e9193b9 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -29,7 +29,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_CMD_DTIMG=y +CONFIG_CMD_ADTIMG=y CONFIG_CMD_SPL=y CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 800ec6c70b92..3c57dfb031a9 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -32,7 +32,7 @@ CONFIG_SPL_DMA_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 -CONFIG_CMD_DTIMG=y +CONFIG_CMD_ADTIMG=y CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index f2cbf2fe2ba1..87f391c2b029 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -37,7 +37,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_SPL_USB_GADGET=y CONFIG_SPL_DFU=y CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_CMD_DTIMG=y +CONFIG_CMD_ADTIMG=y CONFIG_CMD_BCB=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set 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" From patchwork Tue Dec 24 16:51:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1215259 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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="q7ZkKQJA"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 47j2M30PcYz9sPn for ; Wed, 25 Dec 2019 03:52:14 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4B5A81677; Tue, 24 Dec 2019 17:52:04 +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="q7ZkKQJA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF3D681657; Tue, 24 Dec 2019 17:52:02 +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-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 E103D81672 for ; Tue, 24 Dec 2019 17:51:58 +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-wr1-x436.google.com with SMTP id q10so20245660wrm.11 for ; Tue, 24 Dec 2019 08:51:58 -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=wjKw7MtcUOTlNuCiho2oyVSeqolWAvHHNUP4FQDUkfU=; b=q7ZkKQJAYIbHXjKk/aLy5B1AHrc61p28jWmSWqL0tIXe8umUJnsoelAm2ut7C2JMGm 4E2R3p+q4JmmfpGD7WZxjC4A+jx3rGOVtK2Mfmz1FiYYH+SilhY0yB6T+M7G33Tzsxfb 6Frwn7n7vcZQjC549oCmvh5vl5b3+aJtPuyUhn0ZTcKNHOdusTbhxAWznVjvtbEfJ5Mt NsJssVYFl+SKhvMMEb5MYoDEv996X5ULRAUJVD1sqHOMVCIW3h1ZIQVRbLLjGmlNmdoH DL3QzZvCFOycsoFtEkx7geoiAroUdycGgc5H5l+1ctVCRdPZKCc2uBLLqLfSE1LhacbI 4/5w== 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=wjKw7MtcUOTlNuCiho2oyVSeqolWAvHHNUP4FQDUkfU=; b=rz4K5ux0/KuDZE8h5xjeAOB/7Px1KWFStrXtFt36Pzte2inssXORcdHc4yuRU5aSX9 6DtpnbXdNcxTFfFgn+6VDCpXffaCD3Hd5CCcENzi/4+TVSS5G1JaIZTljMTEfCeFfJLN PjtKQ5GtYntizvjml2ncSKp/23aBu+06uCyvF15unY9kSBd2uILShNJStkqi820FEdgj p/KRrJWQ5glBK1WTssR9/6s5vKjg6ZPCg6ipAtEgs50XxgCiQRE2oDchDmQQmMuZiMuV CFTbaBuPpuX+FKEJ6be4P1WZc1G9Irg/PXWY1+E2jEnwLPo+ZcGS2jkQCSsYnmeh1YLV OS1Q== X-Gm-Message-State: APjAAAUElK6A3tF7tsBfoao3OyF8lfp7N290v6eYx/cSBRxlKyUXxsQr keTrn5BJ1YgoaMVWWZN2XXQ= X-Google-Smtp-Source: APXvYqwoQl9jdnSpwegWuljF1OAbs+zzlWcZso9JcXVAQhevLutOab7CU0QI/HhVKSps1N42Z8XY4A== X-Received: by 2002:adf:e70d:: with SMTP id c13mr36375857wrm.248.1577206318391; Tue, 24 Dec 2019 08:51:58 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 08:51:58 -0800 (PST) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Sam Protsenko , u-boot@lists.denx.de Subject: [PATCH 3/3] cmd: adtimg: Refactor usage style Date: Tue, 24 Dec 2019 17:51:08 +0100 Message-Id: <20191224165108.2836-4-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 Trying to extend 'adtimg' functionality [1], we've been severely hit by a major limitation in the command's usage scheme. Specifically, the command's user interface appears to be too centric to getting the DTB/DTBO entry [3] based on the index of the desired DT in the image, which makes it really difficult retrieving the DT entry based on alternative criteria (e.g. filtering by id/rev fields), the latter being demanded by real life customer use-cases [1]. This went to the point of receiving below feedback from Sam [2]: -- snip -- As for 'dtimg' command: after giving it some thought, I think not much people using it yet. So in this particular case I don't have some strong preference, and if you think the 'dtimg' interface is ugly, and it overcomes "don't break interfaces" rule, maybe now is a good time to rework it (before it gets widely used). -- snip -- Given the above, rework the usage pattern from [4] to [5], in order to allow an intuitive enablement of "by id|rev" DT search [6]. [1] https://patchwork.ozlabs.org/cover/1202575/ ("cmd: dtimg: Enhance with --id and --rev options (take #1)") [2] https://patchwork.ozlabs.org/patch/1182207/#2317020 [3] https://source.android.com/devices/architecture/dto/partitions [4] Old usage adtimg dump - Print image contents adtimg start - Get DT address by index adtimg size - Get DT size by index [5] New usage adtimg addr - Set image location to adtimg dump - Print out image contents adtimg get dt --index= [avar [svar]] - Get DT address and size by index [6] Soon-to-be-provided "by id|rev" add-on functionality adtimg get dt --id= --rev= [avar [svar [ivar]]] - Get DT address/size/index by id|rev fields Cc: Sam Protsenko Signed-off-by: Eugeniu Rosca --- cmd/adtimg.c | 217 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 158 insertions(+), 59 deletions(-) diff --git a/cmd/adtimg.c b/cmd/adtimg.c index 22b4f5e1a83f..60bb01c3498a 100644 --- a/cmd/adtimg.c +++ b/cmd/adtimg.c @@ -2,18 +2,22 @@ /* * (C) Copyright 2018 Linaro Ltd. * Sam Protsenko + * Eugeniu Rosca */ #include #include #include -enum cmd_adtimg_info { - CMD_ADTIMG_START = 0, - CMD_ADTIMG_SIZE, -}; +#define OPT_INDEX "--index" -static int do_adtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, +/* + * Current/working DTB/DTBO Android image address. + * Similar to 'working_fdt' variable in 'fdt' command. + */ +static ulong working_img; + +static int do_adtimg_addr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char *endp; @@ -24,86 +28,185 @@ static int do_adtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, hdr_addr = simple_strtoul(argv[1], &endp, 16); if (*endp != '\0') { - printf("Error: Wrong image address\n"); + printf("Error: Wrong image address '%s'\n", argv[1]); return CMD_RET_FAILURE; } - if (!android_dt_check_header(hdr_addr)) { - printf("Error: DT image header is incorrect\n"); + /* + * Allow users to set an address prior to copying the DTB/DTBO + * image to that same address, i.e. skip header verification. + */ + + working_img = hdr_addr; + return CMD_RET_SUCCESS; +} + +static int adtimg_check_working_img(void) +{ + if (!working_img) { + printf("Error: Please, call 'adtimg addr '. Aborting!\n"); return CMD_RET_FAILURE; } - android_dt_print_contents(hdr_addr); + if (!android_dt_check_header(working_img)) { + printf("Error: Invalid image header at 0x%lx\n", working_img); + return CMD_RET_FAILURE; + } return CMD_RET_SUCCESS; } -static int adtimg_get_fdt(int argc, char * const argv[], - enum cmd_adtimg_info cmd) +static int do_adtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { - ulong hdr_addr; - u32 index; - char *endp; - ulong fdt_addr; - u32 fdt_size; - char buf[65]; - - if (argc != 4) + if (argc != 1) return CMD_RET_USAGE; - hdr_addr = simple_strtoul(argv[1], &endp, 16); - if (*endp != '\0') { - printf("Error: Wrong image address\n"); + if (adtimg_check_working_img() != CMD_RET_SUCCESS) + return CMD_RET_FAILURE; + + android_dt_print_contents(working_img); + + return CMD_RET_SUCCESS; +} + +static int adtimg_getopt_u32(char * const opt, char * const name, u32 *optval) +{ + char *endp, *str; + u32 val; + + if (!opt || !name || !optval) + return CMD_RET_FAILURE; + + str = strchr(opt, '='); + if (!str) { + printf("Error: Option '%s' not followed by '='\n", name); return CMD_RET_FAILURE; } - if (!android_dt_check_header(hdr_addr)) { - printf("Error: DT image header is incorrect\n"); + if (*++str == '\0') { + printf("Error: Option '%s=' not followed by value\n", name); return CMD_RET_FAILURE; } - index = simple_strtoul(argv[2], &endp, 0); + val = simple_strtoul(str, &endp, 0); if (*endp != '\0') { - printf("Error: Wrong index\n"); + printf("Error: Wrong integer value '%s=%s'\n", name, str); return CMD_RET_FAILURE; } - if (!android_dt_get_fdt_by_index(hdr_addr, index, &fdt_addr, &fdt_size)) + *optval = val; + return CMD_RET_SUCCESS; +} + +static int adtimg_getopt_index(int argc, char * const argv[], u32 *index, + char **avar, char **svar) +{ + int ret; + + if (!argv || !avar || !svar) return CMD_RET_FAILURE; - switch (cmd) { - case CMD_ADTIMG_START: - snprintf(buf, sizeof(buf), "%lx", fdt_addr); - break; - case CMD_ADTIMG_SIZE: - snprintf(buf, sizeof(buf), "%x", fdt_size); - break; - default: - printf("Error: Unknown cmd_adtimg_info value: %d\n", cmd); + if (argc > 3) { + printf("Error: Unexpected argument '%s'\n", argv[3]); return CMD_RET_FAILURE; } - env_set(argv[3], buf); + ret = adtimg_getopt_u32(argv[0], OPT_INDEX, index); + if (ret != CMD_RET_SUCCESS) + return ret; + + if (argc > 1) + *avar = argv[1]; + if (argc > 2) + *svar = argv[2]; return CMD_RET_SUCCESS; } -static int do_adtimg_start(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int adtimg_get_dt_by_index(int argc, char * const argv[]) { - return adtimg_get_fdt(argc, argv, CMD_ADTIMG_START); + ulong addr; + u32 index, size; + int ret; + char *avar = NULL, *svar = NULL; + + ret = adtimg_getopt_index(argc, argv, &index, &avar, &svar); + if (ret != CMD_RET_SUCCESS) + return ret; + + if (!android_dt_get_fdt_by_index(working_img, index, &addr, &size)) + return CMD_RET_FAILURE; + + if (avar && svar) { + ret = env_set_hex(avar, addr); + if (ret) { + printf("Error: Can't set '%s' to 0x%lx\n", avar, addr); + return CMD_RET_FAILURE; + } + ret = env_set_hex(svar, size); + if (ret) { + printf("Error: Can't set '%s' to 0x%x\n", svar, size); + return CMD_RET_FAILURE; + } + } else if (avar) { + ret = env_set_hex(avar, addr); + if (ret) { + printf("Error: Can't set '%s' to 0x%lx\n", avar, addr); + return CMD_RET_FAILURE; + } + printf("0x%x (%d)\n", size, size); + } else { + printf("0x%lx, 0x%x (%d)\n", addr, size, size); + } + + return CMD_RET_SUCCESS; } -static int do_adtimg_size(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int adtimg_get_dt(int argc, char * const argv[]) { - return adtimg_get_fdt(argc, argv, CMD_ADTIMG_SIZE); + if (argc < 2) { + printf("Error: No options passed to '%s'\n", argv[0]); + return CMD_RET_FAILURE; + } + + /* Strip off leading 'dt' command argument */ + argc--; + argv++; + + if (!strncmp(argv[0], OPT_INDEX, sizeof(OPT_INDEX) - 1)) + return adtimg_get_dt_by_index(argc, argv); + + printf("Error: Option '%s' not supported\n", argv[0]); + return CMD_RET_FAILURE; +} + +static int do_adtimg_get(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + if (argc < 2) { + printf("Error: No arguments passed to '%s'\n", argv[0]); + return CMD_RET_FAILURE; + } + + if (adtimg_check_working_img() != CMD_RET_SUCCESS) + return CMD_RET_FAILURE; + + /* Strip off leading 'get' command argument */ + argc--; + argv++; + + if (!strcmp(argv[0], "dt")) + return adtimg_get_dt(argc, argv); + + printf("Error: Wrong argument '%s'\n", argv[0]); + return CMD_RET_FAILURE; } 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, "", ""), + U_BOOT_CMD_MKENT(addr, CONFIG_SYS_MAXARGS, 1, do_adtimg_addr, "", ""), + U_BOOT_CMD_MKENT(dump, CONFIG_SYS_MAXARGS, 1, do_adtimg_dump, "", ""), + U_BOOT_CMD_MKENT(get, CONFIG_SYS_MAXARGS, 1, do_adtimg_get, "", ""), }; static int do_adtimg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -127,17 +230,13 @@ static int do_adtimg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( 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" - "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" - "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" - " : name of variable where to store size of FDT" + "addr - Set image location to \n" + "adtimg dump - Print out image contents\n" + "adtimg get dt --index= [avar [svar]] - Get DT address/size by index\n" + "\n" + "Legend:\n" + " - : DTB/DTBO image address (hex) in RAM\n" + " - : index (hex/dec) of desired DT in the image\n" + " - : variable name to contain DT address (hex)\n" + " - : variable name to contain DT size (hex)" );