Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/cmd/2048.c b/cmd/2048.c
index 42cd171..fa60aa9 100644
--- a/cmd/2048.c
+++ b/cmd/2048.c
@@ -3,10 +3,10 @@
/* Console version of the game "2048" for GNU/Linux */
+#include <common.h>
#include <cli.h>
#include <command.h>
#include <rand.h>
-#include <vsprintf.h>
#include <linux/delay.h>
#define SIZE 4
diff --git a/cmd/Kconfig b/cmd/Kconfig
index c06fec3..b026439 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -539,7 +539,6 @@
config CMD_IMLS
bool "imls"
- depends on MTD_NOR_FLASH || FLASH_CFI_DRIVER
help
List all images found in flash
@@ -832,7 +831,7 @@
config SYS_EEPROM_PAGE_WRITE_BITS
int "Number of bits used to address bytes in a single page"
- depends on CMD_EEPROM || ENV_IS_IN_EEPROM
+ depends on CMD_EEPROM
default 8
help
The EEPROM page size is 2^SYS_EEPROM_PAGE_WRITE_BITS.
@@ -1024,8 +1023,8 @@
- Displaying the arm_ffa device info
config CMD_ARMFLASH
+ #depends on FLASH_CFI_DRIVER
bool "armflash"
- depends on FLASH_CFI_DRIVER
help
ARM Ltd reference designs flash partition access
@@ -1168,7 +1167,6 @@
config CMD_FPGAD
bool "fpgad - dump FPGA registers"
- depends on GDSYS_LEGACY_DRIVERS
help
(legacy, needs conversion to driver model)
Provides a way to dump FPGA registers by calling the board-specific
@@ -1604,7 +1602,6 @@
config CMD_TSI148
bool "tsi148 - Command to access tsi148 device"
- depends on DM_PCI_COMPAT
help
This provides various sub-commands to initialise and configure the
Turndra tsi148 device. See the command help for full details.
@@ -1618,7 +1615,6 @@
config CMD_UNIVERSE
bool "universe - Command to set up the Turndra Universe controller"
- depends on DM_PCI_COMPAT
help
This allows setting up the VMEbus provided by this controller.
See the command help for full details.
diff --git a/cmd/ab_select.c b/cmd/ab_select.c
index faeb838..bfb67b8 100644
--- a/cmd/ab_select.c
+++ b/cmd/ab_select.c
@@ -3,6 +3,7 @@
* Copyright (C) 2017 The Android Open Source Project
*/
+#include <common.h>
#include <android_ab.h>
#include <command.h>
#include <env.h>
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 88c77d9..2653b55 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -5,6 +5,7 @@
*/
#include <android_image.h>
+#include <common.h>
#include <command.h>
#include <image.h>
#include <mapmem.h>
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 094d9d4..928e5dc 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -3,6 +3,7 @@
* Copyright 2019 Google LLC
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <display_options.h>
#include <log.h>
@@ -10,7 +11,6 @@
#include <acpi/acpi_table.h>
#include <asm/acpi_table.h>
#include <asm/global_data.h>
-#include <linux/errno.h>
#include <dm/acpi.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/adc.c b/cmd/adc.c
index f87f978..4cb18b6 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018 BayLibre, SAS
* Author: Neil Armstrong <narmstrong@baylibre.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <adc.h>
diff --git a/cmd/addrmap.c b/cmd/addrmap.c
index f7e4d92..bd23549 100644
--- a/cmd/addrmap.c
+++ b/cmd/addrmap.c
@@ -3,6 +3,7 @@
* Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <addr_map.h>
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index 53f3376..f4b5cbf 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -7,8 +7,8 @@
#include <command.h>
#include <env.h>
-#include <vsprintf.h>
#include <image-android-dt.h>
+#include <common.h>
#define OPT_INDEX "--index"
diff --git a/cmd/aes.c b/cmd/aes.c
index 87ad1ab..1264675 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -5,13 +5,13 @@
* Command for en/de-crypting block of memory with AES-[128/192/256]-CBC cipher.
*/
+#include <common.h>
#include <command.h>
#include <uboot_aes.h>
#include <malloc.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#include <mapmem.h>
-#include <vsprintf.h>
u32 aes_get_key_len(char *command)
{
diff --git a/cmd/arm/exception64.c b/cmd/arm/exception64.c
index 73d6c20..589a231 100644
--- a/cmd/arm/exception64.c
+++ b/cmd/arm/exception64.c
@@ -5,6 +5,7 @@
* Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk@gmx.de>
*/
+#include <common.h>
#include <command.h>
#include <linux/bitops.h>
diff --git a/cmd/armffa.c b/cmd/armffa.c
index 181e31b..9585150 100644
--- a/cmd/armffa.c
+++ b/cmd/armffa.c
@@ -5,6 +5,7 @@
* Authors:
* Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
*/
+#include <common.h>
#include <arm_ffa.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/armflash.c b/cmd/armflash.c
index e292cf8..fdaea5a 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -5,10 +5,10 @@
*
* Support for ARM Flash Partitions
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <flash.h>
-#include <vsprintf.h>
#include <asm/io.h>
#define MAX_REGIONS 4
diff --git a/cmd/axi.c b/cmd/axi.c
index 3dbea04..5620891 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -9,6 +9,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
+#include <common.h>
#include <axi.h>
#include <command.h>
#include <console.h>
diff --git a/cmd/bcb.c b/cmd/bcb.c
index fe6d6cb..f3b9256 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -8,12 +8,12 @@
#include <android_bootloader_message.h>
#include <bcb.h>
#include <command.h>
+#include <common.h>
#include <display_options.h>
#include <log.h>
#include <part.h>
#include <malloc.h>
#include <memalign.h>
-#include <vsprintf.h>
#include <linux/err.h>
enum bcb_cmd {
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 437ac4e..79106ca 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -6,6 +6,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <env.h>
diff --git a/cmd/bind.c b/cmd/bind.c
index 3a59eef..be0d4d2 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -3,6 +3,7 @@
* Copyright (c) 2018 JJ Hiblot <jjhiblot@ti.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <dm/device-internal.h>
diff --git a/cmd/binop.c b/cmd/binop.c
index 10d91b5..592e914 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <command.h>
#include <env.h>
#include <hexdump.h>
#include <malloc.h>
#include <mapmem.h>
-#include <vsprintf.h>
#include <linux/ctype.h>
enum {
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 4c05a4e..02ac928 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -8,10 +8,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <mapmem.h>
-#include <vsprintf.h>
int blk_common_cmd(int argc, char *const argv[], enum uclass_id uclass_id,
int *cur_devnump)
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index dbd03df..1456654 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -6,9 +6,9 @@
*/
#include <command.h>
#include <config.h>
+#include <common.h>
#include <malloc.h>
#include <part.h>
-#include <vsprintf.h>
static int blkc_show(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[])
diff --git a/cmd/blkmap.c b/cmd/blkmap.c
index 164f80f..ef74ebc 100644
--- a/cmd/blkmap.c
+++ b/cmd/blkmap.c
@@ -6,6 +6,7 @@
#include <blk.h>
#include <blkmap.h>
+#include <common.h>
#include <command.h>
#include <malloc.h>
#include <dm/device.h>
diff --git a/cmd/blob.c b/cmd/blob.c
index a3c1dc4..7c77c41 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -4,9 +4,9 @@
* Command for encapsulating/decapsulating blob of memory.
*/
+#include <common.h>
#include <command.h>
#include <malloc.h>
-#include <vsprintf.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) || \
diff --git a/cmd/bloblist.c b/cmd/bloblist.c
index 333ae55..26548ec 100644
--- a/cmd/bloblist.c
+++ b/cmd/bloblist.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bloblist.h>
#include <command.h>
#include <asm/global_data.h>
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 3b61844..8f43a40 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -8,6 +8,7 @@
* BMP handling routines
*/
+#include <common.h>
#include <command.h>
#include <image.h>
#include <mapmem.h>
diff --git a/cmd/boot.c b/cmd/boot.c
index 23496ca..14839c1 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -7,9 +7,9 @@
/*
* Misc boot support
*/
+#include <common.h>
#include <command.h>
#include <net.h>
-#include <vsprintf.h>
#ifdef CONFIG_CMD_GO
diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index 5e3b66e..30ce5db 100644
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <command.h>
#include <bootcount.h>
diff --git a/cmd/bootdev.c b/cmd/bootdev.c
index fa7285b..471189c 100644
--- a/cmd/bootdev.c
+++ b/cmd/bootdev.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bootdev.h>
#include <bootflow.h>
#include <bootstd.h>
diff --git a/cmd/bootflow.c b/cmd/bootflow.c
index 1588f27..be5d7d8 100644
--- a/cmd/bootflow.c
+++ b/cmd/bootflow.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bootdev.h>
#include <bootflow.h>
#include <bootm.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index 62b19e8..b9637b3 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -4,6 +4,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <bootm.h>
#include <command.h>
#include <image.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 545b0c3..9737a2d 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -7,6 +7,7 @@
/*
* Boot support
*/
+#include <common.h>
#include <bootm.h>
#include <command.h>
#include <env.h>
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 977a04b..78184fc 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -5,6 +5,7 @@
#include <charset.h>
#include <cli.h>
+#include <common.h>
#include <command.h>
#include <ansi.h>
#include <efi_config.h>
diff --git a/cmd/bootmeth.c b/cmd/bootmeth.c
index ebf8b7e..f5b0134 100644
--- a/cmd/bootmeth.c
+++ b/cmd/bootmeth.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bootdev.h>
#include <bootmeth.h>
#include <bootstd.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 5246924..77a4bc6 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -3,9 +3,9 @@
* Copyright (c) 2012, Google Inc. All rights reserved.
*/
+#include <common.h>
#include <bootstage.h>
#include <command.h>
-#include <vsprintf.h>
static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 55837a7..b6bb4aa 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -4,6 +4,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <bootm.h>
#include <command.h>
#include <image.h>
diff --git a/cmd/broadcom/chimp_boot.c b/cmd/broadcom/chimp_boot.c
index ae0a811..16f2b61 100644
--- a/cmd/broadcom/chimp_boot.c
+++ b/cmd/broadcom/chimp_boot.c
@@ -3,6 +3,7 @@
* Copyright 2020 Broadcom
*/
+#include <common.h>
#include <command.h>
#include <broadcom/chimp.h>
diff --git a/cmd/broadcom/chimp_handshake.c b/cmd/broadcom/chimp_handshake.c
index e274267..a90a73a 100644
--- a/cmd/broadcom/chimp_handshake.c
+++ b/cmd/broadcom/chimp_handshake.c
@@ -3,6 +3,7 @@
* Copyright 2020 Broadcom
*/
+#include <common.h>
#include <command.h>
#include <broadcom/chimp.h>
diff --git a/cmd/broadcom/nitro_image_load.c b/cmd/broadcom/nitro_image_load.c
index 289b184..93b5cb4 100644
--- a/cmd/broadcom/nitro_image_load.c
+++ b/cmd/broadcom/nitro_image_load.c
@@ -3,8 +3,8 @@
* Copyright 2020 Broadcom
*/
+#include <common.h>
#include <command.h>
-#include <vsprintf.h>
#define FW_IMAGE_SIG 0xff123456
#define CFG_IMAGE_SIG 0xcf54321a
diff --git a/cmd/btrfs.c b/cmd/btrfs.c
index 69d1b1f..2843835 100644
--- a/cmd/btrfs.c
+++ b/cmd/btrfs.c
@@ -3,6 +3,7 @@
* 2017 by Marek Behún <kabel@kernel.org>
*/
+#include <common.h>
#include <command.h>
#include <btrfs.h>
#include <fs.h>
diff --git a/cmd/button.c b/cmd/button.c
index 3e6db3f..1b45d0a 100644
--- a/cmd/button.c
+++ b/cmd/button.c
@@ -5,6 +5,7 @@
* Based on led.c
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <button.h>
diff --git a/cmd/cache.c b/cmd/cache.c
index 0254ff1..b68d45b 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -7,6 +7,7 @@
/*
* Cache support: switch on or off, get status
*/
+#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <linux/compiler.h>
diff --git a/cmd/cat.c b/cmd/cat.c
index 6828b7b..18aa6ca 100644
--- a/cmd/cat.c
+++ b/cmd/cat.c
@@ -4,6 +4,7 @@
* Roger Knecht <rknecht@pm.de>
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
#include <malloc.h>
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index c103546..3cfc9eb 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -6,10 +6,10 @@
/*
* CBFS commands
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <cbfs.h>
-#include <vsprintf.h>
static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/cedit.c b/cmd/cedit.c
index fec67a8..6352e63 100644
--- a/cmd/cedit.c
+++ b/cmd/cedit.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <abuf.h>
#include <cedit.h>
#include <command.h>
diff --git a/cmd/clk.c b/cmd/clk.c
index 6fda6ef..7bbcbfe 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -2,6 +2,7 @@
/*
* Copyright (C) 2013 Xilinx, Inc.
*/
+#include <common.h>
#include <command.h>
#include <clk.h>
#if defined(CONFIG_DM) && defined(CONFIG_CLK)
diff --git a/cmd/clone.c b/cmd/clone.c
index 1f3cff1..a906207 100644
--- a/cmd/clone.c
+++ b/cmd/clone.c
@@ -4,11 +4,11 @@
*
*/
+#include <common.h>
#include <command.h>
#include <malloc.h>
#include <part.h>
#include <blk.h>
-#include <time.h>
#include <vsprintf.h>
#define BUFSIZE (1 * 1024 * 1024)
diff --git a/cmd/cls.c b/cmd/cls.c
index 4bee8a1..80d0558 100644
--- a/cmd/cls.c
+++ b/cmd/cls.c
@@ -5,6 +5,7 @@
*
* cls - clear screen command
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <dm.h>
diff --git a/cmd/config.c b/cmd/config.c
index f0d2033..cf30841 100644
--- a/cmd/config.c
+++ b/cmd/config.c
@@ -3,6 +3,7 @@
* Copyright (C) 2017 Masahiro Yamada <yamada.masahiro@socionext.com>
*/
+#include <common.h>
#include <command.h>
#include <gzip.h>
#include <malloc.h>
diff --git a/cmd/conitrace.c b/cmd/conitrace.c
index 6cc1133..9a1bc35 100644
--- a/cmd/conitrace.c
+++ b/cmd/conitrace.c
@@ -5,6 +5,7 @@
*
* Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk@gmx.de>
*/
+#include <common.h>
#include <command.h>
#include <linux/delay.h>
diff --git a/cmd/console.c b/cmd/console.c
index 12fc920..58c2cf1 100644
--- a/cmd/console.c
+++ b/cmd/console.c
@@ -7,6 +7,7 @@
/*
* Boot support
*/
+#include <common.h>
#include <command.h>
#include <iomux.h>
#include <stdio_dev.h>
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 9e32306..245a82f 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -5,6 +5,7 @@
* Copyright (c) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <cpu.h>
#include <display_options.h>
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index b57e281..57e2afa 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -10,6 +10,7 @@
/*
* CRAMFS support
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <image.h>
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 7b60e41..90921ce 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -6,6 +6,7 @@
* Copyright (c) 2016 National Instruments Corp
*/
+#include <common.h>
#include <command.h>
#include <cros_ec.h>
#include <dm.h>
diff --git a/cmd/cyclic.c b/cmd/cyclic.c
index 40e966d..ad7fc3b 100644
--- a/cmd/cyclic.c
+++ b/cmd/cyclic.c
@@ -8,12 +8,11 @@
* Copyright (C) 2022 Stefan Roese <sr@denx.de>
*/
+#include <common.h>
#include <command.h>
#include <cyclic.h>
#include <div64.h>
#include <malloc.h>
-#include <time.h>
-#include <vsprintf.h>
#include <linux/delay.h>
struct cyclic_demo_info {
diff --git a/cmd/date.c b/cmd/date.c
index 755adec..4f98b47 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -7,6 +7,7 @@
/*
* RTC, Date & Time support: get and set date & time
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <rtc.h>
diff --git a/cmd/demo.c b/cmd/demo.c
index 5c422ac..ebd5a24 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -6,6 +6,7 @@
* Pavel Herrmann <morpheus.ibis@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <dm-demo.h>
diff --git a/cmd/dfu.c b/cmd/dfu.c
index 46f0190..d7bfb53 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -10,6 +10,7 @@
* Lukasz Majewski <l.majewski@samsung.com>
*/
+#include <common.h>
#include <command.h>
#include <watchdog.h>
#include <dfu.h>
diff --git a/cmd/diag.c b/cmd/diag.c
index c6da5aa..f51536d 100644
--- a/cmd/diag.c
+++ b/cmd/diag.c
@@ -7,6 +7,7 @@
/*
* Diagnostics support
*/
+#include <common.h>
#include <command.h>
#include <post.h>
diff --git a/cmd/disk.c b/cmd/disk.c
index 2efc3ca..92eaa02 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -3,6 +3,7 @@
* (C) Copyright 2000-2011
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <bootstage.h>
#include <command.h>
#include <cpu_func.h>
diff --git a/cmd/dm.c b/cmd/dm.c
index ec9cfd8..fb605c2 100644
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -6,6 +6,7 @@
* Marek Vasut <marex@denx.de>
*/
+#include <common.h>
#include <command.h>
#include <dm/root.h>
#include <dm/util.h>
diff --git a/cmd/echo.c b/cmd/echo.c
index 973213a..fda844e 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -4,6 +4,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 26f3750..322765a 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -19,12 +19,12 @@
*
*/
+#include <common.h>
#include <config.h>
#include <command.h>
#include <eeprom.h>
#include <i2c.h>
#include <eeprom_layout.h>
-#include <vsprintf.h>
#include <linux/delay.h>
#ifndef I2C_RXTX_LEN
diff --git a/cmd/efi.c b/cmd/efi.c
index 6bed2d7..6cd5361 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <efi.h>
#include <efi_api.h>
diff --git a/cmd/efi_common.c b/cmd/efi_common.c
index c46764e..1aa2351 100644
--- a/cmd/efi_common.c
+++ b/cmd/efi_common.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <efi.h>
#include <efi_api.h>
#include <uuid.h>
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c
index 4164cb4..0ba92c6 100644
--- a/cmd/eficonfig.c
+++ b/cmd/eficonfig.c
@@ -7,6 +7,7 @@
#include <ansi.h>
#include <cli.h>
+#include <common.h>
#include <charset.h>
#include <efi_loader.h>
#include <efi_load_initrd.h>
diff --git a/cmd/eficonfig_sbkey.c b/cmd/eficonfig_sbkey.c
index b3325a5..caca274 100644
--- a/cmd/eficonfig_sbkey.c
+++ b/cmd/eficonfig_sbkey.c
@@ -6,6 +6,7 @@
*/
#include <ansi.h>
+#include <common.h>
#include <charset.h>
#include <hexdump.h>
#include <log.h>
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index e978e74..c2c525f 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -6,6 +6,7 @@
*/
#include <charset.h>
+#include <common.h>
#include <command.h>
#include <dm/device.h>
#include <efi_dt_fixup.h>
diff --git a/cmd/elf.c b/cmd/elf.c
index a02361f..df4354d 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -4,6 +4,7 @@
* All rights reserved.
*/
+#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <elf.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 4bf49ac..f8b8a79 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -5,13 +5,13 @@
* Ethernet Switch commands
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <errno.h>
#include <env_flags.h>
#include <ethsw.h>
#include <net.h>
-#include <vsprintf.h>
static const char *ethsw_name;
diff --git a/cmd/event.c b/cmd/event.c
index 00c8287..f6cdb55 100644
--- a/cmd/event.c
+++ b/cmd/event.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <event.h>
diff --git a/cmd/exit.c b/cmd/exit.c
index d125ec1..7bf241e 100644
--- a/cmd/exit.c
+++ b/cmd/exit.c
@@ -4,8 +4,8 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#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/ext2.c b/cmd/ext2.c
index 45c8b35..a0ce0cf 100644
--- a/cmd/ext2.c
+++ b/cmd/ext2.c
@@ -19,6 +19,7 @@
/*
* Ext2fs support
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
diff --git a/cmd/ext4.c b/cmd/ext4.c
index 40d1fe3..4791b69 100644
--- a/cmd/ext4.c
+++ b/cmd/ext4.c
@@ -25,6 +25,7 @@
* file in uboot. Added ext4fs ls load and write support.
*/
+#include <common.h>
#include <part.h>
#include <config.h>
#include <command.h>
diff --git a/cmd/extension_board.c b/cmd/extension_board.c
index f43bf68..2b672d8 100644
--- a/cmd/extension_board.c
+++ b/cmd/extension_board.c
@@ -4,6 +4,7 @@
* Köry Maincent, Bootlin, <kory.maincent@bootlin.com>
*/
+#include <common.h>
#include <bootdev.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index d4cfc0c..c3c1923 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -6,6 +6,7 @@
* (C) Copyright 2014 Linaro, Ltd.
* Rob Herring <robh@kernel.org>
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <g_dnl.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index ad0e5ed..69ce1fa 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -7,6 +7,7 @@
/*
* Boot support
*/
+#include <common.h>
#include <command.h>
#include <mapmem.h>
#include <fat.h>
diff --git a/cmd/fdt.c b/cmd/fdt.c
index d16b141..331564c 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -7,6 +7,7 @@
* Matthew McClintock <msm@freescale.com>
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <image.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index de0e04f..f4f85ec 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -7,9 +7,9 @@
/*
* FLASH support
*/
+#include <common.h>
#include <command.h>
#include <log.h>
-#include <vsprintf.h>
#include <uuid.h>
#if defined(CONFIG_CMD_MTDPARTS)
diff --git a/cmd/font.c b/cmd/font.c
index ebde094..cb39c88 100644
--- a/cmd/font.c
+++ b/cmd/font.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <video.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 93f1409..8c64e957 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -7,6 +7,7 @@
/*
* FPGA support
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <fpga.h>
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index b4bfaa1..dfc6220 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -8,10 +8,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <display_options.h>
-#include <vsprintf.h>
#include <gdsys_fpga.h>
diff --git a/cmd/fs.c b/cmd/fs.c
index 3d7e06d..46cb43d 100644
--- a/cmd/fs.c
+++ b/cmd/fs.c
@@ -5,6 +5,7 @@
* Inspired by cmd_ext_common.c, cmd_fat.c.
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
diff --git a/cmd/fs_uuid.c b/cmd/fs_uuid.c
index 5f7770d..5dc94aa 100644
--- a/cmd/fs_uuid.c
+++ b/cmd/fs_uuid.c
@@ -5,6 +5,7 @@
* Copyright (C) 2014, Bachmann electronic GmbH
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
diff --git a/cmd/fuse.c b/cmd/fuse.c
index 598ef49..f884c89 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -8,11 +8,11 @@
* Martha Marx <mmarx@silicontkx.com>
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <fuse.h>
#include <mapmem.h>
-#include <vsprintf.h>
#include <linux/errno.h>
static int strtou32(const char *str, unsigned int base, u32 *result)
diff --git a/cmd/gettime.c b/cmd/gettime.c
index fc307ef..2e74e02 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -11,8 +11,8 @@
/*
* Get Timer overflows after 2^32 / CONFIG_SYS_HZ (32Khz) = 131072 sec
*/
+#include <common.h>
#include <command.h>
-#include <time.h>
static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 7a43dc6..dab6f70 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -6,6 +6,7 @@
* Licensed under the GPL-2 or later.
*/
+#include <common.h>
#include <command.h>
#include <errno.h>
#include <dm.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 36b112d..7aaf188 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -10,6 +10,7 @@
* author: Piotr Wilczek <p.wilczek@samsung.com>
*/
+#include <common.h>
#include <blk.h>
#include <env.h>
#include <log.h>
diff --git a/cmd/hash.c b/cmd/hash.c
index 60d482b..5534a73 100644
--- a/cmd/hash.c
+++ b/cmd/hash.c
@@ -9,6 +9,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <hash.h>
#include <linux/ctype.h>
diff --git a/cmd/help.c b/cmd/help.c
index 56579e2..9f8393e 100644
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -4,6 +4,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
static int do_help(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/history.c b/cmd/history.c
index 8972986..b6bf467 100644
--- a/cmd/history.c
+++ b/cmd/history.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <cli.h>
diff --git a/cmd/host.c b/cmd/host.c
index e03576b..c33c2a9 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -3,6 +3,7 @@
* Copyright (c) 2012, Google Inc.
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <fs.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 7dac0a9..8083156 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -64,6 +64,7 @@
* Adapted from cmd_mem.c which is copyright Wolfgang Denk (wd@denx.de).
*/
+#include <common.h>
#include <bootretry.h>
#include <cli.h>
#include <command.h>
diff --git a/cmd/ide.c b/cmd/ide.c
index 036489f..ddc87d3 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -8,6 +8,7 @@
* IDE support
*/
+#include <common.h>
#include <blk.h>
#include <dm.h>
#include <config.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index 9639901..35de237 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -11,9 +11,9 @@
* http://code.google.com/p/inih/
*/
+#include <common.h>
#include <command.h>
#include <env.h>
-#include <vsprintf.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/io.c b/cmd/io.c
index 617373d..2de1111 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -7,9 +7,9 @@
* IO space access commands.
*/
+#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 0a041ed..f28359e 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -3,9 +3,9 @@
* Copyright (c) 2014 Google, Inc
*/
+#include <common.h>
#include <command.h>
#include <iotrace.h>
-#include <vsprintf.h>
static void do_print_stats(void)
{
diff --git a/cmd/irq.c b/cmd/irq.c
index 655aba5..1d3e28c 100644
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -3,6 +3,7 @@
* Copyright 2008 Freescale Semiconductor, Inc.
*/
+#include <common.h>
#include <config.h>
#include <command.h>
#include <irq_func.h>
diff --git a/cmd/itest.c b/cmd/itest.c
index b79512a..74414cb 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -11,11 +11,11 @@
* A few parts were lifted from bash 'test' command
*/
+#include <common.h>
#include <config.h>
#include <command.h>
#include <env.h>
#include <mapmem.h>
-#include <vsprintf.h>
#include <asm/io.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 89d336f..e00fcc2 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -70,6 +70,7 @@
/*
* JFFS2/CRAMFS support
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#if defined(CONFIG_CMD_FLASH)
diff --git a/cmd/kaslrseed.c b/cmd/kaslrseed.c
index e0d3c7f..9acb8e1 100644
--- a/cmd/kaslrseed.c
+++ b/cmd/kaslrseed.c
@@ -6,6 +6,7 @@
* Copyright (c) 2021, Chris Morgan <macromorgan@hotmail.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <hexdump.h>
diff --git a/cmd/led.c b/cmd/led.c
index 4256b34..48a02ba 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <led.h>
diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c
index 1a52710..5903a90 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.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 50de7e8..5256255 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -9,9 +9,10 @@
* Ulf Samuelsson <ulf.samuelsson@atmel.com>
*/
+#include <common.h>
+#include <config.h>
#include <command.h>
#include <status_led.h>
-#include <vsprintf.h>
struct led_tbl_s {
char *string; /* String for use in the command */
diff --git a/cmd/license.c b/cmd/license.c
index 161663f..15411b5 100644
--- a/cmd/license.c
+++ b/cmd/license.c
@@ -4,6 +4,7 @@
* Author: Harald Welte <laforge@openmoko.org>
*/
+#include <common.h>
#include <command.h>
#include <gzip.h>
#include <malloc.h>
diff --git a/cmd/load.c b/cmd/load.c
index ace1c52..540361b 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -7,6 +7,7 @@
/*
* Serial up- and download support
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <cpu_func.h>
diff --git a/cmd/log.c b/cmd/log.c
index 519ec76..c9a23e4 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <getopt.h>
diff --git a/cmd/lsblk.c b/cmd/lsblk.c
index 7c00bfd..d214daf 100644
--- a/cmd/lsblk.c
+++ b/cmd/lsblk.c
@@ -4,6 +4,7 @@
* Niel Fourie, DENX Software Engineering, lusus@denx.de.
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index c40b969..81924da 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -9,10 +9,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <mapmem.h>
-#include <vsprintf.h>
#include <asm/io.h>
#include <lzma/LzmaTools.h>
diff --git a/cmd/mbr.c b/cmd/mbr.c
index 7e1f92a..ec99b66 100644
--- a/cmd/mbr.c
+++ b/cmd/mbr.c
@@ -8,11 +8,11 @@
* based on the gpt command.
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <malloc.h>
#include <part.h>
-#include <vsprintf.h>
/**
* extract_val() - Extract a value from the key=value pair list
diff --git a/cmd/mdio.c b/cmd/mdio.c
index c0a8708..3c74326 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -8,6 +8,7 @@
* MDIO Commands
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <miiphy.h>
diff --git a/cmd/mem.c b/cmd/mem.c
index 4989d27..768057e 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -10,6 +10,7 @@
* Copied from FADS ROM, Dan Malek (dmalek@jlc.net)
*/
+#include <common.h>
#include <console.h>
#include <bootretry.h>
#include <cli.h>
@@ -23,7 +24,6 @@
#include <log.h>
#include <mapmem.h>
#include <rand.h>
-#include <time.h>
#include <watchdog.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/cmd/meson/sm.c b/cmd/meson/sm.c
index b69f812..de9a242 100644
--- a/cmd/meson/sm.c
+++ b/cmd/meson/sm.c
@@ -9,11 +9,11 @@
*/
#include <command.h>
+#include <common.h>
#include <env.h>
#include <asm/arch/sm.h>
#include <stdlib.h>
#include <display_options.h>
-#include <vsprintf.h>
static int do_sm_serial(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/mii.c b/cmd/mii.c
index ce37248..fab420e 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -8,6 +8,7 @@
* MII Utilities
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <miiphy.h>
diff --git a/cmd/misc.c b/cmd/misc.c
index 792d972..ec32b41 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -8,6 +8,7 @@
* A command interface to access misc devices with MISC uclass driver APIs.
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <errno.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 7244a90..2d5430a 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -4,6 +4,7 @@
* Kyle Harris, kharris@nexus-tech.net
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <console.h>
@@ -13,7 +14,6 @@
#include <part.h>
#include <sparse_format.h>
#include <image-sparse.h>
-#include <vsprintf.h>
static int curr_device = -1;
diff --git a/cmd/mp.c b/cmd/mp.c
index b9b5e01..1b4373f 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -3,9 +3,9 @@
* Copyright 2008-2009 Freescale Semiconductor, Inc.
*/
+#include <common.h>
#include <command.h>
#include <cpu_func.h>
-#include <vsprintf.h>
static int cpu_status_all(void)
{
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 795aaa2..9189f45 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -9,6 +9,7 @@
*/
#include <command.h>
+#include <common.h>
#include <console.h>
#if CONFIG_IS_ENABLED(CMD_MTD_OTP)
#include <hexdump.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index f57d84d..b31db73 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -70,6 +70,7 @@
*
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <log.h>
diff --git a/cmd/mux.c b/cmd/mux.c
index 2f6c08b..388fb08 100644
--- a/cmd/mux.c
+++ b/cmd/mux.c
@@ -6,6 +6,7 @@
* Author: Pratyush Yadav <p.yadav@ti.com>
*/
+#include <common.h>
#include <command.h>
#include <errno.h>
#include <dm.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index e3f21dd..744b1c2 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -5,6 +5,7 @@
*/
#include <config.h>
+#include <common.h>
#include <command.h>
#include <env.h>
#include <image.h>
diff --git a/cmd/mvebu/comphy_rx_training.c b/cmd/mvebu/comphy_rx_training.c
index 5653877..4ee8f54 100644
--- a/cmd/mvebu/comphy_rx_training.c
+++ b/cmd/mvebu/comphy_rx_training.c
@@ -5,6 +5,7 @@
* SPDX-License-Identifier: GPL-2.0
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <dm.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 5a328e0..fe834c4 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -23,6 +23,7 @@
* only
*/
+#include <common.h>
#include <bootstage.h>
#include <image.h>
#include <asm/cache.h>
diff --git a/cmd/net.c b/cmd/net.c
index b206ff5..d407d83 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -9,6 +9,7 @@
/*
* Boot support
*/
+#include <common.h>
#include <bootstage.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 98a687b..e77338f 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -23,7 +23,7 @@
* environment. After that, we use a hash table.
*/
-#include <config.h>
+#include <common.h>
#include <cli.h>
#include <command.h>
#include <console.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 64ae2ad..7a30b5c 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -6,6 +6,7 @@
*/
#include <charset.h>
+#include <common.h>
#include <command.h>
#include <efi_loader.h>
#include <efi_variable.h>
diff --git a/cmd/nvme.c b/cmd/nvme.c
index f2c9acb..09d5f43 100644
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -4,6 +4,7 @@
* Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index 6e808ce..fad7815 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -9,6 +9,7 @@
* published by the Free Software Foundation.
*/
+#include <common.h>
#include <command.h>
#include <malloc.h>
#include <linux/printk.h>
diff --git a/cmd/optee_rpmb.c b/cmd/optee_rpmb.c
index b155278..b3cafd9 100644
--- a/cmd/optee_rpmb.c
+++ b/cmd/optee_rpmb.c
@@ -4,6 +4,7 @@
*/
#include <command.h>
+#include <common.h>
#include <env.h>
#include <errno.h>
#include <image.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index 5671338..210bc5d 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -9,6 +9,7 @@
* Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <hexdump.h>
diff --git a/cmd/panic.c b/cmd/panic.c
index 7c0affa..f13b3f0 100644
--- a/cmd/panic.c
+++ b/cmd/panic.c
@@ -3,7 +3,7 @@
* Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
*/
-#include <vsprintf.h>
+#include <common.h>
#include <command.h>
static int do_panic(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/part.c b/cmd/part.c
index d140a1e..c75f85a 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -15,6 +15,7 @@
* Pavel Bartusek <pba@sysgo.com>
*/
+#include <common.h>
#include <config.h>
#include <command.h>
#include <env.h>
diff --git a/cmd/pcap.c b/cmd/pcap.c
index 8d61096..a014920 100644
--- a/cmd/pcap.c
+++ b/cmd/pcap.c
@@ -4,8 +4,8 @@
* Ramon Fried <rfried.dev@gmail.com>
*/
+#include <common.h>
#include <command.h>
-#include <vsprintf.h>
#include <net.h>
#include <net/pcap.h>
diff --git a/cmd/pci.c b/cmd/pci.c
index 3c0aed5..d89e71c 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -12,6 +12,7 @@
* PCI routines
*/
+#include <common.h>
#include <bootretry.h>
#include <cli.h>
#include <command.h>
diff --git a/cmd/pci_mps.c b/cmd/pci_mps.c
index 19e71db..98161da 100644
--- a/cmd/pci_mps.c
+++ b/cmd/pci_mps.c
@@ -6,6 +6,7 @@
* PCI Express Maximum Packet Size (MPS) configuration
*/
+#include <common.h>
#include <bootretry.h>
#include <cli.h>
#include <command.h>
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 01f3e4a..105f01e 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <errno.h>
diff --git a/cmd/pmc.c b/cmd/pmc.c
index 1a3416f..9a3ba2b 100644
--- a/cmd/pmc.c
+++ b/cmd/pmc.c
@@ -5,6 +5,7 @@
* Copyright 2019 Google LLC
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <power/acpi_pmc.h>
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 3ad1b8a..c9e9730 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -3,6 +3,7 @@
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
*/
+#include <common.h>
#include <command.h>
#include <errno.h>
#include <dm.h>
diff --git a/cmd/printf.c b/cmd/printf.c
index a1727ac..0c6887e 100644
--- a/cmd/printf.c
+++ b/cmd/printf.c
@@ -84,12 +84,12 @@
* We try to be compatible.
*/
+#include <common.h>
#include <ctype.h>
#include <errno.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
-#include <vsprintf.h>
#define WANT_HEX_ESCAPES 0
#define PRINT_CONVERSION_ERROR 1
diff --git a/cmd/pvblock.c b/cmd/pvblock.c
index 3a83ac9..1b604c3 100644
--- a/cmd/pvblock.c
+++ b/cmd/pvblock.c
@@ -6,6 +6,7 @@
*/
#include <blk.h>
+#include <common.h>
#include <command.h>
/* Current I/O Device */
diff --git a/cmd/pxe.c b/cmd/pxe.c
index ae02c28..21134eb 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -4,12 +4,12 @@
* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
#include <net.h>
#include <net6.h>
#include <malloc.h>
-#include <vsprintf.h>
#include "pxe_utils.h"
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 1b10811..1b8c775 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -3,6 +3,7 @@
* (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <errno.h>
diff --git a/cmd/read.c b/cmd/read.c
index af54bd1..1218e7a 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -8,10 +8,10 @@
* Software Foundation.
*/
+#include <common.h>
#include <command.h>
#include <mapmem.h>
#include <part.h>
-#include <vsprintf.h>
static int
do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/reginfo.c b/cmd/reginfo.c
index 53b8bc4..c8a04b1 100644
--- a/cmd/reginfo.c
+++ b/cmd/reginfo.c
@@ -4,6 +4,7 @@
* Subodh Nijsure, SkyStream Networks, snijsure@skystream.com
*/
+#include <common.h>
#include <command.h>
#include <asm/ppc.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index da29809..635a9ad 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -3,6 +3,7 @@
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
*/
+#include <common.h>
#include <command.h>
#include <errno.h>
#include <dm.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 3c5b6a0..ea8724a 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -3,6 +3,7 @@
* (C) Copyright 2015
* Texas Instruments Incorporated - https://www.ti.com/
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <errno.h>
diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c
index a231604..2d8ee7e 100644
--- a/cmd/riscv/sbi.c
+++ b/cmd/riscv/sbi.c
@@ -5,6 +5,7 @@
* Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk@gmx.de>
*/
+#include <common.h>
#include <command.h>
#include <asm/sbi.h>
diff --git a/cmd/rkmtd.c b/cmd/rkmtd.c
index a870c11..5b80427 100644
--- a/cmd/rkmtd.c
+++ b/cmd/rkmtd.c
@@ -8,6 +8,7 @@
* Copyright (C) 2023 Johan Jonker <jbx6244@gmail.com>
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/rng.c b/cmd/rng.c
index 2fb7202..e5ab868 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -4,6 +4,7 @@
*
* Copyright (c) 2019, Heinrich Schuchardt <xypron.glpk@gmx.de>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <hexdump.h>
diff --git a/cmd/rockusb.c b/cmd/rockusb.c
index 48497aa..0708856 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -3,6 +3,7 @@
* Copyright (C) 2017 Eddie Cai <eddie.cai.linux@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <console.h>
#include <g_dnl.h>
diff --git a/cmd/rtc.c b/cmd/rtc.c
index a931fd9..a344cfa 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <command.h>
#include <display_options.h>
#include <dm.h>
diff --git a/cmd/sata.c b/cmd/sata.c
index 8b923f9..9c9fe11 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -9,6 +9,7 @@
* Dave Liu <daveliu@freescale.com>
*/
+#include <common.h>
#include <ahci.h>
#include <blk.h>
#include <dm.h>
diff --git a/cmd/sb.c b/cmd/sb.c
index 1aa5921..0d55818 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <spl.h>
diff --git a/cmd/scp03.c b/cmd/scp03.c
index 9c749d1..2b8d5ae 100644
--- a/cmd/scp03.c
+++ b/cmd/scp03.c
@@ -4,6 +4,7 @@
*
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <scp03.h>
diff --git a/cmd/scsi.c b/cmd/scsi.c
index c286bdc..c501d7f 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -7,6 +7,7 @@
/*
* SCSI support.
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <scsi.h>
diff --git a/cmd/seama.c b/cmd/seama.c
index 3c8e819..3aafb43 100644
--- a/cmd/seama.c
+++ b/cmd/seama.c
@@ -4,6 +4,7 @@
* Support for the "SEAttle iMAge" SEAMA NAND image format
*/
+#include <common.h>
#include <command.h>
#include <nand.h>
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index e111b8b..ab76824 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -8,6 +8,7 @@
* This file provides a shell like 'expr' function to return.
*/
+#include <common.h>
#include <config.h>
#include <command.h>
#include <ctype.h>
@@ -15,8 +16,6 @@
#include <log.h>
#include <malloc.h>
#include <mapmem.h>
-#include <vsprintf.h>
-#include <linux/errno.h>
#include <linux/sizes.h>
#include "printf.h"
diff --git a/cmd/sf.c b/cmd/sf.c
index f43a2e0..e386689 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -5,6 +5,7 @@
* Copyright (C) 2008 Atmel Corporation
*/
+#include <common.h>
#include <command.h>
#include <display_options.h>
#include <div64.h>
@@ -13,7 +14,6 @@
#include <malloc.h>
#include <mapmem.h>
#include <spi.h>
-#include <time.h>
#include <spi_flash.h>
#include <asm/cache.h>
#include <jffs2/jffs2.h>
diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c
index 52aa26c..bcc665a 100644
--- a/cmd/sha1sum.c
+++ b/cmd/sha1sum.c
@@ -7,6 +7,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <hash.h>
#include <u-boot/sha1.h>
diff --git a/cmd/sleep.c b/cmd/sleep.c
index 7616fed..c741b4a 100644
--- a/cmd/sleep.c
+++ b/cmd/sleep.c
@@ -4,10 +4,9 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <console.h>
-#include <time.h>
-#include <vsprintf.h>
#include <linux/delay.h>
static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 3a4d885..fb80431 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -4,8 +4,8 @@
* Michalis Pappas <mpappas@fastmail.fm>
*/
#include <asm/psci.h>
+#include <common.h>
#include <command.h>
-#include <vsprintf.h>
#include <linux/arm-smccc.h>
#include <linux/compiler.h>
#include <linux/psci.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index 08bf741..0b7f959 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -4,6 +4,7 @@
* Rajeshwari Shinde <rajeshwari.s@samsung.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/cmd/source.c b/cmd/source.c
index c9b5f8e..0ba9736 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -14,6 +14,7 @@
/* #define DEBUG */
+#include <common.h>
#include <command.h>
#include <env.h>
#include <image.h>
diff --git a/cmd/spi.c b/cmd/spi.c
index ea30c85..f30018f 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -8,6 +8,7 @@
* SPI Read/Write Utilities
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <errno.h>
diff --git a/cmd/spl.c b/cmd/spl.c
index d1f47c7..8a2ded7 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -4,6 +4,7 @@
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
*/
+#include <common.h>
#include <command.h>
#include <cmd_spl.h>
#include <env.h>
diff --git a/cmd/stackprot_test.c b/cmd/stackprot_test.c
index e7ff4a0..f347028 100644
--- a/cmd/stackprot_test.c
+++ b/cmd/stackprot_test.c
@@ -3,6 +3,7 @@
* Copyright 2021 Broadcom
*/
+#include <common.h>
#include <command.h>
static int do_test_stackprot_fail(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/strings.c b/cmd/strings.c
index 5bcb0f2..bf348af 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -7,8 +7,8 @@
*/
#include <config.h>
+#include <common.h>
#include <command.h>
-#include <vsprintf.h>
static char *start_addr, *last_addr;
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 0ea08fd..d14c570 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <command.h>
#include <env.h>
#include <fs.h>
#include <pxe_utils.h>
-#include <vsprintf.h>
/**
* struct sysboot_info - useful information for sysboot helpers
diff --git a/cmd/temperature.c b/cmd/temperature.c
index 41e422f..420965d 100644
--- a/cmd/temperature.c
+++ b/cmd/temperature.c
@@ -5,6 +5,7 @@
* Written by Robert Marko <robert.marko@sartura.hr>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <thermal.h>
diff --git a/cmd/terminal.c b/cmd/terminal.c
index 369a755..9e32a41 100644
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -7,6 +7,7 @@
/*
* Boot support
*/
+#include <common.h>
#include <command.h>
#include <stdio_dev.h>
#include <serial.h>
diff --git a/cmd/test.c b/cmd/test.c
index b4c3eab..fa7c48f 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -4,10 +4,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <fs.h>
#include <log.h>
-#include <vsprintf.h>
#define OP_INVALID 0
#define OP_NOT 1
diff --git a/cmd/thordown.c b/cmd/thordown.c
index 70061bf..48e22b3 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -6,6 +6,7 @@
* All rights reserved.
*/
+#include <common.h>
#include <command.h>
#include <thor.h>
#include <dfu.h>
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 70ce53d..bbd406f 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -12,6 +12,7 @@
#include <asm/arch/hardware.h>
#include <asm/cache.h>
#include <asm/emif.h>
+#include <common.h>
#include <command.h>
#include <asm/global_data.h>
diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c
index 305023a..a0492a5 100644
--- a/cmd/ti/pd.c
+++ b/cmd/ti/pd.c
@@ -5,6 +5,7 @@
* Copyright (C) 2020 Texas Instruments Incorporated, <www.ti.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <k3-dev.h>
diff --git a/cmd/time.c b/cmd/time.c
index eee6084..db8c189 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -3,6 +3,7 @@
* Copyright (c) 2011 The Chromium OS Authors.
*/
+#include <common.h>
#include <command.h>
static void report_time(ulong cycles)
diff --git a/cmd/timer.c b/cmd/timer.c
index 04fcd84..551be5d 100644
--- a/cmd/timer.c
+++ b/cmd/timer.c
@@ -4,8 +4,8 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
-#include <time.h>
static int do_timer(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 0aec752..57cfd35 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -9,6 +9,7 @@
* Copyright (C) 2014,2016 david_yang <david_yang@accton.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <i2c.h>
diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c
index 1cd57f9..a7dc23d 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -3,6 +3,7 @@
* Copyright (c) 2013 The Chromium OS Authors.
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <env.h>
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 6e019d1..1b1efcd 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -3,10 +3,10 @@
* Copyright (c) 2013 The Chromium OS Authors.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <malloc.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 99c540b..7e479b9 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -4,6 +4,7 @@
* Author: Miquel Raynal <miquel.raynal@bootlin.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <log.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 9c8b1c7..c7fa6e7 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -3,10 +3,10 @@
* Copyright (c) 2015 Google, Inc
*/
+#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <log.h>
-#include <time.h>
#include <tpm-v1.h>
#include <linux/printk.h>
#include "tpm-user-utils.h"
diff --git a/cmd/trace.c b/cmd/trace.c
index 937e6a6..2e3ee1d 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -3,11 +3,11 @@
* Copyright (c) 2011 The Chromium OS Authors.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <mapmem.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 113b4e6..0d849d9 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -7,10 +7,10 @@
* (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
*/
+#include <common.h>
#include <command.h>
#include <log.h>
#include <malloc.h>
-#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 8c1b5df..0a6a80b 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -11,6 +11,7 @@
* published by the Free Software Foundation.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <exports.h>
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 8fd3903..2a035bc 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -11,11 +11,11 @@
#undef DEBUG
+#include <common.h>
#include <config.h>
#include <command.h>
#include <log.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 6e21fbb..536bd85 100644
--- a/cmd/ufs.c
+++ b/cmd/ufs.c
@@ -5,9 +5,9 @@
* Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com
*
*/
+#include <common.h>
#include <command.h>
#include <ufs.h>
-#include <vsprintf.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 d1a7128..fb3a32d 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -3,9 +3,9 @@
* (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
*/
+#include <common.h>
#include <command.h>
#include <malloc.h>
-#include <vsprintf.h>
#include <asm/io.h>
#include <pci.h>
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index fc52001..5f20838 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -4,9 +4,9 @@
* FUJITSU COMPUTERTECHNOLOGIES LIMITED. All rights reserved.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
-#include <vsprintf.h>
#include <u-boot/lz4.h>
static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/unzip.c b/cmd/unzip.c
index e7a3f98..bc6cee0 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -4,12 +4,12 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <gzip.h>
#include <mapmem.h>
#include <part.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 3a3764a..23253f2 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -10,6 +10,7 @@
* project.
*/
+#include <common.h>
#include <blk.h>
#include <bootstage.h>
#include <command.h>
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 39259a3..cbdda73 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -6,6 +6,7 @@
* Author: Stefan Agner <stefan.agner@toradex.com>
*/
+#include <common.h>
#include <command.h>
#include <g_dnl.h>
#include <sdp.h>
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 47e8b70..751701f 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -6,6 +6,7 @@
* Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <console.h>
diff --git a/cmd/vbe.c b/cmd/vbe.c
index 423d9e5..0e84b0e 100644
--- a/cmd/vbe.c
+++ b/cmd/vbe.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bloblist.h>
#include <bootmeth.h>
#include <bootstd.h>
diff --git a/cmd/version.c b/cmd/version.c
index 53db1a0..d99a44f 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -4,6 +4,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <common.h>
#include <command.h>
#include <display_options.h>
#include <version_string.h>
diff --git a/cmd/video.c b/cmd/video.c
index 91bd6de..942f81c 100644
--- a/cmd/video.c
+++ b/cmd/video.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <video.h>
diff --git a/cmd/virtio.c b/cmd/virtio.c
index a42a563..019e317 100644
--- a/cmd/virtio.c
+++ b/cmd/virtio.c
@@ -4,6 +4,7 @@
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <blk.h>
#include <command.h>
#include <dm.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index e462e78..3209e65 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -4,6 +4,7 @@
* Microchip Technology, Inc.
* Eugen Hristev <eugen.hristev@microchip.com>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <w1.h>
diff --git a/cmd/wdt.c b/cmd/wdt.c
index c7a06cc..b9fdf7a 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -5,6 +5,7 @@
* Copyright (c) 2019 Michael Walle <michael@walle.cc>
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <wdt.h>
diff --git a/cmd/wol.c b/cmd/wol.c
index 45d4ae3..f0d6343 100644
--- a/cmd/wol.c
+++ b/cmd/wol.c
@@ -7,9 +7,9 @@
/*
* Wake-on-LAN support
*/
+#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/cbsysinfo.c b/cmd/x86/cbsysinfo.c
index 7ca2e13..84822a3 100644
--- a/cmd/x86/cbsysinfo.c
+++ b/cmd/x86/cbsysinfo.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <asm/cb_sysinfo.h>
#include <command.h>
#include <console.h>
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 2620ab8..82e4415 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -3,6 +3,7 @@
* Copyright (C) 2014-2015, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <asm/fsp/fsp_support.h>
#include <asm/global_data.h>
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 2dd3080..04d092d 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -3,6 +3,7 @@
* Copyright (C) 2014-2015, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <command.h>
#include <efi.h>
#include <uuid.h>
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index b2afb59..6ad7a12 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -3,9 +3,9 @@
* (C) Copyright 2014 Google, Inc
*/
+#include <common.h>
#include <command.h>
#include <log.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 1467484..0e7eead 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -11,6 +11,7 @@
/*
* Multi Image extract
*/
+#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <env.h>
diff --git a/cmd/xxd.c b/cmd/xxd.c
index 8ae05f9..446ac19 100644
--- a/cmd/xxd.c
+++ b/cmd/xxd.c
@@ -4,6 +4,7 @@
* Roger Knecht <rknecht@pm.de>
*/
+#include <common.h>
#include <command.h>
#include <display_options.h>
#include <fs.h>
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index d0724d9..27fbd1b 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -13,6 +13,7 @@
* ...
*/
+#include <common.h>
#include <config.h>
#include <command.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index 2f83153..6ef1b56 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -8,6 +8,7 @@
* made from existing GRUB Sources by Sun, GNU and others.
*/
+#include <common.h>
#include <part.h>
#include <config.h>
#include <command.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index 2d25542..08afd62 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -4,10 +4,10 @@
* Lei Wen <leiwen@marvell.com>, Marvell Inc.
*/
+#include <common.h>
#include <command.h>
#include <env.h>
#include <gzip.h>
-#include <vsprintf.h>
static int do_zip(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{