cmd: Add dtimg command

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 <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d5abcfd42a0caf62dd60b34be99944bb0ed71ecf..51db3da33dcfe295481e8484883e697b030188b5 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -254,6 +254,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 12d2118f1d33768e9de5a12d07660115d52c9e98..b1206fca85021a7371c935af8d11ef49f1a920c2 100644 (file)
--- 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 (file)
index 0000000..65c8d10
--- /dev/null
+++ b/cmd/dtimg.c
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018 Linaro Ltd.
+ * Sam Protsenko <semen.protsenko@linaro.org>
+ */
+
+#include <image-android-dt.h>
+#include <common.h>
+
+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 <addr>\n"
+       "    - parse specified image and print its structure info\n"
+       "      <addr>: image address in RAM, in hex\n"
+       "dtimg start <addr> <index> <varname>\n"
+       "    - get address (hex) of FDT in the image, by index\n"
+       "      <addr>: image address in RAM, in hex\n"
+       "      <index>: index of desired FDT in the image\n"
+       "      <varname>: name of variable where to store address of FDT\n"
+       "dtimg size <addr> <index> <varname>\n"
+       "    - get size (hex, bytes) of FDT in the image, by index\n"
+       "      <addr>: image address in RAM, in hex\n"
+       "      <index>: index of desired FDT in the image\n"
+       "      <varname>: name of variable where to store size of FDT"
+);

diff --git a/common/Makefile b/common/Makefile
index 7100541ece0011ad9184375ba02ee646b39e9139..7473b850115c62717726f0e8cdc0e6d4153b97c9 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -108,6 +108,8 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o
 obj-y += memsize.o
 obj-y += stdio.o
 
+obj-$(CONFIG_CMD_DTIMG) += image-android-dt.o
+
 ifdef CONFIG_CMD_EEPROM_LAYOUT
 obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o
 endif