From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [RFCv2 10/16] common: Drop vsprintf.h from common header
Date: Wed, 19 Aug 2020 09:09:02 -0400 [thread overview]
Message-ID: <20200819130908.4303-11-trini@konsulko.com> (raw)
In-Reply-To: <20200819130908.4303-1-trini@konsulko.com>
From: Simon Glass <sjg@chromium.org>
Move this out of the common header and include it only where needed.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
api/api.c | 1 +
arch/arc/lib/cache.c | 1 +
arch/arc/lib/interrupts.c | 1 +
arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 +
arch/arm/cpu/armv7/ls102xa/fdt.c | 1 +
arch/arm/cpu/armv8/cache_v8.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/mp.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 +
arch/arm/lib/bootm.c | 1 +
arch/arm/lib/interrupts_64.c | 1 +
arch/arm/lib/interrupts_m.c | 1 +
arch/arm/lib/semihosting.c | 1 +
arch/arm/mach-imx/cmd_dek.c | 1 +
arch/arm/mach-imx/cmd_nandbcb.c | 1 +
arch/arm/mach-imx/hab.c | 1 +
arch/arm/mach-imx/i2c-mxv7.c | 1 +
arch/arm/mach-imx/imx8/ahab.c | 1 +
arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 +
arch/arm/mach-imx/imx8m/soc.c | 1 +
arch/arm/mach-imx/imx_bootaux.c | 1 +
arch/arm/mach-imx/mx6/mp.c | 1 +
arch/arm/mach-imx/mx7ulp/soc.c | 1 +
arch/arm/mach-k3/am6_init.c | 1 +
arch/arm/mach-k3/common.c | 1 +
arch/arm/mach-k3/j721e_init.c | 1 +
arch/arm/mach-k3/sysfw-loader.c | 1 +
arch/arm/mach-keystone/cmd_clock.c | 1 +
arch/arm/mach-keystone/cmd_mon.c | 1 +
arch/arm/mach-keystone/ddr3.c | 1 +
arch/arm/mach-keystone/keystone.c | 1 +
arch/arm/mach-kirkwood/cpu.c | 1 +
arch/arm/mach-meson/sm.c | 1 +
arch/arm/mach-nexell/clock.c | 1 +
arch/arm/mach-omap2/emif-common.c | 1 +
arch/arm/mach-omap2/sec-common.c | 1 +
arch/arm/mach-omap2/utils.c | 1 +
arch/arm/mach-orion5x/cpu.c | 1 +
arch/arm/mach-rockchip/misc.c | 1 +
arch/arm/mach-snapdragon/misc.c | 1 +
arch/arm/mach-snapdragon/pinctrl-apq8016.c | 3 ++-
arch/arm/mach-snapdragon/pinctrl-apq8096.c | 3 ++-
arch/arm/mach-socfpga/misc.c | 1 +
arch/arm/mach-socfpga/misc_s10.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32key.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | 1 +
arch/arm/mach-stm32mp/cpu.c | 1 +
arch/arm/mach-sunxi/board.c | 1 +
arch/arm/mach-sunxi/dram_helpers.c | 1 +
arch/arm/mach-sunxi/dram_sun4i.c | 1 +
arch/arm/mach-sunxi/dram_sun50i_h6.c | 1 +
arch/arm/mach-sunxi/dram_sun6i.c | 1 +
arch/arm/mach-sunxi/dram_sunxi_dw.c | 1 +
arch/arm/mach-uniphier/board_late_init.c | 1 +
arch/arm/mach-zynqmp/mp.c | 1 +
arch/mips/lib/bootm.c | 1 +
arch/mips/lib/reloc.c | 1 +
arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 +
arch/nds32/lib/bootm.c | 1 +
arch/nds32/lib/interrupts.c | 1 +
arch/nios2/lib/bootm.c | 1 +
arch/powerpc/cpu/mpc83xx/ecc.c | 1 +
arch/powerpc/cpu/mpc83xx/traps.c | 1 +
arch/powerpc/cpu/mpc85xx/commproc.c | 1 +
arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 +
arch/powerpc/cpu/mpc85xx/ether_fcc.c | 1 +
arch/powerpc/cpu/mpc85xx/fdt.c | 1 +
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/liodn.c | 1 +
arch/powerpc/cpu/mpc85xx/mp.c | 1 +
arch/powerpc/cpu/mpc85xx/portals.c | 1 +
arch/powerpc/cpu/mpc85xx/traps.c | 1 +
arch/powerpc/cpu/mpc86xx/traps.c | 1 +
arch/powerpc/cpu/mpc8xx/immap.c | 1 +
arch/powerpc/cpu/mpc8xx/traps.c | 1 +
arch/riscv/lib/spl.c | 1 +
arch/sandbox/cpu/os.c | 1 +
arch/sandbox/cpu/start.c | 1 +
arch/sh/lib/bootm.c | 1 +
arch/sh/lib/zimageboot.c | 1 +
arch/x86/cpu/coreboot/sdram.c | 1 +
arch/x86/cpu/efi/payload.c | 1 +
arch/x86/cpu/intel_common/mrc.c | 1 +
arch/x86/cpu/qfw_cpu.c | 1 +
arch/x86/cpu/slimbootloader/sdram.c | 1 +
arch/x86/cpu/slimbootloader/serial.c | 1 +
arch/x86/cpu/slimbootloader/slimbootloader.c | 1 +
arch/x86/cpu/tangier/acpi.c | 1 +
arch/x86/lib/fsp1/fsp_common.c | 1 +
arch/x86/lib/fsp1/fsp_support.c | 1 +
arch/x86/lib/ramtest.c | 1 +
arch/x86/lib/relocate.c | 1 +
arch/x86/lib/tpl.c | 1 +
arch/x86/lib/zimage.c | 1 +
arch/xtensa/cpu/exceptions.c | 1 +
board/Arcturus/ucp1020/ucp1020.c | 1 +
board/BuR/brxre1/board.c | 1 +
board/BuR/common/common.c | 1 +
board/BuS/eb_cpu5282/eb_cpu5282.c | 1 +
board/CZ.NIC/turris_mox/mox_sp.c | 1 +
board/CZ.NIC/turris_mox/turris_mox.c | 1 +
board/Synology/ds414/cmd_syno.c | 1 +
board/amlogic/odroid-n2/odroid-n2.c | 1 +
board/aristainetos/aristainetos.c | 1 +
board/atmel/common/board.c | 1 +
board/bluegiga/apx4devkit/apx4devkit.c | 1 +
board/bluewater/gurnard/gurnard.c | 1 +
board/boundary/nitrogen6x/nitrogen6x.c | 1 +
board/cadence/xtfpga/xtfpga.c | 1 +
board/cavium/thunderx/atf.c | 1 +
board/cobra5272/flash.c | 3 ++-
board/compulab/common/eeprom.c | 1 +
board/compulab/common/omap3_display.c | 1 +
board/corscience/tricorder/tricorder-eeprom.c | 1 +
board/corscience/tricorder/tricorder.c | 1 +
board/davinci/da8xxevm/da850evm.c | 1 +
board/davinci/da8xxevm/omapl138_lcdk.c | 1 +
board/dhelectronics/dh_imx6/dh_imx6.c | 1 +
board/dhelectronics/dh_stm32mp1/board.c | 1 +
board/eets/pdu001/board.c | 1 +
board/egnite/ethernut5/ethernut5_pwrman.c | 1 +
board/engicam/common/board.c | 1 +
board/esd/vme8349/caddy.c | 1 +
board/freescale/common/cmd_esbc_validate.c | 1 +
board/freescale/common/fsl_validate.c | 1 +
board/freescale/common/ngpixis.c | 1 +
board/freescale/common/pixis.c | 1 +
board/freescale/common/sgmii_riser.c | 1 +
board/freescale/common/sys_eeprom.c | 1 +
board/freescale/common/vid.c | 1 +
board/freescale/corenet_ds/eth_hydra.c | 1 +
board/freescale/corenet_ds/eth_p4080.c | 1 +
board/freescale/corenet_ds/eth_superhydra.c | 1 +
board/freescale/ls1012aqds/eth.c | 1 +
board/freescale/ls1021aqds/ddr.c | 1 +
board/freescale/ls1043aqds/ddr.c | 1 +
board/freescale/ls1046aqds/ddr.c | 1 +
board/freescale/ls1046aqds/eth.c | 1 +
board/freescale/ls1046ardb/ddr.c | 1 +
board/freescale/ls1088a/ddr.c | 1 +
board/freescale/ls1088a/eth_ls1088aqds.c | 1 +
board/freescale/ls2080a/ddr.c | 1 +
board/freescale/ls2080aqds/ddr.c | 1 +
board/freescale/ls2080aqds/eth.c | 1 +
board/freescale/ls2080ardb/ddr.c | 1 +
board/freescale/lx2160a/eth_lx2160aqds.c | 1 +
board/freescale/mpc8323erdb/mpc8323erdb.c | 1 +
board/freescale/mpc8349emds/ddr.c | 1 +
board/freescale/mpc8572ds/ddr.c | 1 +
board/freescale/mpc8641hpcn/ddr.c | 1 +
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 +
board/freescale/p2041rdb/cpld.c | 1 +
board/freescale/p2041rdb/ddr.c | 1 +
board/freescale/p2041rdb/eth.c | 1 +
board/freescale/qemu-ppce500/qemu-ppce500.c | 1 +
board/freescale/t102xrdb/ddr.c | 1 +
board/freescale/t104xrdb/ddr.c | 1 +
board/freescale/t208xqds/ddr.c | 1 +
board/freescale/t208xqds/eth_t208xqds.c | 1 +
board/freescale/t208xrdb/ddr.c | 1 +
board/freescale/t4rdb/ddr.c | 1 +
board/gardena/smart-gateway-mt7688/board.c | 1 +
board/gateworks/gw_ventana/common.c | 1 +
board/gateworks/gw_ventana/eeprom.c | 1 +
board/gateworks/gw_ventana/gsc.c | 1 +
board/gateworks/gw_ventana/gw_ventana.c | 1 +
board/gdsys/a38x/controlcenterdc.c | 1 +
board/gdsys/a38x/ihs_phys.c | 1 +
board/gdsys/common/cmd_ioloop.c | 1 +
board/gdsys/common/osd.c | 2 ++
board/gdsys/common/osd_cmd.c | 1 +
board/gdsys/mpc8308/gazerbeam.c | 1 +
board/ge/bx50v3/bx50v3.c | 1 +
board/grinn/liteboard/board.c | 1 +
board/highbank/highbank.c | 1 +
board/imgtec/malta/malta.c | 1 +
board/intel/edison/edison.c | 1 +
board/isee/igep00x0/igep00x0.c | 1 +
board/k+p/kp_imx53/kp_id_rev.c | 1 +
board/keymile/common/common.c | 1 +
board/keymile/common/ivm.c | 1 +
board/keymile/km_arm/km_arm.c | 1 +
board/keymile/kmp204x/kmp204x.c | 1 +
board/menlo/m53menlo/m53menlo.c | 1 +
board/nokia/rx51/rx51.c | 1 +
board/phytec/pfla02/pfla02.c | 1 +
board/qualcomm/dragonboard410c/dragonboard410c.c | 1 +
board/raspberrypi/rpi/rpi.c | 1 +
board/renesas/sh7752evb/sh7752evb.c | 1 +
board/renesas/sh7753evb/sh7753evb.c | 1 +
board/renesas/sh7757lcr/sh7757lcr.c | 1 +
board/renesas/stout/cpld.c | 1 +
board/renesas/ulcb/cpld.c | 1 +
board/samsung/common/board.c | 1 +
board/samsung/common/exynos5-dt.c | 1 +
board/samsung/common/misc.c | 1 +
board/samsung/odroid/odroid.c | 1 +
board/samsung/trats/trats.c | 1 +
board/samsung/trats2/trats2.c | 1 +
board/sandbox/sandbox.c | 1 +
board/siemens/capricorn/board.c | 1 +
board/siemens/common/board.c | 1 +
board/siemens/common/factoryset.c | 1 +
board/siemens/pxm2/board.c | 1 +
board/siemens/rut/board.c | 1 +
board/siemens/taurus/taurus.c | 1 +
board/sifive/fu540/fu540.c | 1 +
board/sifive/fu540/spl.c | 1 +
board/softing/vining_fpga/socfpga.c | 1 +
board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 +
board/st/common/stm32mp_dfu.c | 1 +
board/st/stm32f429-discovery/stm32f429-discovery.c | 1 +
board/st/stm32f429-evaluation/stm32f429-evaluation.c | 1 +
board/st/stm32f469-discovery/stm32f469-discovery.c | 1 +
board/st/stm32mp1/stm32mp1.c | 1 +
board/sunxi/board.c | 1 +
board/synopsys/hsdk/env-lib.c | 1 +
board/synopsys/hsdk/hsdk.c | 1 +
board/theadorable/theadorable.c | 1 +
board/theobroma-systems/puma_rk3399/puma-rk3399.c | 1 +
board/ti/am335x/board.c | 1 +
board/ti/am57xx/board.c | 1 +
board/ti/common/board_detect.c | 1 +
board/ti/dra7xx/evm.c | 1 +
board/ti/j721e/evm.c | 1 +
board/ti/ks2_evm/board.c | 1 +
board/toradex/apalis_imx6/apalis_imx6.c | 1 +
board/toradex/colibri_imx6/colibri_imx6.c | 1 +
board/toradex/common/tdx-cfg-block.c | 1 +
board/toradex/common/tdx-common.c | 1 +
board/tqc/tqma6/tqma6.c | 1 +
board/varisys/common/sys_eeprom.c | 1 +
board/varisys/cyrus/ddr.c | 1 +
board/vscom/baltos/board.c | 1 +
board/warp7/warp7.c | 1 +
board/xilinx/versal/board.c | 1 +
board/xilinx/zynq/board.c | 1 +
board/xilinx/zynq/cmds.c | 1 +
board/xilinx/zynqmp/cmds.c | 1 +
board/xilinx/zynqmp/zynqmp.c | 1 +
cmd/abootimg.c | 1 +
cmd/acpi.c | 1 +
cmd/adc.c | 1 +
cmd/adtimg.c | 1 +
cmd/aes.c | 1 +
cmd/armflash.c | 1 +
cmd/avb.c | 1 +
cmd/axi.c | 1 +
cmd/bcb.c | 1 +
cmd/bind.c | 1 +
cmd/binop.c | 1 +
cmd/blk_common.c | 1 +
cmd/blkcache.c | 1 +
cmd/blob.c | 1 +
cmd/bmp.c | 1 +
cmd/boot.c | 1 +
cmd/bootefi.c | 1 +
cmd/booti.c | 1 +
cmd/bootm.c | 1 +
| 1 +
cmd/bootstage.c | 1 +
cmd/bootz.c | 1 +
cmd/cbfs.c | 1 +
cmd/cramfs.c | 1 +
cmd/cros_ec.c | 1 +
cmd/demo.c | 1 +
cmd/dfu.c | 1 +
cmd/disk.c | 1 +
cmd/eeprom.c | 1 +
cmd/efidebug.c | 1 +
cmd/elf.c | 1 +
cmd/ethsw.c | 1 +
cmd/exit.c | 1 +
cmd/fastboot.c | 1 +
cmd/fat.c | 1 +
cmd/fdt.c | 1 +
cmd/flash.c | 1 +
cmd/fpga.c | 1 +
cmd/fpgad.c | 1 +
cmd/fuse.c | 1 +
cmd/gpio.c | 1 +
cmd/gpt.c | 1 +
cmd/host.c | 1 +
cmd/i2c.c | 1 +
cmd/ini.c | 1 +
cmd/io.c | 1 +
cmd/iotrace.c | 1 +
cmd/itest.c | 1 +
cmd/jffs2.c | 1 +
cmd/led.c | 1 +
cmd/legacy-mtd-utils.c | 1 +
cmd/legacy_led.c | 1 +
cmd/load.c | 1 +
cmd/log.c | 1 +
cmd/lzmadec.c | 1 +
cmd/md5sum.c | 1 +
cmd/mdio.c | 1 +
cmd/mem.c | 1 +
cmd/mii.c | 1 +
cmd/misc.c | 1 +
cmd/mmc.c | 1 +
cmd/mp.c | 1 +
cmd/mtd.c | 1 +
cmd/mtdparts.c | 1 +
cmd/nand.c | 1 +
cmd/net.c | 1 +
cmd/nvedit.c | 1 +
cmd/nvedit_efi.c | 1 +
cmd/onenand.c | 1 +
cmd/osd.c | 1 +
cmd/panic.c | 1 +
cmd/pcap.c | 1 +
cmd/pci.c | 1 +
cmd/pmic.c | 1 +
cmd/pxe.c | 1 +
cmd/pxe_utils.c | 1 +
cmd/qfw.c | 1 +
cmd/read.c | 1 +
cmd/regulator.c | 1 +
cmd/remoteproc.c | 1 +
cmd/rng.c | 1 +
cmd/rockusb.c | 1 +
cmd/rtc.c | 1 +
cmd/sata.c | 1 +
cmd/setexpr.c | 1 +
cmd/sf.c | 1 +
cmd/smccc.c | 1 +
cmd/sound.c | 1 +
cmd/source.c | 1 +
cmd/spi.c | 1 +
cmd/strings.c | 1 +
cmd/sysboot.c | 1 +
cmd/test.c | 1 +
cmd/thordown.c | 1 +
cmd/ti/ddr3.c | 1 +
cmd/tlv_eeprom.c | 1 +
cmd/tpm-common.c | 1 +
cmd/tpm-v1.c | 1 +
cmd/tpm-v2.c | 1 +
cmd/trace.c | 1 +
cmd/tsi148.c | 1 +
cmd/ubi.c | 1 +
cmd/ubifs.c | 1 +
cmd/ufs.c | 1 +
cmd/universe.c | 1 +
cmd/unlz4.c | 1 +
cmd/unzip.c | 1 +
cmd/usb.c | 1 +
cmd/usb_gadget_sdp.c | 1 +
cmd/usb_mass_storage.c | 1 +
cmd/w1.c | 1 +
cmd/wdt.c | 1 +
cmd/wol.c | 1 +
cmd/x86/mtrr.c | 1 +
cmd/ximg.c | 1 +
cmd/yaffs2.c | 1 +
cmd/zfs.c | 1 +
cmd/zip.c | 1 +
common/autoboot.c | 1 +
common/board_r.c | 1 +
common/bootm.c | 1 +
common/bootm_os.c | 1 +
common/bootretry.c | 1 +
common/bootstage.c | 1 +
common/cli_hush.c | 1 +
common/console.c | 1 +
common/dlmalloc.c | 1 +
common/eeprom/eeprom_field.c | 1 +
common/fdt_support.c | 1 +
common/hash.c | 1 +
common/image-cipher.c | 1 +
common/image-fdt.c | 1 +
common/image-fit.c | 1 +
common/image.c | 1 +
common/kallsyms.c | 1 +
common/kgdb.c | 1 +
common/lcd.c | 1 +
common/lcd_console.c | 1 +
common/log.c | 1 +
common/log_syslog.c | 1 +
common/main.c | 1 +
common/miiphyutil.c | 1 +
common/spl/spl.c | 1 +
common/splash.c | 1 +
common/splash_source.c | 1 +
common/stdio.c | 1 +
common/update.c | 1 +
common/usb_hub.c | 1 +
common/usb_storage.c | 1 +
common/xyzModem.c | 1 +
disk/part.c | 1 +
disk/part_amiga.c | 1 +
disk/part_dos.c | 1 +
disk/part_efi.c | 1 +
drivers/ata/fsl_sata.c | 1 +
drivers/ata/sata_mv.c | 1 +
drivers/ata/sata_sil.c | 1 +
drivers/bios_emulator/x86emu/debug.c | 1 +
drivers/block/blk-uclass.c | 1 +
drivers/block/ide.c | 1 +
drivers/block/sandbox.c | 1 +
drivers/board/sandbox.c | 1 +
drivers/clk/clk_pic32.c | 1 +
drivers/clk/clk_zynq.c | 1 +
drivers/core/of_access.c | 1 +
| 1 +
drivers/core/ofnode.c | 1 +
drivers/cpu/bmips_cpu.c | 1 +
drivers/cpu/cpu_sandbox.c | 1 +
drivers/cpu/imx8_cpu.c | 1 +
drivers/crypto/fsl/error.c | 1 +
drivers/crypto/fsl/sec.c | 1 +
drivers/ddr/altera/sdram_arria10.c | 1 +
drivers/ddr/fsl/interactive.c | 1 +
drivers/ddr/fsl/main.c | 1 +
drivers/ddr/fsl/options.c | 1 +
drivers/dfu/dfu.c | 1 +
drivers/dfu/dfu_mmc.c | 1 +
drivers/dfu/dfu_mtd.c | 1 +
drivers/dfu/dfu_nand.c | 1 +
drivers/dfu/dfu_ram.c | 1 +
drivers/dfu/dfu_sf.c | 1 +
drivers/dfu/dfu_virt.c | 1 +
drivers/dma/sandbox-dma-test.c | 1 +
drivers/dma/ti/k3-udma.c | 1 +
drivers/fastboot/fb_command.c | 1 +
drivers/fastboot/fb_common.c | 1 +
drivers/fastboot/fb_getvar.c | 1 +
drivers/firmware/firmware-zynqmp.c | 1 +
drivers/fpga/ivm_core.c | 1 +
drivers/gpio/74x164_gpio.c | 1 +
drivers/gpio/gpio-uclass.c | 1 +
drivers/gpio/hi6220_gpio.c | 1 +
drivers/gpio/imx_rgpio2p.c | 1 +
drivers/gpio/mpc83xx_spisel_boot.c | 1 +
drivers/gpio/mpc8xxx_gpio.c | 1 +
drivers/gpio/mxc_gpio.c | 1 +
drivers/gpio/mxs_gpio.c | 1 +
drivers/gpio/omap_gpio.c | 1 +
drivers/gpio/pca953x.c | 1 +
drivers/gpio/pca953x_gpio.c | 1 +
drivers/gpio/pic32_gpio.c | 1 +
drivers/gpio/rk_gpio.c | 1 +
drivers/gpio/sandbox.c | 1 +
drivers/gpio/sifive-gpio.c | 1 +
drivers/gpio/sunxi_gpio.c | 1 +
drivers/gpio/tca642x.c | 1 +
drivers/i2c/designware_i2c_pci.c | 1 +
drivers/i2c/i2c-uclass.c | 1 +
drivers/i2c/intel_i2c.c | 1 +
drivers/misc/ds4510.c | 1 +
drivers/misc/fsl_portals.c | 1 +
drivers/misc/k3_avs.c | 1 +
drivers/mmc/fsl_esdhc.c | 1 +
drivers/mmc/mmc.c | 1 +
drivers/mmc/mmc_spi.c | 1 +
drivers/mmc/omap_hsmmc.c | 1 +
drivers/mtd/cfi_flash.c | 1 +
drivers/mtd/cfi_mtd.c | 1 +
drivers/mtd/mtdcore.c | 1 +
drivers/mtd/mtdpart.c | 1 +
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 1 +
drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 1 +
drivers/mtd/nand/raw/nand.c | 1 +
drivers/mtd/nand/spi/core.c | 1 +
drivers/mtd/onenand/onenand_base.c | 1 +
drivers/mtd/spi/sf-uclass.c | 1 +
drivers/mtd/spi/sf_mtd.c | 1 +
drivers/mtd/ubi/build.c | 1 +
drivers/mtd/ubi/debug.c | 1 +
drivers/mtd/ubi/vmt.c | 1 +
drivers/mtd/ubi/wl.c | 1 +
drivers/net/ag7xxx.c | 1 +
drivers/net/altera_tse.c | 1 +
drivers/net/bcm-sf2-eth.c | 1 +
drivers/net/bcm6348-eth.c | 1 +
drivers/net/bcm6368-eth.c | 1 +
drivers/net/bcmgenet.c | 1 +
drivers/net/calxedaxgmac.c | 1 +
drivers/net/dc2114x.c | 1 +
drivers/net/designware.c | 1 +
drivers/net/dnet.c | 1 +
drivers/net/e1000.c | 1 +
drivers/net/e1000_spi.c | 1 +
drivers/net/eepro100.c | 1 +
drivers/net/ep93xx_eth.c | 1 +
drivers/net/ethoc.c | 1 +
drivers/net/fec_mxc.c | 1 +
drivers/net/fm/eth.c | 1 +
drivers/net/fm/fdt.c | 1 +
drivers/net/fsl-mc/dpio/qbman_private.h | 1 +
drivers/net/fsl-mc/mc.c | 1 +
drivers/net/fsl_enetc.c | 1 +
drivers/net/fsl_enetc_mdio.c | 1 +
drivers/net/ftmac100.c | 1 +
drivers/net/ftmac110.c | 1 +
drivers/net/ks8851_mll.c | 1 +
drivers/net/lan91c96.c | 1 +
drivers/net/ldpaa_eth/ldpaa_eth.c | 1 +
drivers/net/macb.c | 1 +
drivers/net/mpc8xx_fec.c | 1 +
drivers/net/mscc_eswitch/mscc_miim.c | 1 +
drivers/net/mt7628-eth.c | 1 +
drivers/net/mtk_eth.c | 1 +
drivers/net/mvgbe.c | 1 +
drivers/net/mvneta.c | 1 +
drivers/net/mvpp2.c | 1 +
drivers/net/natsemi.c | 1 +
drivers/net/netconsole.c | 1 +
drivers/net/ns8382x.c | 1 +
drivers/net/pcnet.c | 1 +
drivers/net/pfe_eth/pfe_cmd.c | 1 +
drivers/net/pfe_eth/pfe_eth.c | 1 +
drivers/net/pfe_eth/pfe_mdio.c | 1 +
drivers/net/phy/b53.c | 1 +
drivers/net/phy/cortina.c | 1 +
drivers/net/phy/mv88e6352.c | 1 +
drivers/net/ravb.c | 1 +
drivers/net/rtl8139.c | 1 +
drivers/net/sh_eth.c | 1 +
drivers/net/smc91111.c | 1 +
drivers/net/smc911x.c | 1 +
drivers/net/sni_ave.c | 1 +
drivers/net/sun8i_emac.c | 1 +
drivers/net/ti/cpsw_mdio.c | 1 +
drivers/net/ti/davinci_emac.c | 1 +
drivers/net/ti/keystone_net.c | 1 +
drivers/net/tsec.c | 1 +
drivers/net/uli526x.c | 1 +
drivers/net/vsc9953.c | 1 +
drivers/nvme/nvme-uclass.c | 1 +
drivers/nvme/nvme.c | 1 +
drivers/pci/fsl_pci_init.c | 1 +
drivers/pci/pci-uclass.c | 1 +
drivers/pci/pci.c | 1 +
drivers/pci/pci_mvebu.c | 1 +
drivers/pci/pcie_mediatek.c | 1 +
drivers/phy/allwinner/phy-sun4i-usb.c | 1 +
drivers/pinctrl/broadcom/pinctrl-bcm6838.c | 1 +
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 1 +
drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 1 +
drivers/pinctrl/meson/pinctrl-meson.c | 1 +
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 +
drivers/pinctrl/pinctrl-sandbox.c | 1 +
drivers/pinctrl/pinctrl-sti.c | 1 +
drivers/pinctrl/pinctrl-stmfx.c | 1 +
drivers/pinctrl/pinctrl-uclass.c | 1 +
drivers/pinctrl/pinctrl_stm32.c | 1 +
drivers/power/power_core.c | 1 +
drivers/pwm/pwm-mtk.c | 1 +
drivers/qe/qe.c | 1 +
drivers/qe/uec.c | 1 +
drivers/ram/imxrt_sdram.c | 1 +
drivers/ram/stm32_sdram.c | 1 +
drivers/ram/stm32mp1/stm32mp1_ddr.c | 1 +
drivers/ram/stm32mp1/stm32mp1_interactive.c | 1 +
drivers/ram/stm32mp1/stm32mp1_tests.c | 1 +
drivers/ram/stm32mp1/stm32mp1_tuning.c | 1 +
drivers/reset/reset-socfpga.c | 1 +
drivers/rtc/m41t60.c | 1 +
drivers/scsi/scsi.c | 1 +
drivers/serial/serial-uclass.c | 1 +
drivers/serial/serial.c | 1 +
drivers/serial/serial_pxa.c | 1 +
drivers/soc/soc_sandbox.c | 1 +
drivers/soc/soc_ti_k3.c | 1 +
drivers/spi/atmel-quadspi.c | 1 +
drivers/spi/sandbox_spi.c | 1 +
drivers/sysreset/sysreset_mpc83xx.c | 1 +
drivers/timer/tsc_timer.c | 1 +
drivers/tpm/cr50_i2c.c | 1 +
drivers/tpm/tpm2_ftpm_tee.c | 1 +
drivers/tpm/tpm2_tis_sandbox.c | 1 +
drivers/tpm/tpm2_tis_spi.c | 1 +
drivers/tpm/tpm_tis_infineon.c | 1 +
drivers/tpm/tpm_tis_lpc.c | 1 +
drivers/tpm/tpm_tis_sandbox.c | 1 +
drivers/tpm/tpm_tis_st33zp24_i2c.c | 1 +
drivers/tpm/tpm_tis_st33zp24_spi.c | 1 +
drivers/usb/cdns3/ep0.c | 1 +
drivers/usb/cdns3/gadget.c | 1 +
drivers/usb/common/fsl-dt-fixup.c | 1 +
drivers/usb/dwc3/gadget.c | 1 +
drivers/usb/eth/asix.c | 1 +
drivers/usb/eth/asix88179.c | 1 +
drivers/usb/eth/lan7x.c | 1 +
drivers/usb/eth/mcs7830.c | 1 +
drivers/usb/eth/r8152.c | 1 +
drivers/usb/eth/smsc95xx.c | 1 +
drivers/usb/gadget/epautoconf.c | 1 +
drivers/usb/gadget/ether.c | 1 +
drivers/usb/gadget/f_mass_storage.c | 1 +
drivers/usb/gadget/f_thor.c | 1 +
drivers/usb/host/ehci-fsl.c | 1 +
drivers/usb/host/ehci-omap.c | 1 +
drivers/usb/host/usb-uclass.c | 1 +
drivers/usb/musb-new/musb_core.c | 1 +
drivers/usb/musb-new/musb_dsps.c | 1 +
drivers/usb/musb-new/musb_gadget.c | 1 +
drivers/usb/musb-new/ti-musb.c | 1 +
drivers/video/ati_radeon_fb.c | 1 +
drivers/video/cfb_console.c | 1 +
drivers/video/fsl_diu_fb.c | 1 +
drivers/video/mx3fb.c | 1 +
drivers/video/mxsfb.c | 1 +
drivers/video/vidconsole-uclass.c | 1 +
drivers/video/video-uclass.c | 1 +
drivers/video/videomodes.c | 1 +
drivers/virtio/virtio-uclass.c | 1 +
drivers/virtio/virtio_blk.c | 1 +
drivers/virtio/virtio_pci_legacy.c | 1 +
drivers/virtio/virtio_pci_modern.c | 1 +
drivers/virtio/virtio_sandbox.c | 1 +
env/attr.c | 3 ++-
env/mmc.c | 1 +
examples/standalone/atmel_df_pow2.c | 1 +
fs/cramfs/cramfs.c | 1 +
fs/fs.c | 1 +
fs/ubifs/debug.c | 1 +
fs/ubifs/super.c | 1 +
fs/ubifs/ubifs.c | 1 +
fs/yaffs2/yaffs_uboot_glue.c | 1 +
include/common.h | 1 -
include/efi.h | 1 +
include/exports.h | 1 +
include/vsprintf.h | 1 +
lib/acpi/acpi_device.c | 1 +
lib/crypto/public_key.c | 1 +
lib/dhry/cmd_dhry.c | 1 +
lib/display_options.c | 1 +
lib/efi_driver/efi_block_device.c | 1 +
lib/efi_loader/efi_boottime.c | 1 +
lib/efi_loader/efi_device_path.c | 1 +
lib/efi_loader/efi_device_path_to_text.c | 1 +
lib/efi_loader/efi_disk.c | 1 +
lib/efi_loader/efi_var_file.c | 1 +
lib/fdtdec.c | 1 +
lib/fdtdec_test.c | 1 +
lib/hexdump.c | 1 +
lib/libavb/avb_sysdeps_posix.c | 1 +
lib/net_utils.c | 1 +
lib/oid_registry.c | 1 +
lib/panic.c | 1 +
lib/rsa/rsa-verify.c | 1 +
lib/strto.c | 1 +
lib/tiny-printf.c | 1 +
lib/tpm-common.c | 1 +
lib/trace.c | 1 +
lib/uuid.c | 1 +
net/arp.c | 1 +
net/bootp.c | 1 +
net/cdp.c | 1 +
net/eth-uclass.c | 1 +
net/eth_common.c | 1 +
net/eth_legacy.c | 1 +
net/net.c | 1 +
net/nfs.c | 1 +
net/tftp.c | 1 +
post/post.c | 1 +
test/dm/blk.c | 1 +
test/env/hashtable.c | 1 +
test/lib/sscanf.c | 1 +
test/log/log_test.c | 1 +
test/print_ut.c | 1 +
test/unicode_ut.c | 1 +
test/ut.c | 1 +
670 files changed, 674 insertions(+), 5 deletions(-)
diff --git a/api/api.c b/api/api.c
index 748df20bebe4..17f740529743 100644
--- a/api/api.c
+++ b/api/api.c
@@ -14,6 +14,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index f807cd83d6b5..1bdffd052e46 100644
--- a/arch/arc/lib/cache.c
+++ b/arch/arc/lib/cache.c
@@ -6,6 +6,7 @@
#include <config.h>
#include <common.h>
#include <cpu_func.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index 988e04aea0bb..932bb81ce948 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <irq_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arcregs.h>
#include <asm/ptrace.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 7c780c07c310..6a7d63d09848 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/mtd/st_smi.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index ea068727f57a..684c0c91ef5c 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -7,6 +7,7 @@
#include <clock_legacy.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index ad019f4fe2e0..052ba4d5407d 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -12,6 +12,7 @@
#include <hang.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
index 34d5fe81d0e1..917ae991a525 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -8,6 +8,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index fb5d8a2a6346..a85fa358765f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -8,6 +8,7 @@
#include <image.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index a4882d8599c5..340206d90952 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -12,6 +12,7 @@
#include <fsl_ifc.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/sizes.h>
#include <log.h>
#include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 613e7abeaae5..c9efede771e4 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -20,6 +20,7 @@
#include <lmb.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <dm/root.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 6c6a81529f06..00e052d9a862 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <irq_func.h>
diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c
index 5561f3475c7d..7dee0e5a2271 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -8,6 +8,7 @@
#include <cpu_func.h>
#include <irq_func.h>
#include <stdio.h>
+#include <vsprintf.h>
/*
* Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index d186584c3794..8b09d87cb169 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -16,6 +16,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define SYSOPEN 0x01
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 49dd473af72e..a8199497a916 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#include <fsl_sec.h>
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index c2ca33888b50..2b7affaaccdf 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -17,6 +17,7 @@
#include <malloc.h>
#include <nand.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/bug.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 0d2cbf989635..3f3d47c13005 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -11,6 +11,7 @@
#include <mapmem.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index 5f5103a12a62..bf0742e57e3d 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -6,6 +6,7 @@
#include <malloc.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 69033420ee5a..1d92c07be246 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/sci/sci.h>
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 84d400f02837..6bb067e08bdd 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -16,6 +16,7 @@
#include <stddef.h>
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/sci/sci.h>
#include <asm/arch-imx8/imx8-pins.h>
#include <asm/arch-imx8/snvs_security_sc.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 4b02c70e6d52..12f644e69ee7 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/imx-regs.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 46a4d3661d10..c94da85bf760 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/mach-imx/sys_proto.h>
#include <command.h>
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index fe591a8ffc39..d28d55d4be5c 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <cpu_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index e67121c55237..c0feac134f23 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index d4c9780c6bb8..2e4bb59c4a26 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -10,6 +10,7 @@
#include <fdt_support.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <spl.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 572b7116c8c3..359dee5af86c 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index df899fa0fb3a..5c1f248b13bc 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 91182d04b227..ecc3a6711802 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -13,6 +13,7 @@
#include <spl.h>
#include <malloc.h>
#include <remoteproc.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 22277b5987e0..9130978537fb 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/arch/clock.h>
#include <asm/arch/psc_defs.h>
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 94e55331d5c7..e98df01e89f7 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -10,6 +10,7 @@
#include <command.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <mach/mon.h>
asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c
index b646599587a9..99c394cd91d6 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -9,6 +9,7 @@
#include <cpu_func.h>
#include <env.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <common.h>
#include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 2337adb6ef2d..a74c4d995b18 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/psc_defs.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 087240b4d3f6..a202e83b08fe 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index a2a30eb80b00..f4f54fafce96 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/sm.h>
#include <asm/cache.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index a0ba2d8e0cf8..0fac5efc2a72 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
+#include <vsprintf.h>
#include <linux/err.h>
#include <asm/io.h>
#include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 7405d692e7b9..a6428a23db41 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/emif.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 03375321a471..f96d1379bb3b 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -20,6 +20,7 @@
#include <log.h>
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 2e10ab983ebd..4ee409521ef7 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -7,6 +7,7 @@
#include <env.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/setup.h>
#include <asm/arch/sys_proto.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index f2c925b2d113..81f3bd37ea35 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/u-boot.h>
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index ce75e7c1f2c3..82a106e786e8 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -15,6 +15,7 @@
#include <hash.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/uclass-internal.h>
#include <misc.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-snapdragon/misc.c b/arch/arm/mach-snapdragon/misc.c
index aaa561c2c68e..03515f6d2bf2 100644
--- a/arch/arm/mach-snapdragon/misc.c
+++ b/arch/arm/mach-snapdragon/misc.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <mmc.h>
+#include <vsprintf.h>
#include <asm/arch/misc.h>
/* UNSTUFF_BITS macro taken from Linux Kernel: drivers/mmc/core/sd.c */
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
index 1042b564c370..d261129a4dd4 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
@@ -6,8 +6,9 @@
*
*/
-#include "pinctrl-snapdragon.h"
#include <common.h>
+#include <vsprintf.h>
+#include "pinctrl-snapdragon.h"
#define MAX_PIN_NAME_LEN 32
static char pin_name[MAX_PIN_NAME_LEN];
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
index 20a71c319b33..da4a2d3901c5 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
@@ -6,8 +6,9 @@
*
*/
-#include "pinctrl-snapdragon.h"
#include <common.h>
+#include <vsprintf.h>
+#include "pinctrl-snapdragon.h"
#define MAX_PIN_NAME_LEN 32
static char pin_name[MAX_PIN_NAME_LEN];
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 6813279e6aef..ae84d2a22579 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <cpu_func.h>
#include <hang.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <init.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index abf0109ba3c1..cf5c918fe54a 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -14,6 +14,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index d12e24f0fefc..7ce8a9dee69e 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -8,6 +8,7 @@
#include <console.h>
#include <misc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index 9ede9388f6dd..89baa9885a84 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -8,6 +8,7 @@
#include <dfu.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/stm32prog.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 4da58041c057..c2cbfe7e48b6 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -11,6 +11,7 @@
#include <mmc.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/stm32mp1_smc.h>
#include <asm/global_data.h>
#include <dm/uclass.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index 002b4d39be69..de1361d9841d 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -6,6 +6,7 @@
#ifndef _STM32PROG_H_
#define _STM32PROG_H_
+#include <vsprintf.h>
#include <linux/printk.h>
/* - phase defines ------------------------------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index c37dca677ead..14bd4cc27d6e 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <dm/lists.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index bcc9239ba92f..616f556ab90c 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -8,6 +8,7 @@
#include <g_dnl.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/arch/stm32prog.h>
#include <asm/arch/sys_proto.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 4ded59569708..80d7d5790a85 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -12,6 +12,7 @@
#include <misc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/bsec.h>
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index f40fccd8f8b9..1a720a0858d0 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -17,6 +17,7 @@
#include <i2c.h>
#include <serial.h>
#include <spl.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index 520b597fcc01..de04e9d84282 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/barriers.h>
#include <asm/io.h>
#include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index 76d698214da4..f85f52898d12 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -22,6 +22,7 @@
#include <common.h>
#include <init.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index 9e34da474798..a877d655d86b 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 0590110d4acb..9d1620c97588 100644
--- a/arch/arm/mach-sunxi/dram_sun6i.c
+++ b/arch/arm/mach-sunxi/dram_sun6i.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <errno.h>
#include <init.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index a46253852196..e3e40aaa5e6d 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/dram.h>
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 922919814ba2..ae126f824c1a 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -8,6 +8,7 @@
#include <env.h>
#include <init.h>
#include <spl.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/libfdt.h>
#include <stdio.h>
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b2fcae619dca..589f9ec9ab22 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -8,6 +8,7 @@
#include <cpu_func.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index ec165a32b0a4..7a9afcb0b18e 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -11,6 +11,7 @@
#include <fdt_support.h>
#include <lmb.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/addrspace.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index a0c60c40c861..d6ea2f5730d0 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -29,6 +29,7 @@
#include <common.h>
#include <cpu_func.h>
#include <init.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/relocs.h>
#include <asm/sections.h>
diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c
index c3efa31f594d..31ab6257fd14 100644
--- a/arch/nds32/cpu/n1213/ae3xx/cpu.c
+++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c
@@ -17,6 +17,7 @@
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/cache.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 3afd1c5cff24..5532d515b733 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
#include <image.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/string.h>
diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c
index dcff67d0eb6a..a61795a52a2b 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -13,6 +13,7 @@
#include <cpu_func.h>
#include <irq_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#undef INTERRUPT_MODE
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 2c8f9731c747..59099a4d5eae 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -10,6 +10,7 @@
#include <image.h>
#include <irq_func.h>
#include <log.h>
+#include <vsprintf.h>
#define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 5c843e4fafd9..b32370fa4d9c 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -11,6 +11,7 @@
#include <mpc83xx.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ppc.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 8bbf8407764e..2ee72517ca2f 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -13,6 +13,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <command.h>
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index a63519bb5cd8..79ad806dbdf0 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -23,6 +23,7 @@
*/
#include <common.h>
#include <asm-offsets.h>
+#include <vsprintf.h>
#include <asm/cpm_85xx.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 397a118140e9..be5381b47a50 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -15,6 +15,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/processor.h>
#include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 2a6e07f28347..35bc146a38be 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -27,6 +27,7 @@
#include <common.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cpm_85xx.h>
#include <command.h>
#include <config.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index c8388da6331d..4864a6809a49 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 59785c562918..61eba2e99355 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -11,6 +11,7 @@
#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
#include <hwconfig.h>
#endif
+#include <vsprintf.h>
#include <asm/fsl_serdes.h>
#include <asm/io.h>
#include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 188318f66ceb..340d563d7d4d 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index cd348bf6ee63..4c7e2f8612a7 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -8,6 +8,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/processor.h>
#include <env.h>
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 5fc672d153dc..add179be3853 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 569aca6474a7..91021e718662 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -21,6 +21,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <command.h>
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index ce29b0f4a79b..d0b7fa75248c 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -15,6 +15,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <command.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 56cd33ee4b93..bc131f85b26b 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/immap_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 6aeb20c4c99f..fdc6b110412d 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -17,6 +17,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ptrace.h>
#include <command.h>
#include <asm/processor.h>
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index 448d4da6a80a..b8771cb61c22 100644
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <spl.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/smp.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index e4192b07be5f..f0721d3f7c50 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -16,6 +16,7 @@
#include <termios.h>
#include <time.h>
#include <unistd.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 5759651b9a4a..b3365c78b4b9 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -11,6 +11,7 @@
#include <cli.h>
#include <sort.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/getopt.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index b6e961f70834..f64ea4e2e664 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -12,6 +12,7 @@
#include <env.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <asm/zimage.h>
#include <linux/string.h>
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index d1067a60f1ed..8567d390376a 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -13,6 +13,7 @@
#include <command.h>
#include <env.h>
#include <irq_func.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/zimage.h>
#include <linux/string.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 21dbcd91e039..cd8500827374 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/e820.h>
#include <asm/arch/sysinfo.h>
#include <asm/global_data.h>
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index ab78059e76e8..66a122c9d427 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/bootparam.h>
#include <asm/e820.h>
#include <asm/global_data.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index e5bf4b225cf3..7369ffa19d75 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <syscon.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cpu.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index cfa70c10e07a..3db95256015d 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -9,6 +9,7 @@
#include <malloc.h>
#include <qfw.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/lists.h>
#include <dm/uclass-internal.h>
#include <dm/root.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 36d0d4da5531..94d117e516ea 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <init.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/sizes.h>
#include <asm/e820.h>
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 8b84565ce62f..10e4e9300ece 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <ns16550.h>
#include <serial.h>
+#include <vsprintf.h>
#include <asm/arch/slimbootloader.h>
#include <asm/global_data.h>
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index ec5b87cfd63f..f78e0eeec802 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -7,6 +7,7 @@
#include <cpu_func.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/arch/slimbootloader.h>
#include <asm/global_data.h>
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 7a0020c74fe0..8aa5efdcab9c 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <cpu.h>
#include <dm.h>
+#include <vsprintf.h>
#include <acpi/acpi_table.h>
#include <asm/ioapic.h>
#include <asm/mpspec.h>
diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index 20926171822d..e70b77972386 100644
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <malloc.h>
#include <rtc.h>
+#include <vsprintf.h>
#include <acpi/acpi_s3.h>
#include <asm/cmos_layout.h>
#include <asm/early_cmos.h>
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 25aa71c6c20a..6850b9b73334 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/fsp1/fsp_support.h>
#include <asm/post.h>
#include <linux/string.h>
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 03385396325d..17729eb8aa0b 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/post.h>
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 8a5082d6f30c..e31565a589e0 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -18,6 +18,7 @@
#include <log.h>
#include <relocate.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot-x86.h>
#include <asm/sections.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index db07d88dbc4a..0e2558ce944c 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cpu.h>
#include <asm/global_data.h>
#include <asm/mtrr.h>
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d467657f8793..219e70607bf8 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -18,6 +18,7 @@
#include <irq_func.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <acpi/acpi_table.h>
#include <asm/io.h>
#include <asm/ptrace.h>
diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c
index 7047b1938d2a..69325e20ec18 100644
--- a/arch/xtensa/cpu/exceptions.c
+++ b/arch/xtensa/cpu/exceptions.c
@@ -14,6 +14,7 @@
#include <command.h>
#include <irq_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ptrace.h>
#include <asm/string.h>
#include <asm/regs.h>
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 791c91d0e0da..ccd5f8ae1e4e 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -19,6 +19,7 @@
#include <i2c.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 6e36a4bb60e8..f6f35f6750df 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -14,6 +14,7 @@
#include <init.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index b6e763b77fa9..9b96b0c30b97 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -16,6 +16,7 @@
#include <fdtdec.h>
#include <i2c.h>
#include <lcd.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 7768aeb59df1..863372e06e01 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include "asm/m5282.h"
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index cc57b9f095f7..2c0c4956cd4f 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <vsprintf.h>
#include <asm/arch/soc.h>
#include <asm/io.h>
#include <linux/bitops.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 7f2ed1350bf2..32dabe99598d 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <net.h>
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index 95911a300a76..f6a434d08c93 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -13,6 +13,7 @@
#include <spi.h>
#include <spi_flash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/mtd/mtd.h>
#include <linux/string.h>
diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index caf7fd681007..005e4bebf13f 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <init.h>
#include <net.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/sm.h>
#include <asm/arch/eth.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 7d9deb57a633..f0c0b5d821c9 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -13,6 +13,7 @@
#include <image.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index d5455dcab354..46cb5e407bb0 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <env.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <w1.h>
#include <w1-eeprom.h>
#include <dm/device-internal.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 93fda9c5b1f3..ca44e5aba962 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -17,6 +17,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 874d24e22d6a..da597bbfb0a3 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -20,6 +20,7 @@
#include <netdev.h>
#endif
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 25005a390f5d..79ba375cd2bc 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 20f62f61fcde..f61e6bb93012 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/platform_data/net_ethoc.h>
#include <env.h>
#include <linux/ctype.h>
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 9c812e9531fe..1c91cfe5f061 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/ptrace.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index cefcc6634ffb..f1874e35ff46 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -11,6 +11,7 @@
#include <irq_func.h>
#include <time.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
@@ -77,7 +78,7 @@ unsigned long flash_init(void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
- panic ("configured to many flash banks!\n");
+ panic("configured to many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++) {
if (j == 0) {
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 94ab9003b35d..0ffa82dd6d38 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -12,6 +12,7 @@
#include <eeprom_layout.h>
#include <eeprom_field.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/setup.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 93ae1c6b0863..4b580b70fbec 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <env.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 002daf23f4db..1a878397007f 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -10,6 +10,7 @@
#include <eeprom.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <u-boot/crc.h>
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 8fec67a69128..08b8e7f4d04e 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <twl4030.h>
#include <status_led.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 80c317a5a5d6..14f8f4d89a2f 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -17,6 +17,7 @@
#include <spi.h>
#include <spi_flash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
#include <asm/ti-common/davinci_nand.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 7a75494d7f3d..3694a034b73a 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -14,6 +14,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
#include <asm/ti-common/davinci_nand.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index b7a1a71de097..960c1adec98d 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <asm/arch/clock.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 9f48438dde31..e875d5410c59 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/stm32.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index f806d1e7672a..4268885e29e5 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -16,6 +16,7 @@
#include <log.h>
#include <spl.h>
#include <i2c.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <debug_uart.h>
#include <asm/global_data.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index b91020ec33f2..ad5285f8ca98 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -34,6 +34,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/at91sam9260.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/gpio.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 28080d423b39..f752ac95ec1e 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <log.h>
#include <mmc.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index 6bda7b040736..7ced22e8430d 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -12,6 +12,7 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/mpc8349_pci.h>
#include <pci.h>
#include <asm/mmu.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 2190e51c150e..72b58360c271 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -8,6 +8,7 @@
#include <env.h>
#include <fsl_validate.h>
#include <stdio.h>
+#include <vsprintf.h>
int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index ff6e2bfb34f5..f12dcb3cf143 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <u-boot/rsa-mod-exp.h>
#include <hash.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 5bceb7747d5e..6938c2c2ead4 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -32,6 +32,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/string.h>
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 6f4f2e6d2413..2d232958c5ba 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/string.h>
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index e6481f695167..5e486a98e848 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -16,6 +16,7 @@
#include <common.h>
#include <log.h>
#include <net.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <tsec.h>
#include <fdt_support.h>
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 2f1144dcd74e..5f07d28e8ec4 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -12,6 +12,7 @@
#include <i2c.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index 77c7dd2c4689..6b68d03cecef 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -10,6 +10,7 @@
#include <irq_func.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#ifdef CONFIG_FSL_LSCH2
#include <asm/arch/immap_lsch2.h>
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 0a31c9e31120..f7c337d677af 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -51,6 +51,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
#include <fsl_mdio.h>
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 09f9f85f91b9..30b7912c270f 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -9,6 +9,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/mmu.h>
#include <asm/processor.h>
#include <asm/cache.h>
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 954f55bdbf62..bda97fbd6bd8 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -52,6 +52,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
#include <fsl_mdio.h>
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index d0d012e67f20..35d7bfcb2ff8 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <netdev.h>
#include <fm_eth.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 61dcdf8fb06f..b35f98b46d15 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 079f19458e41..d4e7c4093078 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -11,6 +11,7 @@
#endif
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
#include "ddr.h"
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 98484ef995be..5a85383d9451 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -11,6 +11,7 @@
#endif
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
#include "ddr.h"
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 93a41cd4a129..1977b08eca27 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <netdev.h>
#include <fdt_support.h>
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index ff7a4e225068..53f788d2e149 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -7,6 +7,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include "ddr.h"
#ifdef CONFIG_FSL_DEEP_SLEEP
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 1e3002005a99..091dbafd8717 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -8,6 +8,7 @@
#include <fsl_ddr_dimm_params.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index f26bbf3267ea..d5a1752c055b 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -10,6 +10,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <hwconfig.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 4175bd33cbf3..473468e53df8 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -8,6 +8,7 @@
#include <fsl_ddr_dimm_params.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 8ad91bcc79ec..6933066e826e 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -8,6 +8,7 @@
#include <fsl_ddr_dimm_params.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 2a25cb9f0703..7756620bdfde 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -9,6 +9,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <hwconfig.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 7a91db928e24..e29cef3d2722 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -8,6 +8,7 @@
#include <fsl_ddr_dimm_params.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 5dfe7489ba88..e592ca12927a 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -18,6 +18,7 @@
#include <phy.h>
#include <fm_eth.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <exports.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index d98b07e2daa2..16f3f49b6cb9 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -20,6 +20,7 @@
#include <miiphy.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/ppc.h>
#include <asm/u-boot.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index 71615fe1ffd9..39731d4bf733 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ppc.h>
#include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 4015b475f065..941a85ed927b 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ppc.h>
#include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 682e17ac56f2..8d25628709b5 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ppc.h>
#include <fsl_ddr_sdram.h>
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 648ff4c3e792..f4bf325e0d3c 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -15,6 +15,7 @@
#include <pci.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/cache.h>
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 256cdc684247..4e1254dd1344 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -14,6 +14,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/string.h>
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index e95f0481be22..496d3a4f3088 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 0faa288f003e..94b050200500 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -16,6 +16,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
#include <fsl_mdio.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 6588804fbbaa..00c83d664385 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -13,6 +13,7 @@
#include <pci.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/mmu.h>
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 8afb71c4c80a..8e6bb29877d9 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 6a6bacf2d4fc..e2c8492138ec 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 382f1ebe53ed..ca9ab0013d04 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index f60e2047759c..c2fcbfeedf67 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/mmu.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 2a375619116b..3ce072ce6810 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 037190ff11dc..c3b1c7e0fe19 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 03a9e43875a1..2e446f86753a 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -16,6 +16,7 @@
#include <spi.h>
#include <spi_flash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/stringify.h>
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 3f7ce584528f..299f92f68262 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx6-pins.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index efaff179a2c5..7d6509be77bf 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
index 143493c24ab3..d98fa4bf2ee5 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <common.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index a8b012dda736..4932fc2d1173 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>
#include <asm/arch/iomux.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index fb371be4926d..20c1a4fe3cce 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -12,6 +12,7 @@
#include <net.h>
#include <stdio.h>
#include <tpm-v1.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index 4d6d0da76fae..feeae37cd700 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -2,6 +2,7 @@
#include <dm.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm-generic/gpio.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 72fef03d7b13..881f2cc7bf25 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -8,6 +8,7 @@
#include <command.h>
#include <console.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index e4941a94f310..fb9c7b8a6eca 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -10,6 +10,7 @@
#include <command.h>
#include <i2c.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/stringify.h>
#include "ch7301.h"
@@ -504,5 +505,6 @@ U_BOOT_CMD(
);
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c
index b73e2597299b..e306d7e82fed 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <video_osd.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 3258cc72179e..1399a2726b30 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <tpm-v1.h>
#include <video_osd.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 0d88f8ad4a9e..36489db79adb 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -8,6 +8,7 @@
#include <image.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index fbbfbd8fb292..e6bcb08aadf1 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -8,6 +8,7 @@
#include <command.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux.h>
#include <asm/arch/imx-regs.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 1a47a8457372..144193f44552 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -12,6 +12,7 @@
#include <net.h>
#include <netdev.h>
#include <scsi.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 7ed9b53bc169..1edbf36ea903 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -14,6 +14,7 @@
#include <pci_msc01.h>
#include <rtc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 8d1c4ade1c5c..42ebb831f577 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <mmc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <u-boot/md5.h>
#include <usb.h>
#include <watchdog.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 098ef3f96646..cb129dca03e6 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -14,6 +14,7 @@
#include <twl4030.h>
#include <netdev.h>
#include <spl.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/arch/mem.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 9a5c5cb64da6..387c2271046f 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -13,6 +13,7 @@
#include <env.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "kp_id_rev.h"
#include <net.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 5287ec205355..d87c0ac8f153 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -16,6 +16,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/u-boot.h>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index f850c4d75633..5aae1db2ad34 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "common.h"
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index bfea7a41ae2b..b7dd0243a5a1 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -21,6 +21,7 @@
#include <miiphy.h>
#include <spi.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 46316d345424..0a977ca84ae2 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -14,6 +14,7 @@
#include <init.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 93186b9bca35..41751f3d15c1 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index e58bf3acc2e8..6d9f8c988bf6 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -25,6 +25,7 @@
#include <env.h>
#include <init.h>
#include <time.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <malloc.h>
#include <twl4030.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 57f30a04ed8c..97986b67f1c4 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 9ba3dcb092ac..ebb7ddb1fb73 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 647ebde09a7c..45586323f3af 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -15,6 +15,7 @@
#include <memalign.h>
#include <mmc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/arch/mbox.h>
#include <asm/arch/msg.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 5c65b0d692a8..ceeba7eda68d 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/mmc.h>
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index 014fdf94b75f..bcd8060d2b58 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/mmc.h>
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index 80f296444064..fca730212f06 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/mmc.h>
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index 366076a3b880..71a3f5dd39cb 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -11,6 +11,7 @@
#include <command.h>
#include <cpu_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/gpio.h>
#include <linux/string.h>
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index b443c36b1dfb..7a52eaa9d399 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <dm.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 8ee9ca43c41d..4fcc0bf6f770 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <tmu.h>
#include <netdev.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 97f4097cbcd8..4463f64dbc20 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <fdtdec.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <errno.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index eef565d1cee8..4438bff523e0 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -10,6 +10,7 @@
#include <lcd.h>
#include <libtizen.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/delay.h>
#include <linux/printk.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 19e5bccbdb51..37bab0f49338 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/power.h>
#include <asm/arch/clock.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index b79a87242734..f21cfe40d53c 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -11,6 +11,7 @@
#include <lcd.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/gpio.h>
#include <asm/arch/cpu.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 6880dcda1caf..fcbead5c127c 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -9,6 +9,7 @@
#include <lcd.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/power.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index f1d93dc0aa1e..2e4c72f97810 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -13,6 +13,7 @@
#include <os.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/test.h>
#include <asm/u-boot-sandbox.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 18d9c64f55a2..ebd34939cb41 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -20,6 +20,7 @@
#include <pca953x.h>
#include <power-domain.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/arch/imx8-pins.h>
#include <asm/arch/iomux.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 769979952174..490c80a5734c 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -18,6 +18,7 @@
#include <serial.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 75c347973227..d60ef4e87cd7 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -18,6 +18,7 @@
#include <asm/arch/cpu.h>
#endif
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/sys_proto.h>
#include <asm/unaligned.h>
#include <net.h>
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 4fec3d8c95e1..18b397c61d40 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -21,6 +21,7 @@
#include <net.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 531ed7e15972..2da0560bd2be 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -19,6 +19,7 @@
#include <spi.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 631812f15083..102e7e82cd9d 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -18,6 +18,7 @@
#include <flash.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index dea0924c6bf5..2ca4dcbe492e 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/delay.h>
diff --git a/board/sifive/fu540/spl.c b/board/sifive/fu540/spl.c
index fe27316b2d9a..f60acc87b2c6 100644
--- a/board/sifive/fu540/spl.c
+++ b/board/sifive/fu540/spl.c
@@ -10,6 +10,7 @@
#include <spl.h>
#include <misc.h>
#include <log.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <asm/gpio.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 7c9d4885dbef..ade287493bc2 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -10,6 +10,7 @@
#include <net.h>
#include <status_led.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/reset_manager.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 890d456ef4fe..ad2d5d5998ca 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -18,6 +18,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 0cf9a1544b80..a02cc29f7f24 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -13,6 +13,7 @@
#include <mtd.h>
#include <mtd_node.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/stm32prog.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 9d8fc9f5a2e1..3cbf5916ae95 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -15,6 +15,7 @@
#include <env.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 35e71380b892..4e503825dfaf 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index fcc34e7955a6..c9ce68f679bd 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <init.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b86cbee8e908..61a86df37b4e 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <syscon.h>
#include <usb.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index cca98e2d5426..b2ee68d9c21f 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -22,6 +22,7 @@
#include <generic-phy.h>
#include <phy-sun4i-usb.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/cpu.h>
#include <asm/arch/display.h>
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index dbec12c8a7bc..6b1fff98a45c 100644
--- a/board/synopsys/hsdk/env-lib.c
+++ b/board/synopsys/hsdk/env-lib.c
@@ -7,6 +7,7 @@
#include "env-lib.h"
#include <env.h>
#include <log.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#define MAX_CMD_LEN 25
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 9c6e8dbc8f25..4fe6219514de 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -14,6 +14,7 @@
#include <irq_func.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 090a471a7172..2f3df5209284 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -15,6 +15,7 @@
#endif
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 715dcbdc7bc8..7edfd2a2b92e 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -11,6 +11,7 @@
#include <misc.h>
#include <spl.h>
#include <syscon.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <u-boot/crc.h>
#include <usb.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 0fa4d31a2e7b..67695ca61f55 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -18,6 +18,7 @@
#include <spl.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/omap.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index e0fb2b39b7da..869131a08f95 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <usb.h>
#include <errno.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/omap_common.h>
#include <asm/omap_sec_common.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 5721ef9e11d1..862398e53a2b 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/omap_common.h>
#include <dm/uclass.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index e88aac06683d..b283bb410399 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -20,6 +20,7 @@
#include <sata.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/string.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 0c31ca2f7cc2..5872ce4648c9 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -15,6 +15,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 7b6f04b36beb..1b9b79f65ae0 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/string.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 76cf8e360f9b..62ae4dbf9225 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/bitops.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 51e62b6ab20b..16bb57991375 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/bitops.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 2bdd589126db..b0057b585c12 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include "tdx-cfg-block.h"
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 6a28a9b31f65..7c7f15d19915 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -8,6 +8,7 @@
#include <g_dnl.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/string.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 5ebbdda38e2a..42dd0a8f173e 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx6-pins.h>
#include <asm/arch/imx-regs.h>
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 7667bbdc579e..80cd3753cbf9 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -15,6 +15,7 @@
#include <env.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 0677bd1c693c..5221b6174d76 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/mmu.h>
#include <asm/ppc.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 045e46aba301..434aadd8763b 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index d13a10e1a7cb..7272dc2bb2e8 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/mx7-pins.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 48bd3dcd1508..68c6f4827732 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 91446fb9c39c..b3c486ab1b39 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <init.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/uclass.h>
#include <env.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index b3a2c933b7ca..00f2feba27b8 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 48898f69c938..15a059896133 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <zynqmp_firmware.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 0686b16a887e..58067c213a84 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -17,6 +17,7 @@
#include <scsi.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <wdt.h>
#include <asm/arch/clk.h>
#include <asm/arch/hardware.h>
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index f90468a1ae3e..73b6053c65d9 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -10,6 +10,7 @@
#include <image.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 2904b146befd..a6df5785f5fb 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -8,6 +8,7 @@
#include <display_options.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <acpi/acpi_table.h>
#include <asm/acpi_table.h>
#include <asm/global_data.h>
diff --git a/cmd/adc.c b/cmd/adc.c
index 9869aad8dceb..8737f9c7f740 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <adc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/printk.h>
static int do_adc_list(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index 90a72619720b..e31a5b10b563 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -10,6 +10,7 @@
#include <image-android-dt.h>
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define OPT_INDEX "--index"
diff --git a/cmd/aes.c b/cmd/aes.c
index 51bc922b937c..db4cd114628b 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <uboot_aes.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#include <mapmem.h>
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 4c4a719ad019..e76838c55c29 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -10,6 +10,7 @@
#include <console.h>
#include <flash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/string.h>
diff --git a/cmd/avb.c b/cmd/avb.c
index a9de5bed9735..6cf9648670a4 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -12,6 +12,7 @@
#include <malloc.h>
#include <mmc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define AVB_BOOTARGS "avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index e61cc3e35ca2..858fddee1318 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -17,6 +17,7 @@
#include <dm.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
/* Currently selected AXI bus device */
static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 4cccd8eab3f2..46737101f658 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index 050c4be2d72f..b008d4a6e8cc 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/uclass-internal.h>
diff --git a/cmd/binop.c b/cmd/binop.c
index a643cc906cec..9fde726b5cb9 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -7,6 +7,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index aed076acb77e..4bf7a582b52e 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -12,6 +12,7 @@
#include <blk.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index 025c692b485c..632f73a58c0b 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
static int blkc_show(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[])
diff --git a/cmd/blob.c b/cmd/blob.c
index a3b4f7a32862..d4ee6966e975 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 499e3585f742..a4c8c3f5c06c 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -21,6 +21,7 @@
#include <splash.h>
#include <stdio.h>
#include <video.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/string.h>
diff --git a/cmd/boot.c b/cmd/boot.c
index 36aba22b301b..8b079b31714c 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <net.h>
+#include <vsprintf.h>
#ifdef CONFIG_CMD_GO
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 8fb56106a898..63902ef730dc 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -18,6 +18,7 @@
#include <image.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/libfdt.h>
#include <linux/libfdt_env.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index de60d4ea7cbc..52ce6bbc031e 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/kernel.h>
#include <linux/sizes.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 4490e4d3ac15..b6a2a75e8bf2 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -16,6 +16,7 @@
#include <malloc.h>
#include <nand.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <asm/global_data.h>
#include <linux/ctype.h>
--git a/cmd/bootmenu.c b/cmd/bootmenu.c
index e307660e516c..d76ae7b13634 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <menu.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <malloc.h>
#include <linux/delay.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 1592f24c11d3..3cf4138e2d42 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -7,6 +7,7 @@
#include <bootstage.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/bootz.c b/cmd/bootz.c
index a251c48a0b88..e34ed63b4dfe 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -12,6 +12,7 @@
#include <lmb.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/compiler.h>
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 432974009a1d..8f7a10751f7b 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -11,6 +11,7 @@
#include <env.h>
#include <cbfs.h>
#include <stdio.h>
+#include <vsprintf.h>
static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 8f4d0ab54a01..b34a4dde0799 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -17,6 +17,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/list.h>
#include <linux/ctype.h>
#include <jffs2/jffs2.h>
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index d381980ec6cd..38f89dd05f67 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -13,6 +13,7 @@
#include <flash.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
#include <linux/string.h>
diff --git a/cmd/demo.c b/cmd/demo.c
index aaeff9c18883..39236e6955e0 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -12,6 +12,7 @@
#include <dm-demo.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
struct udevice *demo_dev;
diff --git a/cmd/dfu.c b/cmd/dfu.c
index b19b79c57eb6..97c422a2843c 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <command.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <dfu.h>
#include <console.h>
diff --git a/cmd/disk.c b/cmd/disk.c
index bfebe3520c33..fcb19ee02e44 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index ffd1db893bf7..5d6df466c1c2 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -26,6 +26,7 @@
#include <i2c.h>
#include <eeprom_layout.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index c81c23463b20..ca3804c33154 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -16,6 +16,7 @@
#include <mapmem.h>
#include <search.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/elf.c b/cmd/elf.c
index c38d8d015a90..37267ccacaee 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <vxworks.h>
#ifdef CONFIG_X86
#include <vbe.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 6b76061cd0f8..fe93d2a8b173 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -13,6 +13,7 @@
#include <ethsw.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static const char *ethsw_name;
diff --git a/cmd/exit.c b/cmd/exit.c
index 7bf241ec732d..b84b6c0e1c01 100644
--- a/cmd/exit.c
+++ b/cmd/exit.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
+#include <vsprintf.h>
static int do_exit(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 8340af5df8cb..0a6cfe453097 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index d56648f2a856..e3bee99ec9b0 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -14,6 +14,7 @@
#include <fs.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/fdt.c b/cmd/fdt.c
index e784b0d5d943..ba44460ea39d 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -12,6 +12,7 @@
#include <env.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index ce44d7dc76bd..56995822cb7b 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <stdio.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/string.h>
#if defined(CONFIG_CMD_MTDPARTS)
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 924ca10749d4..b3ec2b25568e 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -17,6 +17,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static long do_fpga_get_device(char *arg)
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index 89b34f864259..96901b684a6f 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -12,6 +12,7 @@
#include <command.h>
#include <console.h>
#include <display_options.h>
+#include <vsprintf.h>
#include <gdsys_fpga.h>
diff --git a/cmd/fuse.c b/cmd/fuse.c
index d3680e98440d..b75676e641e5 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -13,6 +13,7 @@
#include <console.h>
#include <fuse.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 92831350b48f..3171556bb286 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <linux/err.h>
#include <linux/string.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 639fcae8e31c..086a91ab5776 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -21,6 +21,7 @@
#include <exports.h>
#include <stdio.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <div64.h>
#include <memalign.h>
diff --git a/cmd/host.c b/cmd/host.c
index dec1da41def3..b06bbc922c93 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -10,6 +10,7 @@
#include <part.h>
#include <sandboxblockdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device_compat.h>
#include <linux/errno.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index c1f7372a151a..2f442f0e8110 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -76,6 +76,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#include <linux/delay.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index 787e3ed950e8..0c25c7ae5fea 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -15,6 +15,7 @@
#include <command.h>
#include <env.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/io.c b/cmd/io.c
index dd770a20ce19..d16bb4f8c618 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <display_options.h>
+#include <vsprintf.h>
#include <asm/io.h>
/* Display values from last command */
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index e691e91c4861..f6db7ad48eaa 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <iotrace.h>
#include <stdio.h>
+#include <vsprintf.h>
static void do_print_stats(void)
{
diff --git a/cmd/itest.c b/cmd/itest.c
index 0ec595c0d700..0d0e1521953a 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -17,6 +17,7 @@
#include <env.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <asm/io.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 5ccd5b091532..b2dba80cf2c8 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -77,6 +77,7 @@
#include <image.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <jffs2/jffs2.h>
#include <linux/bug.h>
#include <linux/list.h>
diff --git a/cmd/led.c b/cmd/led.c
index 33714e26ae9d..5ba868068523 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <led.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/uclass-internal.h>
#include <linux/string.h>
diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c
index c763121fe5e8..2918ee6d28de 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -2,6 +2,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <jffs2/jffs2.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index 4176f089dfce..d70f6d11462c 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -13,6 +13,7 @@
#include <config.h>
#include <command.h>
#include <status_led.h>
+#include <vsprintf.h>
#include <linux/string.h>
struct led_tbl_s {
diff --git a/cmd/load.c b/cmd/load.c
index fc50722e0655..b2db540e8d1b 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -19,6 +19,7 @@
#include <exports.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <xyzModem.h>
#include <asm/cache.h>
#include <asm/global_data.h>
diff --git a/cmd/log.c b/cmd/log.c
index a233d239bb3c..88efad8a9f9f 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 409ad6e69c16..1452a7ac558d 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -14,6 +14,7 @@
#include <env.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <lzma/LzmaTools.h>
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index a6e12bba4b54..2fb8d7b27597 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -13,6 +13,7 @@
#include <image.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <u-boot/md5.h>
#include <asm/io.h>
diff --git a/cmd/mdio.c b/cmd/mdio.c
index 581d0a7db7e2..50e3919487aa 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -14,6 +14,7 @@
#include <miiphy.h>
#include <phy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static char last_op[2];
diff --git a/cmd/mem.c b/cmd/mem.c
index ca2b2fabb333..7e951323a7a9 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -24,6 +24,7 @@
#include <rand.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/cmd/mii.c b/cmd/mii.c
index be67ea70ba2b..d1c377595e28 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -13,6 +13,7 @@
#include <dm.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
typedef struct _MII_field_desc_t {
diff --git a/cmd/misc.c b/cmd/misc.c
index c349ade10f1b..65bc67f6da05 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -12,6 +12,7 @@
#include <console.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 5d2a0e002b97..f76fbe28ea25 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -15,6 +15,7 @@
#include <sparse_format.h>
#include <image-sparse.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int curr_device = -1;
diff --git a/cmd/mp.c b/cmd/mp.c
index d82a8675e66f..ed466685319a 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <cpu_func.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int cpu_status_all(void)
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 25c288f356c0..5c7493549953 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -15,6 +15,7 @@
#include <mapmem.h>
#include <mtd.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/err.h>
#include <linux/string.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 875424013fea..f18a6e70f100 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -76,6 +76,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <jffs2/load_kernel.h>
#include <linux/list.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 787baa78c55e..286d5ee1df51 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -23,6 +23,7 @@
#include <bootstage.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <linux/mtd/mtd.h>
#include <command.h>
diff --git a/cmd/net.c b/cmd/net.c
index d70206587104..691cef173682 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
#include <image.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int netboot_common(enum proto_t, struct cmd_tbl *, int, char * const []);
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index e859dfc29bb4..84af5f05e976 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -36,6 +36,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
#include <linux/printk.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index aac7fb91a606..91214c93e225 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -18,6 +18,7 @@
#include <rtc.h>
#include <stdio.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index af974b93fc5f..c71b8b98b9d3 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -13,6 +13,7 @@
#include <command.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index 2d9ac604cae3..9ad0407521ac 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <video_osd.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/string.h>
/* Container for selected OSD device */
diff --git a/cmd/panic.c b/cmd/panic.c
index f13b3f094fab..ed2bfed03f8f 100644
--- a/cmd/panic.c
+++ b/cmd/panic.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <command.h>
+#include <vsprintf.h>
static int do_panic(struct cmd_tbl *cmdtp, int flag, int argc,
char * const argv[])
diff --git a/cmd/pcap.c b/cmd/pcap.c
index d0172f3fffc4..b5a3b3c0444c 100644
--- a/cmd/pcap.c
+++ b/cmd/pcap.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
#include <net.h>
+#include <vsprintf.h>
#include <net/pcap.h>
static int do_pcap_init(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/pci.c b/cmd/pci.c
index b8818b5f3d7a..48a945e30f05 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -20,6 +20,7 @@
#include <dm.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <pci.h>
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 6712d9238dc2..3ac12938c8ac 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/uclass-internal.h>
#include <power/pmic.h>
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 84f7c9f37efb..7673469d39f0 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -9,6 +9,7 @@
#include <fs.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include "pxe_utils.h"
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 425e6f984fb1..748c314fa077 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -14,6 +14,7 @@
#include <lcd.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <errno.h>
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 4470059975a9..0cb6b85504d4 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -9,6 +9,7 @@
#include <errno.h>
#include <qfw.h>
#include <stdio.h>
+#include <vsprintf.h>
/*
* This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index f1d23fb478f3..254925c1f78f 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -12,6 +12,7 @@
#include <command.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
int do_read(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
diff --git a/cmd/regulator.c b/cmd/regulator.c
index a9105561b6e7..cdf8940fa9e3 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/uclass-internal.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 660a1b563577..fbb40095aa67 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <remoteproc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
/**
diff --git a/cmd/rng.c b/cmd/rng.c
index d5a1faf7a77b..92d7c0de639d 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <rng.h>
#include <stdio.h>
+#include <vsprintf.h>
static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
diff --git a/cmd/rockusb.c b/cmd/rockusb.c
index 4eda6fa3e947..8a2ac1e3fccb 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -9,6 +9,7 @@
#include <g_dnl.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/arch-rockchip/f_rockusb.h>
static int do_rockusb(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/rtc.c b/cmd/rtc.c
index f048494c551c..66d18b5973f0 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -9,6 +9,7 @@
#include <mapmem.h>
#include <rtc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define MAX_RTC_BYTES 32
diff --git a/cmd/sata.c b/cmd/sata.c
index 2c7be9c5fe8e..3ce351323ccf 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -17,6 +17,7 @@
#include <part.h>
#include <sata.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
#include <linux/string.h>
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 29d6e3eac020..9aefaeb14131 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -15,6 +15,7 @@
#include <log.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static ulong get_arg(char *s, int w)
diff --git a/cmd/sf.c b/cmd/sf.c
index cf4be7774376..c6a69422ebde 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -18,6 +18,7 @@
#include <spi_flash.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <jffs2/jffs2.h>
#include <linux/mtd/mtd.h>
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 89ef440f1dc8..8305d741bb0a 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -4,6 +4,7 @@
* Michalis Pappas <mpappas@fastmail.fm>
*/
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/psci.h>
#include <common.h>
#include <command.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index 95d7b8b6ecc4..c01ee4bd4c9a 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -10,6 +10,7 @@
#include <fdtdec.h>
#include <sound.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/source.c b/cmd/source.c
index b7dfeb0adf27..d5488a903ef1 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -22,6 +22,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <asm/io.h>
diff --git a/cmd/spi.c b/cmd/spi.c
index 7184e44c030e..72662f0e0b11 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <spi.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
/*-----------------------------------------------------------------------
diff --git a/cmd/strings.c b/cmd/strings.c
index adc6e8147126..0d31b3d47f85 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static char *start_addr, *last_addr;
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 4f6869382f2d..9090b8ee4415 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -5,6 +5,7 @@
#include <env.h>
#include <fs.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "pxe_utils.h"
diff --git a/cmd/test.c b/cmd/test.c
index ad69e6dd7a6c..e95b8cb44067 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -8,6 +8,7 @@
#include <command.h>
#include <fs.h>
#include <log.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define OP_INVALID 0
diff --git a/cmd/thordown.c b/cmd/thordown.c
index e837064ffdd5..f5e73ba963bc 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -13,6 +13,7 @@
#include <dfu.h>
#include <g_dnl.h>
#include <usb.h>
+#include <vsprintf.h>
#include <linux/printk.h>
int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 6be51f8c3358..c036df8a1f8c 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/hardware.h>
#include <asm/cache.h>
#include <asm/emif.h>
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 5a9abf440584..98104fb7f2d1 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -18,6 +18,7 @@
#include <init.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c
index 943bd0bfc9a2..2df4dc069200 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/unaligned.h>
#include <linux/string.h>
#include <tpm-common.h>
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 4e935b286760..00d589fac072 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -8,6 +8,7 @@
#include <env.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/unaligned.h>
#include <tpm-common.h>
#include <tpm-v1.h>
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 33cc85fa6f08..1a6e80a38666 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <tpm-common.h>
#include <tpm-v2.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "tpm-user-utils.h"
diff --git a/cmd/trace.c b/cmd/trace.c
index a09d837c0496..0de1ac02ae2b 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -9,6 +9,7 @@
#include <mapmem.h>
#include <stdio.h>
#include <trace.h>
+#include <vsprintf.h>
#include <asm/io.h>
static int get_args(int argc, char *const argv[], char **buff,
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 6a9e346f27d6..17f7f192f963 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <linux/string.h>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 707f1a9b87d0..54955f5ef2ff 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -21,6 +21,7 @@
#include <nand.h>
#include <onenand_uboot.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 1e2dfab2f491..191199c07625 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -17,6 +17,7 @@
#include <log.h>
#include <stdio.h>
#include <ubifs_uboot.h>
+#include <vsprintf.h>
static int ubifs_initialized;
static int ubifs_mounted;
diff --git a/cmd/ufs.c b/cmd/ufs.c
index a04d15a2441c..8d3ee93ae223 100644
--- a/cmd/ufs.c
+++ b/cmd/ufs.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <ufs.h>
+#include <vsprintf.h>
#include <linux/string.h>
static int do_ufs(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/universe.c b/cmd/universe.c
index c7edde24d453..b1eeff7a6608 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <linux/string.h>
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index 7221a8bd2c79..a885c93dc4b8 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <lz4.h>
#include <stdio.h>
+#include <vsprintf.h>
static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/unzip.c b/cmd/unzip.c
index a2d21ffa0a80..3143877dd8c7 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -10,6 +10,7 @@
#include <gzip.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
static int do_unzip(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/usb.c b/cmd/usb.c
index cc2f4f62e99d..6a6d20096ad0 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -17,6 +17,7 @@
#include <console.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/uclass-internal.h>
#include <memalign.h>
#include <asm/byteorder.h>
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 651a3ebcb5d4..912ad274aeba 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -11,6 +11,7 @@
#include <g_dnl.h>
#include <sdp.h>
#include <usb.h>
+#include <vsprintf.h>
#include <linux/printk.h>
static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 51d5ad78c633..84d919d4467c 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <usb.h>
#include <usb_mass_storage.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <linux/delay.h>
#include <linux/printk.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index 6b3ecea8b039..be6d076a8841 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -8,6 +8,7 @@
#include <command.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <w1.h>
#include <w1-eeprom.h>
#include <dm/device-internal.h>
diff --git a/cmd/wdt.c b/cmd/wdt.c
index fff95a93b327..422be75a0db3 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <wdt.h>
static struct udevice *currdev;
diff --git a/cmd/wol.c b/cmd/wol.c
index f0d634322721..61a9d95e0eb5 100644
--- a/cmd/wol.c
+++ b/cmd/wol.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <net.h>
+#include <vsprintf.h>
#if defined(CONFIG_CMD_WOL)
void wol_set_timeout(ulong);
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 6bc4fb1c9be4..2f2e205d7100 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/msr.h>
#include <asm/mp.h>
#include <asm/mtrr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index c6016719dc96..11acfaab4d9c 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -20,6 +20,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#if defined(CONFIG_BZIP2)
#include <bzlib.h>
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 3a3dba3cfd38..29b52f7ceda3 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -15,6 +15,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <config.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index 9a03722a0306..dde1c097c63f 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -15,6 +15,7 @@
#include <env.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <zfs_common.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index 407390a95a48..bb2a9ff969e2 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <gzip.h>
#include <stdio.h>
+#include <vsprintf.h>
static int do_zip(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
diff --git a/common/autoboot.c b/common/autoboot.c
index 1effce6f7e55..4ba7e25588ae 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -20,6 +20,7 @@
#include <post.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/common/board_r.c b/common/board_r.c
index 15f3209b2924..7ddf7c78835e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -22,6 +22,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
diff --git a/common/bootm.c b/common/bootm.c
index aaacd3ba4b02..901e2a1e253e 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -18,6 +18,7 @@
#include <mapmem.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 1987c574d995..2496a3cc6243 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -15,6 +15,7 @@
#include <lmb.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
diff --git a/common/bootretry.c b/common/bootretry.c
index cd04ad9894df..5417389a9a39 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -11,6 +11,7 @@
#include <errno.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <watchdog.h>
#ifndef CONFIG_BOOT_RETRY_MIN
diff --git a/common/bootstage.c b/common/bootstage.c
index 4656951675cc..190379f8ac07 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -17,6 +17,7 @@
#include <sort.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/compiler.h>
#include <linux/libfdt.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index f077707f9f7e..7a66d337148e 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -87,6 +87,7 @@
#ifndef CONFIG_SYS_PROMPT_HUSH_PS2
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#endif
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#endif
diff --git a/common/console.c b/common/console.c
index 556fc60139a5..c3007f575c20 100644
--- a/common/console.c
+++ b/common/console.c
@@ -20,6 +20,7 @@
#include <stdio_dev.h>
#include <exports.h>
#include <env_internal.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <linux/delay.h>
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 9493d1158d40..801d8633bae6 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,6 +1,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index e68cf5d48101..d67b0f4f0b81 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <eeprom_field.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index c768e4c8bab1..d506d580914a 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <stdio.h>
#include <stdio_dev.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/common/hash.c b/common/hash.c
index f6d032038f73..e44fdedc2fa4 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -18,6 +18,7 @@
#include <mapmem.h>
#include <hw_sha.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 3a4ba40b743b..d9a1230f26f5 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/image-fdt.c b/common/image-fdt.c
index af93298ffab3..e01e88b989a1 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -18,6 +18,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/libfdt.h>
#include <mapmem.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index 76318ca6ed3c..01353f0157d4 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -15,6 +15,7 @@
#include <u-boot/crc.h>
#else
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/compiler.h>
#include <linux/kconfig.h>
#include <common.h>
diff --git a/common/image.c b/common/image.c
index 61c608858565..565a5ebeed59 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/u-boot.h>
#include <linux/string.h>
diff --git a/common/kallsyms.c b/common/kallsyms.c
index b8e64c5b6334..80bd8c1c76c2 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <vsprintf.h>
#include <linux/string.h>
/* We need the weak marking as this symbol is provided specially */
diff --git a/common/kgdb.c b/common/kgdb.c
index 62997f100055..9bf7434ddb25 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -89,6 +89,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/ptrace.h>
#include <linux/string.h>
diff --git a/common/lcd.c b/common/lcd.c
index 442e61d9fd20..f71477c2963c 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -14,6 +14,7 @@
#include <env_callback.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <init.h>
#include <asm/global_data.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 0ccb4a468802..6c70b88e10ee 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -16,6 +16,7 @@
#if defined(CONFIG_LCD_LOGO)
#include <bmp_logo.h>
#endif
+#include <vsprintf.h>
#include <linux/string.h>
static struct console_t cons;
diff --git a/common/log.c b/common/log.c
index 493ee0ff0d9f..c4eaed2c91ed 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <malloc.h>
#include <stdarg.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/uclass.h>
#include <linux/string.h>
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 6cb4ed18ca12..21c10511df15 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <net.h>
#include <stdarg.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/common/main.c b/common/main.c
index 4b3cd302c3e2..9ce703090bc5 100644
--- a/common/main.c
+++ b/common/main.c
@@ -16,6 +16,7 @@
#include <init.h>
#include <net.h>
#include <version.h>
+#include <vsprintf.h>
static void run_preboot_environment_command(void)
{
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 5680157b7202..fd1039c0ee1e 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -15,6 +15,7 @@
#include <miiphy.h>
#include <phy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4c852d347547..5fd0119cb59d 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -19,6 +19,7 @@
#include <serial.h>
#include <spl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <nand.h>
diff --git a/common/splash.c b/common/splash.c
index e6dce1dbf3a6..1f92d791df8a 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -26,6 +26,7 @@
#include <splash.h>
#include <lcd.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
static struct splash_location default_splash_locations[] = {
diff --git a/common/splash_source.c b/common/splash_source.c
index 8166d0055b96..99dce118a8f2 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -21,6 +21,7 @@
#include <splash.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/common/stdio.c b/common/stdio.c
index 3f29c91ce48e..eea1507754db 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -19,6 +19,7 @@
#include <stdio_dev.h>
#include <serial.h>
#include <splash.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/common/update.c b/common/update.c
index 5fb6a2d5288f..5cf02ddec2db 100644
--- a/common/update.c
+++ b/common/update.c
@@ -10,6 +10,7 @@
#include <cpu_func.h>
#include <image.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 244bd0a13694..a846fc5dff9a 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -31,6 +31,7 @@
#include <memalign.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/processor.h>
#include <asm/unaligned.h>
#include <linux/ctype.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 3416bee012f6..9fc002bcf67a 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -41,6 +41,7 @@
#include <mapmem.h>
#include <memalign.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <asm/cache.h>
#include <asm/processor.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index e8eb578f6964..46dbf7c7ee60 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -23,6 +23,7 @@
*/
#include <common.h>
#include <time.h>
+#include <vsprintf.h>
#include <xyzModem.h>
#include <stdarg.h>
#include <u-boot/crc.h>
diff --git a/disk/part.c b/disk/part.c
index e0d699ce6613..fdde4d61eba9 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -15,6 +15,7 @@
#include <part.h>
#include <stdio.h>
#include <ubifs_uboot.h>
+#include <vsprintf.h>
#include <linux/string.h>
#undef PART_DEBUG
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index e8c7068081ba..40ae1466788f 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <ide.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "part_amiga.h"
#include <part.h>
diff --git a/disk/part_dos.c b/disk/part_dos.c
index a321ad2d2207..4c4e5dfe11c7 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -19,6 +19,7 @@
#include <ide.h>
#include <memalign.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "part_dos.h"
#include <part.h>
diff --git a/disk/part_efi.c b/disk/part_efi.c
index d066d9c920ce..659373791995 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -15,6 +15,7 @@
#include <part.h>
#include <stdio.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/unaligned.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index aa30bf0846e6..f2109c80ce2c 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -12,6 +12,7 @@
#include <cpu_func.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/ppc.h>
#include <asm/fsl_serdes.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f122d154e334..849b6892ba85 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -39,6 +39,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 920a3c9f9014..b55b9daab744 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -11,6 +11,7 @@
#include <pci.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <malloc.h>
#include <asm/io.h>
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 1e4b6ba0c6bd..0ada5b693b10 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -39,6 +39,7 @@
#include <stdarg.h>
#include <common.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index fe68d1ffd0ff..e830a9b6f9cc 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/uclass-internal.h>
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 6ac9323420d9..c7b37bfe11bb 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 5c4d24c9c028..08c9b6a3b36c 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -12,6 +12,7 @@
#include <malloc.h>
#include <sandboxblockdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device_compat.h>
#include <linux/errno.h>
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 50621e47a4fa..22aaad102838 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <board.h>
+#include <vsprintf.h>
#include "sandbox.h"
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index fff359a8035b..664d8f986150 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -10,6 +10,7 @@
#include <div64.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/global_data.h>
#include <dm/lists.h>
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index b00fe1d13b0e..f590ad8dfa9a 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -11,6 +11,7 @@
#include <clk-uclass.h>
#include <dm.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device_compat.h>
#include <dm/lists.h>
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 26f240b022c4..368cd023578e 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -22,6 +22,7 @@
#include <common.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/bug.h>
#include <linux/libfdt.h>
--git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index f6597c273507..e04fc9d2687a 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <dm/of_access.h>
#include <dm/of_extra.h>
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 31c1d67fe2c0..fe94799b230d 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -10,6 +10,7 @@
#include <fdt_support.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/libfdt.h>
#include <dm/of_access.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index fd079951d6f0..5a2fe894a5de 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <init.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/bitops.h>
diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c
index 7c5ccaa0d00a..9092562fb7c6 100644
--- a/drivers/cpu/cpu_sandbox.c
+++ b/drivers/cpu/cpu_sandbox.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <cpu.h>
+#include <vsprintf.h>
#include <linux/string.h>
int cpu_sandbox_get_desc(const struct udevice *dev, char *buf, int size)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 907358f312e7..2ebb28194888 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <stdio.h>
#include <thermal.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/system.h>
#include <asm/arch/sci/sci.h>
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index d19685b0ec4c..9138de69e8a2 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "desc.h"
#include "jr.h"
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index afdad43d331e..b2a1e822feb9 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index b7986a4f47e3..488f950dfcf0 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <watchdog.h>
#include <asm/cache.h>
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 645d83c0df87..e3a7670e3d14 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -17,6 +17,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/bitops.h>
#include <linux/ctype.h>
#include <asm/types.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index cf0731bd842a..92a29568342b 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -18,6 +18,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/bitops.h>
#include <linux/string.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 6780e5ddf43f..481b1914c001 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -10,6 +10,7 @@
#include <fsl_ddr_sdram.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <fsl_ddr.h>
/* For get_ddr_freq() */
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 043c03a34921..dad6b5a1e361 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -16,6 +16,7 @@
#include <dfu.h>
#include <hash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/list.h>
#include <linux/compiler.h>
#include <linux/printk.h>
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index a3444f131ea6..d34456c82f26 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -17,6 +17,7 @@
#include <mmc.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index ebf4b8b26e8a..679c7713fba9 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -11,6 +11,7 @@
#include <dfu.h>
#include <mtd.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <jffs2/load_kernel.h>
#include <linux/err.h>
#include <linux/string.h>
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index b4abe6005d90..848a9d81d11b 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -16,6 +16,7 @@
#include <div64.h>
#include <dfu.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/mtd/mtd.h>
#include <jffs2/load_kernel.h>
#include <nand.h>
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index b2a5b62d425d..969468e7e412 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -12,6 +12,7 @@
#include <malloc.h>
#include <errno.h>
#include <dfu.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index b64570aa4c73..c6c5328602e2 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -12,6 +12,7 @@
#include <spi.h>
#include <spi_flash.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <jffs2/load_kernel.h>
#include <linux/mtd/mtd.h>
#include <linux/string.h>
diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c
index 62605bcde507..4d9a56bbf5c7 100644
--- a/drivers/dfu/dfu_virt.c
+++ b/drivers/dfu/dfu_virt.c
@@ -7,6 +7,7 @@
#include <errno.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
int __weak dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,
void *buf, long *len)
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index f479f2a79e37..6e02e8ff6e30 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <dm/read.h>
#include <dma-uclass.h>
#include <dt-structs.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index cab6031ccf23..15be04b0898f 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -9,6 +9,7 @@
#include <cpu_func.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/bitops.h>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index ab477f5cb91d..966c0024579e 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -14,6 +14,7 @@
#include <part.h>
#include <stdio.h>
#include <stdlib.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 325ce4d283fe..dfa383de57d1 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -16,6 +16,7 @@
#include <fastboot.h>
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <net/fastboot.h>
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index a7881cc71966..448840ae4fe9 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -12,6 +12,7 @@
#include <fs.h>
#include <part.h>
#include <version.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 3e38848d4cc6..b4f8dba9604c 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <zynqmp_firmware.h>
#include <asm/cache.h>
#include <asm/ptrace.h>
diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c
index 180663ca32f4..1466452d50dc 100644
--- a/drivers/fpga/ivm_core.c
+++ b/drivers/fpga/ivm_core.c
@@ -32,6 +32,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <malloc.h>
#include <lattice.h>
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 6d497613cc4d..81666c83a595 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -13,6 +13,7 @@
#include <dm.h>
#include <fdtdec.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 2e371f3ad79c..b4501da67d16 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 06151d21fba1..49236c97722c 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <dm.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <errno.h>
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 8ff37f2ecccf..60b8e8e25ac1 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <errno.h>
#include <fdtdec.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <malloc.h>
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index eac0ff82ae69..d818954ce29c 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <dm.h>
#include <mapmem.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <linux/string.h>
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 14ecfb42c589..20ad373d023a 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <dm.h>
#include <mapmem.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <linux/string.h>
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 6f0692997f64..95e1fd643423 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -10,6 +10,7 @@
#include <errno.h>
#include <dm.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/arch/imx-regs.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 4ff267899cb6..310e04dd33e7 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
#include <linux/errno.h>
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index fb2f5a30b6d9..8d9cee050670 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -21,6 +21,7 @@
#include <dm.h>
#include <fdtdec.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 3e32d70e29d2..adb2079e0835 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -13,6 +13,7 @@
#include <i2c.h>
#include <pca953x.h>
#include <stdio.h>
+#include <vsprintf.h>
/* Default to an address that hopefully won't corrupt other i2c devices */
#ifndef CONFIG_SYS_I2C_PCA953X_ADDR
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index 4ffb3aa27f4d..e5fbd291377c 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -24,6 +24,7 @@
#include <fdtdec.h>
#include <i2c.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <dm/device_compat.h>
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 00f20c0979cc..7a98469de469 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <errno.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 3cabd11b5c5e..29ef2dc2c858 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <dm.h>
#include <syscon.h>
+#include <vsprintf.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index 599df135acfe..df4ca043ac1a 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <acpi/acpi_device.h>
#include <asm/gpio.h>
#include <dm/acpi.h>
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index eb8b8f65e98f..e7dbeea400d6 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
+#include <vsprintf.h>
#include <asm/arch/gpio.h>
#include <asm/io.h>
#include <errno.h>
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 973854ca6135..20a60fe8b07f 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <fdtdec.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/arch/gpio.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 21e432d7d80e..9929eed5d1b0 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -25,6 +25,7 @@
#include <i2c.h>
#include <stdio.h>
#include <tca642x.h>
+#include <vsprintf.h>
/* tca642x register address definitions */
struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index d0d869c81a1c..946506b89b28 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <log.h>
#include <spl.h>
+#include <vsprintf.h>
#include <acpi/acpigen.h>
#include <acpi/acpi_device.h>
#include <asm/lpss.h>
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index d73748adc4cc..3b7db392b677 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/pinctrl.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 0e98e08e4a75..57ff9ec2a4a7 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -14,6 +14,7 @@
#include <pci.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/string.h>
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index bd2818197c61..4cf609bdad4c 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -12,6 +12,7 @@
#include <i2c.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "ds4510.h"
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 25508cfe672b..672d39c4733e 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <linux/string.h>
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 3468f02208e1..5aabac793093 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <errno.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <i2c.h>
#include <k3-avs.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 8f0bce6d5659..3aa8e943efb5 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -22,6 +22,7 @@
#include <fdt_support.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e5a712fbf1b0..a3fdc5d63cc8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -15,6 +15,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <errno.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 56755c66fd2a..f89433141738 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -13,6 +13,7 @@
#include <part.h>
#include <mmc.h>
#include <stdlib.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/string.h>
#include <u-boot/crc.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 95d3cad4d0c5..54a34c725981 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -36,6 +36,7 @@
#endif
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index dcbba181c60b..c6fb2a35ace0 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -28,6 +28,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/io.h>
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index 21ca7bd65d4c..02b4277bd235 100644
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <flash.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <linux/errno.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 6b0ea1953127..ba19bd8c7fa0 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -28,6 +28,7 @@
#include <linux/gfp.h>
#include <linux/slab.h>
#else
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/err.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 2f882b7df079..ea31330bf112 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -22,6 +22,7 @@
#include <common.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bug.h>
#include <linux/errno.h>
#include <linux/compat.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 3ac5b4445166..cefe65654c5d 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -14,6 +14,7 @@
#include <common.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <memalign.h>
#include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index 1b05e2db9f6d..d8d752d6080a 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -4,6 +4,7 @@
#include <dm.h>
#include <malloc.h>
#include <stdarg.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include "brcmnand_compat.h"
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 026419e4e646..1b7918c54b69 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <nand.h>
#include <errno.h>
+#include <vsprintf.h>
#include <linux/mtd/concat.h>
#ifndef CONFIG_SYS_NAND_BASE_LIST
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 87494854fc28..a59dae357f32 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -25,6 +25,7 @@
#include <spi.h>
#include <spi-mem.h>
#include <time.h>
+#include <vsprintf.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <linux/bitops.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index bd73642752bf..7e5aaac23727 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -22,6 +22,7 @@
#include <common.h>
#include <log.h>
#include <time.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <dm/devres.h>
#include <linux/bitops.h>
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 5e96d3dc6c8d..354d7b47f0f9 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -9,6 +9,7 @@
#include <malloc.h>
#include <spi.h>
#include <spi_flash.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <linux/string.h>
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index d41811ecdae9..5f80e115f4db 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -7,6 +7,7 @@
#include <flash.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/errno.h>
#include <linux/mtd/mtd.h>
#include <spi_flash.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index a449b21b5bf2..f07051c9f735 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -31,6 +31,7 @@
#include <linux/slab.h>
#include <linux/major.h>
#else
+#include <vsprintf.h>
#include <linux/bug.h>
#include <linux/log2.h>
#include <linux/printk.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index e9c50a4852b7..c84e3471266a 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -9,6 +9,7 @@
#include <malloc.h>
#include <stdio.h>
#include <ubi_uboot.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
#include "ubi.h"
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index da68f3519daa..079ffbe7563e 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -19,6 +19,7 @@
#else
#include <div64.h>
#include <ubi_uboot.h>
+#include <vsprintf.h>
#include <linux/string.h>
#endif
#include <linux/math64.h>
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index bae402418fb1..b7e5cc17ef4d 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -94,6 +94,7 @@
#include <linux/kthread.h>
#else
#include <ubi_uboot.h>
+#include <vsprintf.h>
#endif
#include "ubi.h"
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index f6c8b57d93d4..212f43ca4daa 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -17,6 +17,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 0c5c2e3053dc..8e58464cc6ce 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -19,6 +19,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 21266d66dd64..a0cbecf60dfc 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -9,6 +9,7 @@
#include <net.h>
#include <config.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 8849195f248d..b759d12867d7 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -16,6 +16,7 @@
#include <net.h>
#include <phy.h>
#include <reset.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/io.h>
#include <linux/printk.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 8b0205350066..f6b473ae9b00 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -15,6 +15,7 @@
#include <miiphy.h>
#include <net.h>
#include <reset.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/io.h>
#include <dm/device_compat.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ed17df0392b2..a767fa6e6de1 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -18,6 +18,7 @@
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <clk.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 0fcbcf919a02..5df36fa67269 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -7,6 +7,7 @@
#include <malloc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/delay.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9baef753b602..3b0219eee920 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -2,6 +2,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <dm.h>
#include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 2abe901a8559..bb36b77169a7 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -21,6 +21,7 @@
#include <reset.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/u-boot.h>
#include <dm/device_compat.h>
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 1233d7814dde..485e6c0cdcc6 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 151ae3e038d1..5041a1894eed 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -40,6 +40,7 @@ tested on both gig copper and gig fiber boards
#include <net.h>
#include <pci.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 6af5b32e413a..7e37ade1e9c0 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -2,6 +2,7 @@
#include <command.h>
#include <console.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "e1000.h"
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 1272e915f0e2..a8a20a080120 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <cpu_func.h>
#include <malloc.h>
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 2116f31cf767..802d04a26baa 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -21,6 +21,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/arch/ep93xx.h>
#include <asm/io.h>
#include <malloc.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 73228d9e5685..a1e051770c7e 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -15,6 +15,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <dm/platform_data/net_ethoc.h>
#include <linux/io.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 79eb1497930a..669f3af7aeeb 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -19,6 +19,7 @@
#include <netdev.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 308b2baf936a..7d65ee70be4b 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <part.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#ifdef CONFIG_DM_ETH
#include <dm.h>
diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c
index 608e2add6cc1..924632c39913 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -3,6 +3,7 @@
* Copyright 2016 Freescale Semiconductor, Inc.
*/
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <env.h>
#include <fdt_support.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index 53f1300eaf80..e7ba37c0e665 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -6,6 +6,7 @@
/* Perform extra checking */
#include <common.h>
#include <errno.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/bug.h>
#include <linux/types.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index aa0cfee67ae6..3a7e8e84b468 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/bug.h>
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index d983841bafd5..ed302eace59f 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <memalign.h>
#include <net.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <pci.h>
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 474714da9585..9bca18e94076 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -10,6 +10,7 @@
#include <pci.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <miiphy.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 26901136d585..e2b897a7cccf 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 6ce47832a68b..2ff318cb9a9e 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/u-boot.h>
#include <linux/errno.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index c1b6d8195b5c..65b160f8c40c 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -6,6 +6,7 @@
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <common.h>
#include <command.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 0bc2c21e5990..7c26c60ff2b0 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -50,6 +50,7 @@
#include <malloc.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 5de15c9684f2..ac0487e68d28 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/types.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fcb940037a38..3d6b2fa8eb4b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index cef4b31dd247..94939c590f6e 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -11,6 +11,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cpm_8xx.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index 6687787b1a6a..de257d4d60f4 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -4,6 +4,7 @@
*/
#include <miiphy.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <linux/bitops.h>
#include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index b8739562b731..1eea520b8762 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -22,6 +22,7 @@
#include <net.h>
#include <reset.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/cache.h>
#include <asm/io.h>
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 0ad215da92f0..ad86820bbb09 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <syscon.h>
#include <time.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/cache.h>
#include <asm/gpio.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 227f22f7e050..45f4e004c9ca 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -18,6 +18,7 @@
#include <malloc.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 996534792583..ce7cf045f735 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -21,6 +21,7 @@
#include <config.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 98a56cb8de1d..9baa1004bf36 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -17,6 +17,7 @@
#include <cpu_func.h>
#include <dm.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 1819c24a843e..f705a0264319 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -55,6 +55,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <asm/u-boot.h>
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 432d2b0121c8..b4bbd9429fd3 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <stdio_dev.h>
#include <net.h>
+#include <vsprintf.h>
#include <linux/string.h>
#ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index b0aeb470a199..bb07369d32f9 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -56,6 +56,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <asm/u-boot.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index aef5e7e4fd79..41231a0a773f 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -15,6 +15,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <pci.h>
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 365a74aa094b..4a189f7b280a 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -13,6 +13,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 4fb81ab0cd40..4848e2e2aa91 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/platform_data/pfe_dm_eth.h>
#include <net.h>
#include <linux/delay.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 0f682d1cfdd8..4cc55b36885a 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/platform_data/pfe_dm_eth.h>
#include <net.h>
#include <linux/delay.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 34ba893dcdb9..2e4796f5d6c8 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -25,6 +25,7 @@
#include <common.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index a02d620d9663..18e9f5ab25ce 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 977102d4d803..c11ddf765f62 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <mv88e6352.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 8f76279c7eed..b3f392cb8bf3 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -17,6 +17,7 @@
#include <miiphy.h>
#include <malloc.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 42169e996832..ba0f477bf23b 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -76,6 +76,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <asm/u-boot.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 84f3fa473c75..69f895f720b3 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -18,6 +18,7 @@
#include <netdev.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 9b279d48002c..036642b223b8 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -53,6 +53,7 @@
#include <malloc.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index a28ccc8c18ab..196020c1b812 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -11,6 +11,7 @@
#include <net.h>
#include <miiphy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/io.h>
#include <linux/delay.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 9288355fb4ad..13ec074acacb 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -15,6 +15,7 @@
#include <regmap.h>
#include <reset.h>
#include <syscon.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <dm/device_compat.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index b0d83de8cbd8..0715cf81c740 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index f4cb86d10a74..e47d5a2a5c55 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <miiphy.h>
#include <wait_bit.h>
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index b4647554bcec..19041be320ef 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -29,6 +29,7 @@
#include <miiphy.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <linux/compiler.h>
#include <asm/arch/emac_defs.h>
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 4dd205c1507f..96bbb219d5d6 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <console.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/delay.h>
#include <linux/printk.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 17ce68baffe5..afcb170be329 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <tsec.h>
#include <fsl_mdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 0a8369f96e39..530341faa3f3 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <netdev.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
#include <miiphy.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index b1bb27fb7f80..4ae225e879f4 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -9,6 +9,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c
index 277e31e1f397..9fb2900d55f9 100644
--- a/drivers/nvme/nvme-uclass.c
+++ b/drivers/nvme/nvme-uclass.c
@@ -8,6 +8,7 @@
#include <blk.h>
#include <errno.h>
#include <dm.h>
+#include <vsprintf.h>
#include <dm/device.h>
#include "nvme.h"
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 8b3b60570d73..9ce57335bc68 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -15,6 +15,7 @@
#include <pci.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <linux/compat.h>
#include <linux/string.h>
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index ba4ce355b729..0f51109e7a3b 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/fsl_serdes.h>
#include <asm/global_data.h>
#include <asm/ppc.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 72f47321b7e6..32b6f0619e22 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -12,6 +12,7 @@
#include <malloc.h>
#include <pci.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/u-boot.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b6a147ec1f51..4eac485f2788 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -18,6 +18,7 @@
#include <init.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/delay.h>
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 07c34fe74daf..57edb22d8192 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index a94ab8310c6f..8318b9ee7962 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -15,6 +15,7 @@
#include <malloc.h>
#include <pci.h>
#include <reset.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <dm/devres.h>
#include <linux/bitops.h>
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index db62fd45f8f2..16c412b245d6 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -14,6 +14,7 @@
#include <clk.h>
#include <dm.h>
#include <log.h>
+#include <vsprintf.h>
#include <dm/device.h>
#include <generic-phy.h>
#include <phy-sun4i-usb.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index 6c8a990f57b0..af10ead601f1 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -4,6 +4,7 @@
#include <dm.h>
#include <regmap.h>
#include <syscon.h>
+#include <vsprintf.h>
#include <dm/device_compat.h>
#include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index c6cb941d0a95..8246aa6890e1 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -5,6 +5,7 @@
*/
#include <log.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <common.h>
#include <dm.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 159f3406a203..90c5e1648967 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -4,6 +4,7 @@
*/
#include <log.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <common.h>
#include <dm.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 639eb849db45..8a3c292548e5 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/device_compat.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 0fe1b3488099..1e8c345b8477 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -21,6 +21,7 @@
#include <dm.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/device_compat.h>
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index b33122946838..28db1116387e 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <dm.h>
#include <log.h>
+#include <vsprintf.h>
#include <dm/pinctrl.h>
#include <linux/bitops.h>
#include <linux/string.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 09414f6627f3..d446982c4e76 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -12,6 +12,7 @@
#include <errno.h>
#include <regmap.h>
#include <syscon.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 2c437c25f69e..dc063e087e82 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <dm.h>
#include <i2c.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <dm/device.h>
#include <dm/device-internal.h>
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 79a523330536..f821959137e0 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device_compat.h>
#include <linux/libfdt.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 98232fad3984..998b90f803f3 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -3,6 +3,7 @@
#include <hwspinlock.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/arch/gpio.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index a7df7965f641..35be5d907325 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/list.h>
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 48acb6d744e4..c6973dad3a80 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -11,6 +11,7 @@
#include <pwm.h>
#include <div64.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/io.h>
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index cd3ef1789677..7c14fe35e587 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <command.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index d765cd1f5958..49adc58165d7 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -10,6 +10,7 @@
#include <net.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index dcf3590c6c39..3726a39335ef 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <ram.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 1b8cb5949660..3f61addac31c 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <ram.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <dm/device_compat.h>
#include <linux/bitops.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 911bc2223db1..1f39ce5ea497 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -10,6 +10,7 @@
#include <reset.h>
#include <stdio.h>
#include <timer.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/ddr.h>
#include <linux/bitops.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index e758abe9ee99..34c9af7214b9 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -14,6 +14,7 @@
#include <reset.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 2d73b768b49d..02ee683303d8 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <rand.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 8707dead754c..822c890031ad 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -10,6 +10,7 @@
#include <rand.h>
#include <reset.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 87daf65d7fe0..f01b1e53e981 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -17,6 +17,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/lists.h>
#include <dm/of_access.h>
#include <env.h>
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 21775a5aed63..05ed89bf8d67 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -22,6 +22,7 @@
#include <rtc.h>
#include <i2c.h>
#include <stdio.h>
+#include <vsprintf.h>
/*
* Convert between century and "century bits" (CB1 and CB0). These routines
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 6f940d23e7a2..1a5e256d61a3 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -14,6 +14,7 @@
#include <pci.h>
#include <scsi.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
#include <linux/string.h>
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 2ef344a46ecf..191263a0d636 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -12,6 +12,7 @@
#include <serial.h>
#include <stdio.h>
#include <stdio_dev.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <dm/lists.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 151bba4ab66a..71e1acbde083 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdio_dev.h>
#include <post.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/compiler.h>
#include <errno.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 6fc126f404b7..a97d03a88760 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -21,6 +21,7 @@
#include <common.h>
#include <hang.h>
+#include <vsprintf.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/regs-uart.h>
#include <asm/global_data.h>
diff --git a/drivers/soc/soc_sandbox.c b/drivers/soc/soc_sandbox.c
index 5c82ad84fc21..dbc0f316d64d 100644
--- a/drivers/soc/soc_sandbox.c
+++ b/drivers/soc/soc_sandbox.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <dm.h>
#include <soc.h>
+#include <vsprintf.h>
int soc_sandbox_get_family(struct udevice *dev, char *buf, int size)
{
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index 94285403ca23..0d26cf17d565 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <soc.h>
+#include <vsprintf.h>
#include <asm/io.h>
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 9320a8be685b..7dbbe1f43cf7 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -10,6 +10,7 @@
*/
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <clk.h>
#include <common.h>
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index d7cef659ea4a..7e08bf9dc543 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -18,6 +18,7 @@
#include <spi_flash.h>
#include <os.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/errno.h>
#include <asm/spi.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 2d0abca3200c..bd4301bcbb6a 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <stdio.h>
#include <sysreset.h>
+#include <vsprintf.h>
#include <wait_bit.h>
#include <asm/global_data.h>
#include <asm/ppc.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index b4c40fe1c2d5..f211f9fe142f 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <time.h>
#include <timer.h>
+#include <vsprintf.h>
#include <asm/cpu.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 8a1c65bbe8cd..24b1e2448603 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <time.h>
#include <tpm-v2.h>
+#include <vsprintf.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/arch/iomap.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index a7c94c7429bc..885b3e2c148e 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -18,6 +18,7 @@
#include <log.h>
#include <tpm-v2.h>
#include <tee.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "tpm_tis.h"
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 70e4e258db1b..437f65cc395b 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <stdio.h>
#include <tpm-v2.h>
+#include <vsprintf.h>
#include <asm/state.h>
#include <asm/unaligned.h>
#include <linux/bitops.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 52fb3a9235f4..6303187180f1 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -20,6 +20,7 @@
#include <spi.h>
#include <time.h>
#include <tpm-v2.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index e8391eaa1e6d..29062b15641c 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -26,6 +26,7 @@
#include <log.h>
#include <time.h>
#include <tpm-v1.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/compiler.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 9ef0f3347338..63b86b131bcc 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -18,6 +18,7 @@
#include <mapmem.h>
#include <stdio.h>
#include <tpm-v1.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index bc96c7354d8c..4b1cf36d9b9b 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <stdio.h>
#include <tpm-v1.h>
+#include <vsprintf.h>
#include <asm/state.h>
#include <asm/unaligned.h>
#include <linux/string.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index f648ea406d75..bd9c08e06cb9 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -20,6 +20,7 @@
#include <time.h>
#include <tpm-v1.h>
#include <errno.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 5c3ce1372444..2b6b3714087c 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -20,6 +20,7 @@
#include <time.h>
#include <tpm-v1.h>
#include <errno.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index a08c6945590f..4fbd450fed38 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -11,6 +11,7 @@
*/
#include <cpu_func.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <dm/device_compat.h>
#include <linux/bitops.h>
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index d4aaa19dad62..535935ac7237 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -57,6 +57,7 @@
*/
#include <dm.h>
+#include <vsprintf.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <linux/bitops.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index b62b120d96f4..5382447eb72d 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <hwconfig.h>
#include <fsl_errata.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 55324118ae7c..c33e0894e10a 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -17,6 +17,7 @@
#include <cpu_func.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <linux/bug.h>
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index cbf2b12ffb07..fe98a581d0d5 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -13,6 +13,7 @@
#include <usb.h>
#include <malloc.h>
#include <memalign.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index fa983257f300..8191b85eb4d6 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <usb.h>
#include <net.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index d4fcda1ecd36..b3bca81059c3 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -11,6 +11,7 @@
#include <net.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <linux/ethtool.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c9bbc4035c1f..bbc03c7ea586 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <log.h>
#include <net.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index d1b51201a35b..1f60fc499b94 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index fb645f22e420..d90850074411 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <time.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <asm/unaligned.h>
#include <linux/delay.h>
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index c7b0a9651885..caab17473dfc 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -9,6 +9,7 @@
*/
#include <common.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <linux/usb/ch9.h>
#include <linux/errno.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 927495d0b8d7..9ddbb5c0f214 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -14,6 +14,7 @@
#include <part.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/netdevice.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index a220d1517615..8723c656e0b5 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -247,6 +247,7 @@
#include <console.h>
#include <g_dnl.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/bug.h>
#include <linux/string.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 11d703eb3320..142bd99c698d 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -24,6 +24,7 @@
#include <memalign.h>
#include <stdio.h>
#include <version.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 45b82da4f4a7..35bd319de8a1 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -13,6 +13,7 @@
#include <pci.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 4d3b6527ac9a..45c3418e7f84 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <time.h>
#include <usb.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <usb/ulpi.h>
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index eb03956e9105..8d095c7fe241 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -13,6 +13,7 @@
#include <memalign.h>
#include <stdio.h>
#include <usb.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/uclass-internal.h>
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index a696c5a5b476..0a537fc45527 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -81,6 +81,7 @@
#else
#include <common.h>
#include <usb.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/errno.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 20987b77ade2..f9d30b5b76dd 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -33,6 +33,7 @@
#else
#include <common.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/omap_musb.h>
#include <linux/printk.h>
#include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index c6e346d5d805..ceac6a82b644 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,6 +23,7 @@
#include <linux/slab.h>
#else
#include <common.h>
+#include <vsprintf.h>
#include <linux/bug.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index 4867c2e792e4..bbec87743104 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index d7938ac2cbd4..6ac6d0e69ac0 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -30,6 +30,7 @@
#include <malloc.h>
#include <video_fb.h>
#include "videomodes.h"
+#include <vsprintf.h>
#include <radeon.h>
#include "ati_ids.h"
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index af92a83d6a0b..5edef8924e8d 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -75,6 +75,7 @@
#include <version.h>
#include <malloc.h>
#include <video.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/compiler.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 426418415afd..7e62e4f41ce5 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/ppc.h>
#include <linux/string.h>
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index ff29773170b4..c0e0d1e5ea38 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <stdio.h>
#include <video_fb.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 82a94507b2ea..bb1eb3778272 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <dm/device_compat.h>
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 6912177993d0..128fa88648f5 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -15,6 +15,7 @@
#include <video.h>
#include <video_console.h>
#include <video_font.h> /* Bitmap font for code page 437 */
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index bb8555000a96..398f1a97e046 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -15,6 +15,7 @@
#include <time.h>
#include <video.h>
#include <video_console.h>
+#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <dm/lists.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index f1781dbb6661..ba0fa3589f6b 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -62,6 +62,7 @@
#include <errno.h>
#include <fdtdec.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 5264fc209c9c..50e143bb9e55 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -21,6 +21,7 @@
#include <malloc.h>
#include <virtio_types.h>
#include <virtio.h>
+#include <vsprintf.h>
#include <dm/lists.h>
#include <linux/bug.h>
#include <linux/string.h>
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 992118c60758..95b7360656a3 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -11,6 +11,7 @@
#include <virtio_types.h>
#include <virtio.h>
#include <virtio_ring.h>
+#include <vsprintf.h>
#include "virtio_blk.h"
struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index a617fffd7aa6..59deadeec33a 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -13,6 +13,7 @@
#include <virtio_types.h>
#include <virtio.h>
#include <virtio_ring.h>
+#include <vsprintf.h>
#include <dm/device.h>
#include <linux/bug.h>
#include <linux/compat.h>
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 7a5926ebe640..cc3378d87583 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -13,6 +13,7 @@
#include <virtio_types.h>
#include <virtio.h>
#include <virtio_ring.h>
+#include <vsprintf.h>
#include <dm/device.h>
#include <linux/bug.h>
#include <linux/compat.h>
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 2a2abb9d499c..1e5589f004c6 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -10,6 +10,7 @@
#include <virtio_types.h>
#include <virtio.h>
#include <virtio_ring.h>
+#include <vsprintf.h>
#include <linux/bug.h>
#include <linux/compat.h>
#include <linux/err.h>
diff --git a/env/attr.c b/env/attr.c
index a958c7148283..a9cabafacdcb 100644
--- a/env/attr.c
+++ b/env/attr.c
@@ -6,15 +6,16 @@
#ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
#include <stdint.h>
-#include <stdio.h>
#include <linux/linux_string.h>
#else
#include <common.h>
#include <slre.h>
+#include <vsprintf.h>
#endif
#include <env_attr.h>
#include <errno.h>
+#include <stdio.h>
#include <linux/string.h>
#include <malloc.h>
diff --git a/env/mmc.c b/env/mmc.c
index 21d3c54d85d6..4afabf673653 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 1d32aa90342a..9e4e883d9d22 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -10,6 +10,7 @@
#include <exports.h>
#include <spi.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 975e29d00b11..12fab86e4706 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -27,6 +27,7 @@
#include <common.h>
#include <flash.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/stat.h>
#include <jffs2/jffs2.h>
diff --git a/fs/fs.c b/fs/fs.c
index cd3bae21e1fd..b8ce3d8f266a 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -21,6 +21,7 @@
#include <time.h>
#include <ubifs_uboot.h>
#include <btrfs.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <div64.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 2bd0073cc591..77178e0e28a0 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -18,6 +18,7 @@
#include <hexdump.h>
#include <log.h>
#include <time.h>
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index ebb0d1c1571f..62b03731f8d1 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -33,6 +33,7 @@
#include <malloc.h>
#include <memalign.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/log2.h>
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index deb2d21b0a24..ab48f10310c6 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -18,6 +18,7 @@
#include <malloc.h>
#include <memalign.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include "ubifs.h"
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 91ed09888e7c..a3ff0044788c 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -23,6 +23,7 @@
#include <div64.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/include/common.h b/include/common.h
index 31c3d462132f..2b7a422fbe19 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
#include <errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <vsprintf.h>
#endif /* __ASSEMBLY__ */
/* Pull in stuff for the build system */
diff --git a/include/efi.h b/include/efi.h
index 818295642ddb..0c99e1707d0a 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -17,6 +17,7 @@
#define _EFI_H
#include <stdarg.h>
+#include <vsprintf.h>
#include <linux/linkage.h>
#include <linux/string.h>
#include <linux/types.h>
diff --git a/include/exports.h b/include/exports.h
index 935cf594c3b4..28a6713ed716 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -5,6 +5,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/include/vsprintf.h b/include/vsprintf.h
index 2290083eba40..901a3d05affa 100644
--- a/include/vsprintf.h
+++ b/include/vsprintf.h
@@ -8,6 +8,7 @@
#define __VSPRINTF_H
#include <stdarg.h>
+#include <stdbool.h>
#include <linux/types.h>
ulong simple_strtoul(const char *cp, char **endp, unsigned int base);
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index cefbb5f69c5b..f891f3ade90b 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -11,6 +11,7 @@
#include <irq.h>
#include <log.h>
#include <usb.h>
+#include <vsprintf.h>
#include <acpi/acpigen.h>
#include <acpi/acpi_device.h>
#include <acpi/acpigen.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 17c3947c82df..54078471bec7 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -9,6 +9,7 @@
#define pr_fmt(fmt) "PKEY: "fmt
#ifdef __UBOOT__
+#include <vsprintf.h>
#include <dm/devres.h>
#include <linux/bug.h>
#include <linux/compat.h>
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index ec4b511d492f..46f7fe89daa0 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -8,6 +8,7 @@
#include <div64.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include "dhry.h"
static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/lib/display_options.c b/lib/display_options.c
index 14cb3cff0551..826668505ca4 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -11,6 +11,7 @@
#include <div64.h>
#include <stdio.h>
#include <version.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <asm/io.h>
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 0e72a68bced0..98600db09dcb 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -33,6 +33,7 @@
#include <dm.h>
#include <efi_driver.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <dm/device-internal.h>
#include <dm/root.h>
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 8b057ef18902..063067c05c05 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/libfdt_env.h>
#include <linux/string.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index d3b1e273b9b8..d4820fa5f0b0 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -16,6 +16,7 @@
#include <efi_loader.h>
#include <part.h>
#include <sandboxblockdev.h>
+#include <vsprintf.h>
#include <asm-generic/unaligned.h>
#include <linux/compat.h> /* U16_MAX */
#include <linux/string.h>
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index ece99eb94243..b0f213d72b97 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <blk.h>
#include <efi_loader.h>
+#include <vsprintf.h>
#include <linux/string.h>
#define MAC_OUTPUT_LEN 22
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 6a66b5cf2923..ecbd14817ad3 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -15,6 +15,7 @@
#include <log.h>
#include <part.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <linux/string.h>
struct efi_system_partition efi_system_partition;
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 91c458ceea4b..4a668eab8429 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -15,6 +15,7 @@
#include <mapmem.h>
#include <efi_loader.h>
#include <efi_variable.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <u-boot/crc.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 8370ecd11ea3..faf7be634f39 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -14,6 +14,7 @@
#include <malloc.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/u-boot.h>
#include <dm/of_extra.h>
#include <env.h>
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 897b2d262993..50e773260ef7 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -10,6 +10,7 @@
#include <command.h>
#include <fdtdec.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/libfdt.h>
#include <malloc.h>
#include <os.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 3a0861c7d38a..285610562285 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <hexdump.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/compat.h>
#include <linux/log2.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index a563d397bf55..030d21fc2b91 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -8,6 +8,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "avb_sysdeps.h"
diff --git a/lib/net_utils.c b/lib/net_utils.c
index 0a8a557319cf..eb2d52e849bf 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <net.h>
+#include <vsprintf.h>
struct in_addr string_to_ip(const char *s)
{
diff --git a/lib/oid_registry.c b/lib/oid_registry.c
index 209edc73b99f..5846030ac136 100644
--- a/lib/oid_registry.c
+++ b/lib/oid_registry.c
@@ -6,6 +6,7 @@
*/
#ifdef __UBOOT__
+#include <vsprintf.h>
#include <linux/compat.h>
#else
#include <linux/module.h>
diff --git a/lib/panic.c b/lib/panic.c
index 2267a8d4fb91..a01868d8520c 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -16,6 +16,7 @@
#endif
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/delay.h>
static void panic_finish(void) __attribute__ ((noreturn));
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index a8f4f089f138..c894e7a6b9b6 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <malloc.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/types.h>
#include <asm/byteorder.h>
#include <linux/errno.h>
diff --git a/lib/strto.c b/lib/strto.c
index 009e67d417a2..e6f69b31e478 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <errno.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 4d65bd9eeb5f..60a0619aafc9 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -12,6 +12,7 @@
#include <stdarg.h>
#include <serial.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
struct printf_info {
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index 21fc4c7c865e..93bcab46112f 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -10,6 +10,7 @@
#include <dm.h>
#include <log.h>
#include <stdarg.h>
+#include <vsprintf.h>
#include <asm/unaligned.h>
#include <tpm-common.h>
#include <linux/string.h>
diff --git a/lib/trace.c b/lib/trace.c
index e6f342872959..37f53dad235b 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <time.h>
#include <trace.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/sections.h>
diff --git a/lib/uuid.c b/lib/uuid.c
index 63efc114f841..91f99bcb5ff0 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <time.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/ctype.h>
#include <errno.h>
#include <common.h>
diff --git a/net/arp.c b/net/arp.c
index bea265b3674c..2a4449489ff9 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -15,6 +15,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/net/bootp.c b/net/bootp.c
index f5d4f85fe247..6e9f2fc57d15 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <time.h>
#include <uuid.h>
+#include <vsprintf.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <net/tftp.h>
diff --git a/net/cdp.c b/net/cdp.c
index fe19914659bf..ffb91a64900c 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -15,6 +15,7 @@
#include <timestamp.h>
#endif
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "cdp.h"
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 6eae0746d4d5..9af7971fc492 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <net.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 44047abe7c96..5e8276b9bcec 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -11,6 +11,7 @@
#include <env.h>
#include <miiphy.h>
#include <net.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "eth_internal.h"
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 13f0f2b850b3..f2e906dfe8cf 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <phy.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include <linux/bug.h>
diff --git a/net/net.c b/net/net.c
index ce6b55f87def..1aa977d00879 100644
--- a/net/net.c
+++ b/net/net.c
@@ -99,6 +99,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include <net/fastboot.h>
#include <net/tftp.h>
diff --git a/net/nfs.c b/net/nfs.c
index c675d8076a56..76ff7d32e0bb 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -36,6 +36,7 @@
#include <malloc.h>
#include <mapmem.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <linux/string.h>
#include "nfs.h"
#include "bootp.h"
diff --git a/net/tftp.c b/net/tftp.c
index e2de4a17ff4b..5b600800a050 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -17,6 +17,7 @@
#include <net.h>
#include <stdio.h>
#include <time.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include <net/tftp.h>
diff --git a/post/post.c b/post/post.c
index ad700975846b..dee7ff1ce142 100644
--- a/post/post.c
+++ b/post/post.c
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdio_dev.h>
#include <time.h>
+#include <vsprintf.h>
#include <watchdog.h>
#include <div64.h>
#include <post.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index 4eef4048de48..c2634d0a0167 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -7,6 +7,7 @@
#include <dm.h>
#include <part.h>
#include <usb.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <asm/state.h>
#include <dm/test.h>
diff --git a/test/env/hashtable.c b/test/env/hashtable.c
index 339cc19ba14a..4331eac02fec 100644
--- a/test/env/hashtable.c
+++ b/test/env/hashtable.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <search.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <test/env.h>
#include <test/ut.h>
diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c
index 0b0d9c179246..467a21181731 100644
--- a/test/lib/sscanf.c
+++ b/test/lib/sscanf.c
@@ -13,6 +13,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <test/lib.h>
#include <test/test.h>
#include <test/ut.h>
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 6b263557945c..ffade6d14b16 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -10,6 +10,7 @@
#include <command.h>
#include <log.h>
#include <stdio.h>
+#include <vsprintf.h>
/* emit some sample log records in different ways, for testing */
static int log_run(enum uclass_id cat, const char *file)
diff --git a/test/print_ut.c b/test/print_ut.c
index 206a72c789c1..d317cbf5562b 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <stdio.h>
#include <version.h>
+#include <vsprintf.h>
#define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
"and a lot more text to come"
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index 26d96336f36b..ace35c18a428 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -11,6 +11,7 @@
#include <errno.h>
#include <log.h>
#include <malloc.h>
+#include <vsprintf.h>
#include <test/test.h>
#include <test/suites.h>
#include <test/ut.h>
diff --git a/test/ut.c b/test/ut.c
index 12e3de619a12..8edff967fa1d 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <stdarg.h>
#include <stdio.h>
+#include <vsprintf.h>
#include <asm/global_data.h>
#include <test/test.h>
#include <test/ut.h>
--
2.17.1
next prev parent reply other threads:[~2020-08-19 13:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
2020-08-02 22:59 ` [PATCH 01/16] common: Drop asm/global_data.h from common header Simon Glass
2020-08-02 22:59 ` [PATCH 02/16] common: Drop display_options.h " Simon Glass
2020-08-02 22:59 ` [PATCH 03/16] common: Drop linux/printk.h " Simon Glass
2020-08-02 22:59 ` [PATCH 04/16] Fix code style for time functions Simon Glass
2020-08-02 22:59 ` [PATCH 05/16] common: Drop time.h from common header Simon Glass
2020-08-02 22:59 ` [PATCH 06/16] common: Drop linux/string.h " Simon Glass
2020-08-02 22:59 ` [PATCH 07/16] common: Drop asm/u-boot.h " Simon Glass
2020-08-02 22:59 ` [PATCH 08/16] common: Drop stdio.h " Simon Glass
2020-08-02 22:59 ` [PATCH 09/16] common: Drop stdarg.h " Simon Glass
2020-08-02 22:59 ` [PATCH 10/16] common: Drop vsprintf.h " Simon Glass
2020-08-02 22:59 ` [PATCH 11/16] common: Drop errno.h " Simon Glass
2020-08-02 22:59 ` [PATCH 12/16] common: Drop linux/kernel.h " Simon Glass
2020-08-02 22:59 ` [PATCH 13/16] common: Drop linux/types.h " Simon Glass
2020-08-02 22:59 ` [PATCH 14/16] common: Move the build-system includes to a separate file Simon Glass
2020-08-02 22:59 ` [PATCH 15/16] common: Add a comment about the current state of common.h Simon Glass
2020-08-02 22:59 ` [PATCH 16/16] Makefile: Drop linux/kconfig.h from config.h Simon Glass
2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
2020-08-19 13:08 ` [RFCv2 01/16] common: Drop asm/global_data.h from common header Tom Rini
2020-08-19 13:08 ` [RFCv2 02/16] common: Drop display_options.h " Tom Rini
2020-08-19 13:08 ` [RFCv2 03/16] common: Drop linux/printk.h " Tom Rini
2020-08-19 13:08 ` [RFCv2 04/16] Fix code style for time functions Tom Rini
2020-08-19 13:08 ` [RFCv2 05/16] common: Drop time.h from common header Tom Rini
2020-08-19 13:08 ` [RFCv2 06/16] common: Drop linux/string.h " Tom Rini
2020-08-19 13:08 ` [RFCv2 07/16] common: Drop asm/u-boot.h " Tom Rini
2020-08-19 13:09 ` [RFCv2 08/16] common: Drop stdio.h " Tom Rini
2020-08-19 13:09 ` [RFCv2 09/16] common: Drop stdarg.h " Tom Rini
2020-08-19 13:09 ` Tom Rini [this message]
2020-08-19 13:09 ` [RFCv2 11/16] common: Drop errno.h " Tom Rini
2020-08-19 13:09 ` [RFCv2 12/16] common: Drop linux/kernel.h " Tom Rini
2020-08-19 13:09 ` [RFCv2 13/16] common: Drop linux/types.h " Tom Rini
2020-08-19 13:09 ` [RFCv2 14/16] common: Move the build-system includes to a separate file Tom Rini
2020-08-19 13:09 ` [RFCv2 15/16] common: Add a comment about the current state of common.h Tom Rini
2020-08-19 13:09 ` [RFCv2 16/16] Makefile: Drop linux/kconfig.h from config.h Tom Rini
2020-09-09 2:58 ` [RFCv2] common: Drop remaining includes in common.h Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200819130908.4303-11-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.