From patchwork Thu Apr 19 20:51:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 133845 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp1079184ljf; Thu, 19 Apr 2018 13:52:27 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+oqljAcUCqU16rfzt4bypT1sOJ+31JlcxUxIBZC/q68m5KGBiKBLN0m/GxFnZOyeK57TCn X-Received: by 10.80.135.238 with SMTP id 43mr10525996edz.1.1524171147622; Thu, 19 Apr 2018 13:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524171147; cv=none; d=google.com; s=arc-20160816; b=f0lmLr9leNaG0sYtavd7m1kwSoqTwaXdYqpiZ1mOwgV5wP+O3TN2TYCSymdnLv5Vbb n6xKVl+S2JtBuGatIQNeRvFqv+3qu13wYBKvvaumSK0kfC/SvgZKq3c+ZXlYiNvBTWXF zy6TxTC2/a0eb0ho+0BZW/lfGU2G8HonKLracz1BcM0jxSpsp7hHwMB/jo+QdwyB4w7/ GbG9sylzcV668RdcPwOInuXbT02J4lk5imEUuILD8ZGnoe4s5eJIvMUB3x833aCjILPD Bmi0bvT5PJLiqo8cpD7+xRxfByq3qsxLzexJWYpZnplcWin1mYMB92wDimNOeGy5XSnx VyEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:arc-authentication-results; bh=yz+cneoP2jYSIcgrVDVi86xyo6PJdSJ3I8r7rnGsl2E=; b=Xr1UVQ8YtqPbCIP0TsOBHPno4v6Riu/VLWrYHHzubSw6YWvtkFu5GoBWgayf9lun4m hXMO9CcUuj3A4taj12L6FjMJ+S0Gj0+bQqCC9Ux6sOybXlAhvngyXn+ADgDNNSs7yp20 8pwp/btqE1VwnlIYwYqgrOAt33+u9KZLnXTHGPg3mQUeRLXhH0k6/uz0E7idn9AD3yEN OLehllEUBQ64rsAs2sHe+/eqAwkdqaCh8mFp2C37YEza/8u6Lxmgu/65fC32XX86zsHM lInvFWgioCa0qYOuNQqZgfVjtEZXPDiRF3/CMYkAdjJENX55AAaM4Gs9J/q+/Q+MWalA Sx/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=h0O/OeUr; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id r15si3941400edb.30.2018.04.19.13.52.27; Thu, 19 Apr 2018 13:52:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=h0O/OeUr; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 19483C21FB7; Thu, 19 Apr 2018 20:52:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F1611C21FCF; Thu, 19 Apr 2018 20:51:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2F055C21E2B; Thu, 19 Apr 2018 20:51:42 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.denx.de (Postfix) with ESMTPS id CC3D0C21C38 for ; Thu, 19 Apr 2018 20:51:41 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id d20-v6so2124423lfe.3 for ; Thu, 19 Apr 2018 13:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UYTSfhMZ7NJg2UloN7jaj1GlIX/HrLxVsKXZ39kyEhk=; b=h0O/OeUrPbgnqBKBDzzBlHCwK8GsRAh9us0AsbWl4hoH+2kMslB3Q9Sp98cWHGqcdA kA5mV5qj1a5h/Im8dxvGp/3eF5RTeWAB904Zcxuo6br4e8EOvjTRE0tXVR00Ep+vMuMK kTJU3afPfQP3GFq4gjTahjP+6bPyldJZsBmbk= 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; bh=UYTSfhMZ7NJg2UloN7jaj1GlIX/HrLxVsKXZ39kyEhk=; b=gm4li8eH7lYtdqZcquQEia2pQ+3OZKAyP2Vlsx44qxvXTqgHR7c7j4710834QbKyfq 7HtCi6qI8aHa2RW08Lrf//JroR635ZynZCxFQxHP00A70MakhqRHYud4Ml/P07xwHpws 0MiY1FZyNLSwe+ZpmpQ9ah4dP4Saq3FqgJoLLqJ9uezldswh5538ImwrzP9CHW5BX+UZ TBlxdHnpDZaqtQLtsrP2fWRnsMHRLHe0dCEL07ZYYjjs/yrI1pSdLSQx+mFWcyADsNen X9Ez1ojsw+aHJYoPCxjG5I/l5h8m9w9e//lKpS7zDZ41v87MK0JnDMMrEyORvNClgNJD Z4Uw== X-Gm-Message-State: ALQs6tAXDpjALDhIksXv9pEa3js4oDOwOR+M6iUs55By6jlRVQRWt+8+ X5gnm57mowQqCW3XOCoZ1VWKlW/SUKc= X-Received: by 10.46.156.68 with SMTP id t4mr5385000ljj.86.1524171100879; Thu, 19 Apr 2018 13:51:40 -0700 (PDT) Received: from localhost ([195.238.92.132]) by smtp.gmail.com with ESMTPSA id x21sm763892ljj.54.2018.04.19.13.51.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Apr 2018 13:51:40 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Thu, 19 Apr 2018 23:51:37 +0300 Message-Id: <20180419205137.29182-2-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419205137.29182-1-semen.protsenko@linaro.org> References: <20180419205137.29182-1-semen.protsenko@linaro.org> Cc: Amit Pundir , Tom Rini , Praneeth Bajjuri , John Stultz , Sumit Semwal Subject: [U-Boot] [PATCH v2 2/2] cmd: Add dtimg command X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" dtimg command allows user to work with Android DTB/DTBO image format. Such as, getting the address of desired DTB/DTBO file, printing the dump of the image in U-Boot shell, etc. This command is needed to provide Android boot with new Android DT image format further. Signed-off-by: Sam Protsenko Reviewed-by: Alex Deymo --- cmd/Kconfig | 8 +++ cmd/Makefile | 1 + cmd/dtimg.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ common/Makefile | 4 ++ 4 files changed, 155 insertions(+) create mode 100644 cmd/dtimg.c diff --git a/cmd/Kconfig b/cmd/Kconfig index bc1d2f31c0..68f3cc7b48 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -256,6 +256,14 @@ config CMD_BOOTMENU help Add an ANSI terminal boot menu command. +config CMD_DTIMG + bool "dtimg" + help + Android DTB/DTBO image manipulation commands. Read dtb/dtbo files from + image into RAM, dump image structure information, etc. Those dtb/dtbo + files should be merged in one dtb further, which needs to be passed to + the kernel, as part of a boot process. + config CMD_ELF bool "bootelf, bootvx" default y diff --git a/cmd/Makefile b/cmd/Makefile index c4269ac8ac..1cc2e74e9e 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -43,6 +43,7 @@ ifdef CONFIG_POST obj-$(CONFIG_CMD_DIAG) += diag.o endif obj-$(CONFIG_CMD_DISPLAY) += display.o +obj-$(CONFIG_CMD_DTIMG) += dtimg.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/dtimg.c new file mode 100644 index 0000000000..5295a341ad --- /dev/null +++ b/cmd/dtimg.c @@ -0,0 +1,142 @@ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +enum cmd_dtimg_info { + CMD_DTIMG_START = 0, + CMD_DTIMG_SIZE, +}; + +static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + char *endp; + ulong hdr_addr; + + if (argc != 2) + return CMD_RET_USAGE; + + hdr_addr = simple_strtoul(argv[1], &endp, 16); + if (*endp != '\0') { + printf("Error: Wrong image address\n"); + return CMD_RET_FAILURE; + } + + if (!android_dt_check_header(hdr_addr)) { + printf("Error: DT image header is incorrect\n"); + return CMD_RET_FAILURE; + } + + android_dt_print_contents(hdr_addr); + + return CMD_RET_SUCCESS; +} + +static int dtimg_get_fdt(int argc, char * const argv[], enum cmd_dtimg_info cmd) +{ + ulong hdr_addr; + u32 index; + char *endp; + ulong fdt_addr; + u32 fdt_size; + char buf[65]; + + if (argc != 4) + return CMD_RET_USAGE; + + hdr_addr = simple_strtoul(argv[1], &endp, 16); + if (*endp != '\0') { + printf("Error: Wrong image address\n"); + return CMD_RET_FAILURE; + } + + if (!android_dt_check_header(hdr_addr)) { + printf("Error: DT image header is incorrect\n"); + return CMD_RET_FAILURE; + } + + index = simple_strtoul(argv[2], &endp, 0); + if (*endp != '\0') { + printf("Error: Wrong index\n"); + return CMD_RET_FAILURE; + } + + if (!android_dt_get_fdt_by_index(hdr_addr, index, &fdt_addr, &fdt_size)) + return CMD_RET_FAILURE; + + switch (cmd) { + case CMD_DTIMG_START: + snprintf(buf, sizeof(buf), "%lx", fdt_addr); + break; + case CMD_DTIMG_SIZE: + snprintf(buf, sizeof(buf), "%x", fdt_size); + break; + default: + printf("Error: Unknown cmd_dtimg_info value: %d\n", cmd); + return CMD_RET_FAILURE; + } + + env_set(argv[3], buf); + + return CMD_RET_SUCCESS; +} + +static int do_dtimg_start(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return dtimg_get_fdt(argc, argv, CMD_DTIMG_START); +} + +static int do_dtimg_size(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return dtimg_get_fdt(argc, argv, CMD_DTIMG_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 int do_dtimg(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)); + + /* Strip off leading 'dtimg' command argument */ + argc--; + argv++; + + if (!cp || argc > cp->maxargs) + return CMD_RET_USAGE; + if (flag == CMD_FLAG_REPEAT && !cp->repeatable) + return CMD_RET_SUCCESS; + + return cp->cmd(cmdtp, flag, argc, argv); +} + +U_BOOT_CMD( + dtimg, CONFIG_SYS_MAXARGS, 0, do_dtimg, + "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" + " - 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" + " - 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" +); diff --git a/common/Makefile b/common/Makefile index 7011dada99..6ef55d0d7a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -111,6 +111,10 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o +ifdef CONFIG_CMD_DTIMG +obj-y += image-android-dt.o +endif + ifndef CONFIG_SPL_BUILD # This option is not just y/n - it can have a numeric value ifdef CONFIG_FASTBOOT_FLASH