diff options
author | Eugeniu Rosca <roscaeugeniu@gmail.com> | 2019-12-24 19:51:06 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-10 22:18:26 +0300 |
commit | b84acf10565af1578e68c533a36e629fe8b8e84a (patch) | |
tree | e4bba8f2c30229b19368b32811a0458104cceef4 /cmd/dtimg.c | |
parent | 27a38a6e71817243d71da8d798ec9daa31b3c49d (diff) | |
download | u-boot-b84acf10565af1578e68c533a36e629fe8b8e84a.tar.xz |
dtimg/am57xx_evm_defconfig: Rename dtimg to adtimg
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 <trini@konsulko.com>
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Simon Glass<sjg@chromium.org>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
Diffstat (limited to 'cmd/dtimg.c')
-rw-r--r-- | cmd/dtimg.c | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/cmd/dtimg.c b/cmd/dtimg.c deleted file mode 100644 index 6c5d53cc68..0000000000 --- a/cmd/dtimg.c +++ /dev/null @@ -1,142 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2018 Linaro Ltd. - * Sam Protsenko <semen.protsenko@linaro.org> - */ - -#include <env.h> -#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 && !cmd_is_repeatable(cp)) - 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" -); |