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