Replace stdio.h functions by TF functions

Functions provided by stdio.h such as printf and sprintf are available
in the codebase, but they add a lot of code to the final image if they
are used:

- AArch64: ~4KB
- AArch32: ~2KB in T32, ~3KB in A32

tf_printf and tf_snprintf are a lot more simple, but it is preferable
to use them when possible because they are also used in common code.

Change-Id: Id09fd2b486198fe3d79276e2c27931595b7ba60e
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/drivers/marvell/comphy/phy-comphy-cp110.c b/drivers/marvell/comphy/phy-comphy-cp110.c
index 8b78280b58bbb468cbd0fc11b8866294c3d88e70..2b1770f087290a3fd540e05132db6c92d5f835f6 100644 (file)
--- a/drivers/marvell/comphy/phy-comphy-cp110.c
+++ b/drivers/marvell/comphy/phy-comphy-cp110.c
@@ -18,7 +18,7 @@
 
 /* #define DEBUG_COMPHY */
 #ifdef DEBUG_COMPHY
-#define debug(format...) printf(format)
+#define debug(format...) tf_printf(format)
 #else
 #define debug(format, arg...)
 #endif

diff --git a/drivers/partition/partition.c b/drivers/partition/partition.c
index e2b468363b8fe69143ee9f85e6b2e5b14f6043a7..5a338b8d9c259f5d900b2db37cc3f2d1a140945a 100644 (file)
--- a/drivers/partition/partition.c
+++ b/drivers/partition/partition.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -24,7 +24,7 @@ static void dump_entries(int num)
 
        VERBOSE("Partition table with %d entries:\n", num);
        for (i = 0; i < num; i++) {
-               len = snprintf(name, EFI_NAMELEN, "%s", list.list[i].name);
+               len = tf_snprintf(name, EFI_NAMELEN, "%s", list.list[i].name);
                for (j = 0; j < EFI_NAMELEN - len - 1; j++) {
                        name[len + j] = ' ';
                }

diff --git a/drivers/st/clk/stm32mp1_clk.c b/drivers/st/clk/stm32mp1_clk.c
index 7dff98b1b9e9e73d6da7d2e431d373f01c2dff46..1dc08d80471db98fdbbf9889b38690eb35700a14 100644 (file)
--- a/drivers/st/clk/stm32mp1_clk.c
+++ b/drivers/st/clk/stm32mp1_clk.c
@@ -1344,7 +1344,7 @@ int stm32mp1_clk_init(void)
        for (i = (enum stm32mp1_pll_id)0; i < _PLL_NB; i++) {
                char name[12];
 
-               sprintf(name, "st,pll@%d", i);
+               tf_snprintf(name, sizeof(name), "st,pll@%d", i);
                plloff[i] = fdt_rcc_subnode_offset(name);
 
                if (!fdt_check_node(plloff[i])) {

diff --git a/plat/hisilicon/hikey/hisi_ipc.c b/plat/hisilicon/hikey/hisi_ipc.c
index 0469a08b98ed2841833469af7ac1047a0c7111cb..4936f8316974f20520db795edf3e0a16be5084fa 100644 (file)
--- a/plat/hisilicon/hikey/hisi_ipc.c
+++ b/plat/hisilicon/hikey/hisi_ipc.c
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <arch_helpers.h>
+#include <debug.h>
 #include <hisi_ipc.h>
 #include <hisi_sram_map.h>
 #include <mmio.h>
 #include <platform_def.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <string.h>
 
 static int ipc_init;
@@ -63,7 +63,7 @@ int hisi_cpus_powered_off_besides_curr(unsigned int cpu)
 static void hisi_ipc_send(unsigned int ipc_num)
 {
        if (!ipc_init) {
-               printf("error ipc base is null!!!\n");
+               tf_printf("error ipc base is null!!!\n");
                return;
        }
 

diff --git a/plat/marvell/a8k/common/mss/mss_bl2_setup.c b/plat/marvell/a8k/common/mss/mss_bl2_setup.c
index 6688551f447c93c01e4f1e66249b7ddf111bf841..21541855ba036ff1799a2f3c48060a4a5020fb03 100644 (file)
--- a/plat/marvell/a8k/common/mss/mss_bl2_setup.c
+++ b/plat/marvell/a8k/common/mss/mss_bl2_setup.c
@@ -85,7 +85,6 @@ int bl2_plat_handle_scp_bl2(image_info_t *scp_bl2_image_info)
        int ret;
 
        INFO("BL2: Initiating SCP_BL2 transfer to SCP\n");
-       printf("BL2: Initiating SCP_BL2 transfer to SCP\n");
 
        /* initialize time (for delay functionality) */
        plat_delay_timer_init();

diff --git a/services/spd/trusty/generic-arm64-smcall.c b/services/spd/trusty/generic-arm64-smcall.c
index feeecaa49c2fa30bd1542b2e3888d6db41d4bf33..1362c1c6861554fd7fee535b0eeebcd2de94d261 100644 (file)
--- a/services/spd/trusty/generic-arm64-smcall.c
+++ b/services/spd/trusty/generic-arm64-smcall.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -29,14 +29,14 @@ static void trusty_dputc(char ch, int secure)
        s->linebuf[s->l++] = ch;
        if (s->l == sizeof(s->linebuf) || ch == '\n') {
                if (secure)
-                       printf("secure os: ");
+                       tf_printf("secure os: ");
                else
-                       printf("non-secure os: ");
+                       tf_printf("non-secure os: ");
                for (i = 0; i < s->l; i++) {
                        putchar(s->linebuf[i]);
                }
                if (ch != '\n') {
-                       printf(" <...>\n");
+                       tf_printf(" <...>\n");
                }
                s->l = 0;
        }