]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: zynqmp: Get rid of simple_itoa and replace it by snprintf
authorMichal Simek <michal.simek@xilinx.com>
Wed, 7 Oct 2020 13:13:17 +0000 (15:13 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 27 Oct 2020 07:13:31 +0000 (08:13 +0100)
simple_itoa() is implemented only for !CONFIG_USE_TINY_PRINTF. Tiny printf
is normally used by SPL that's code which uses simple_itoa() has missing
reference. That's why refactor code by using on snprintf() instead of
strncpy()/strncat() combination. This change also descrease code size by
saving 24B based on buildman.

aarch64: (for 1/1 boards) all -22.0 rodata +2.0 text -24.0
         xilinx_zynqmp_virt: all -22 rodata +2 text -24
            u-boot: add: 0/0, grow: 0/-1 bytes: 0/-24 (-24)
              function                                   old     new   delta
              board_init                                 520     496     -24

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
board/xilinx/zynqmp/zynqmp.c

index 70d6fd422eb124ded22f7035272a2e10536cefe0..362c6e3dd6fbe530268ffc14074a9309be0c7295 100644 (file)
@@ -190,6 +190,7 @@ static char *zynqmp_get_silicon_idcode_name(void)
        u32 idcode, idcode2;
        char name[ZYNQMP_VERSION_SIZE];
        u32 ret_payload[PAYLOAD_ARG_CNT];
+       int ret;
 
        xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, ret_payload);
 
@@ -216,8 +217,10 @@ static char *zynqmp_get_silicon_idcode_name(void)
                return "unknown";
 
        /* Add device prefix to the name */
-       strncpy(name, "zu", ZYNQMP_VERSION_SIZE);
-       strncat(&name[2], simple_itoa(zynqmp_devices[i].device), 2);
+       ret = snprintf(name, ZYNQMP_VERSION_SIZE, "zu%d",
+                      zynqmp_devices[i].device);
+       if (ret <= 0)
+               return "unknown";
 
        if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_EV) {
                /* Devices with EV variant might be EG/CG/EV family */