diff options
author | Tom Rini <trini@konsulko.com> | 2024-04-27 08:11:00 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-06 15:05:04 -0600 |
commit | a79fc7a79cc9d4f7a46b19a4891484ac1e9ef599 (patch) | |
tree | eb961c176292ac7e2dfbeb8fc374003d1226eb28 /common | |
parent | 301bac6047c85e2c5e39929805ca661bb09a7481 (diff) | |
download | u-boot-a79fc7a79cc9d4f7a46b19a4891484ac1e9ef599.tar.gz |
common: Remove <common.h> and add needed includes
Remove <common.h> from all "commmon/" files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
80 files changed, 31 insertions, 80 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 6f0aeae6bf3..898a57bc92b 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -4,13 +4,14 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> +#include <config.h> #include <autoboot.h> #include <bootretry.h> #include <cli.h> #include <command.h> #include <console.h> #include <env.h> +#include <errno.h> #include <fdtdec.h> #include <hash.h> #include <log.h> diff --git a/common/bloblist.c b/common/bloblist.c index ad06d7a1795..11d6422b695 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY LOGC_BLOBLIST -#include <common.h> #include <bloblist.h> #include <display_options.h> #include <log.h> diff --git a/common/board_f.c b/common/board_f.c index 039d6d712d0..212ffb3090b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -9,7 +9,7 @@ * Marius Groeger <mgroeger@sysgo.de> */ -#include <common.h> +#include <config.h> #include <bloblist.h> #include <bootstage.h> #include <clock_legacy.h> diff --git a/common/board_info.c b/common/board_info.c index f4c385add90..33c260b404e 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <dm.h> #include <init.h> #include <sysinfo.h> diff --git a/common/board_r.c b/common/board_r.c index da0b80f24ff..c823cd262f1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -9,7 +9,7 @@ * Marius Groeger <mgroeger@sysgo.de> */ -#include <common.h> +#include <config.h> #include <api.h> #include <bootstage.h> #include <cpu_func.h> diff --git a/common/bootstage.c b/common/bootstage.c index 0e6d80718fd..fb6befcbc4a 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -11,7 +11,6 @@ #define LOG_CATEGORY LOGC_BOOT -#include <common.h> #include <bootstage.h> #include <hang.h> #include <log.h> diff --git a/common/bouncebuf.c b/common/bouncebuf.c index 934b83f7ec3..b2f87e4d939 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -5,7 +5,6 @@ * Copyright (C) 2012 Marek Vasut <marex@denx.de> */ -#include <common.h> #include <cpu_func.h> #include <log.h> #include <malloc.h> diff --git a/common/cli.c b/common/cli.c index 1c33daf1149..4694a35cd0e 100644 --- a/common/cli.c +++ b/common/cli.c @@ -10,7 +10,6 @@ #define pr_fmt(fmt) "cli: %s: " fmt, __func__ -#include <common.h> #include <ansi.h> #include <bootstage.h> #include <cli.h> diff --git a/common/cli_getch.c b/common/cli_getch.c index 0ee79087774..a5ed6eb6fcf 100644 --- a/common/cli_getch.c +++ b/common/cli_getch.c @@ -6,8 +6,10 @@ * Copyright 2022 Google LLC */ -#include <common.h> #include <cli.h> +#include <stdio.h> +#include <string.h> +#include <linux/errno.h> /** * enum cli_esc_state_t - indicates what to do with an escape character diff --git a/common/cli_hush.c b/common/cli_hush.c index 9cda97f30e3..96a98209b9d 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -75,7 +75,6 @@ #define __U_BOOT__ #ifdef __U_BOOT__ -#include <common.h> /* readline */ #include <env.h> #include <malloc.h> /* malloc, free, realloc*/ #include <linux/ctype.h> /* isalpha, isdigit */ diff --git a/common/cli_readline.c b/common/cli_readline.c index cf4339d0e50..4cb82b40149 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -8,7 +8,6 @@ * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com> */ -#include <common.h> #include <bootretry.h> #include <cli.h> #include <command.h> @@ -16,6 +15,7 @@ #include <malloc.h> #include <time.h> #include <watchdog.h> +#include <linux/errno.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/common/cli_simple.c b/common/cli_simple.c index f89ba92d1b0..266c444334e 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -8,7 +8,6 @@ * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com> */ -#include <common.h> #include <bootretry.h> #include <cli.h> #include <command.h> diff --git a/common/command.c b/common/command.c index af8ffdba8f8..3f691399cbe 100644 --- a/common/command.c +++ b/common/command.c @@ -8,7 +8,7 @@ * Command Processor Table */ -#include <common.h> +#include <config.h> #include <compiler.h> #include <command.h> #include <console.h> @@ -16,6 +16,7 @@ #include <image.h> #include <log.h> #include <mapmem.h> +#include <time.h> #include <asm/global_data.h> #include <linux/ctype.h> diff --git a/common/console.c b/common/console.c index aa3053bc441..63f78004fdb 100644 --- a/common/console.c +++ b/common/console.c @@ -4,7 +4,6 @@ * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it */ -#include <common.h> #include <console.h> #include <debug_uart.h> #include <display_options.h> diff --git a/common/cros_ec.c b/common/cros_ec.c index 249d1f19411..9ccc8fa16cd 100644 --- a/common/cros_ec.c +++ b/common/cros_ec.c @@ -8,7 +8,6 @@ * Software Foundation. */ -#include <common.h> #include <cros_ec.h> #include <dm.h> #include <errno.h> diff --git a/common/ddr_spd.c b/common/ddr_spd.c index 58dc9b3781b..2f6eb99bf0c 100644 --- a/common/ddr_spd.c +++ b/common/ddr_spd.c @@ -3,8 +3,8 @@ * Copyright 2008-2014 Freescale Semiconductor, Inc. */ -#include <common.h> #include <ddr_spd.h> +#include <stdio.h> /* used for ddr1 and ddr2 spd */ static int diff --git a/common/dfu.c b/common/dfu.c index 0d154e8d4c4..1af8194139c 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -10,7 +10,6 @@ * Lukasz Majewski <l.majewski@samsung.com> */ -#include <common.h> #include <command.h> #include <log.h> #include <watchdog.h> diff --git a/common/dlmalloc.c b/common/dlmalloc.c index a0616217d49..9549c59f358 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -12,7 +12,6 @@ #define DEBUG #endif -#include <common.h> #include <log.h> #include <asm/global_data.h> diff --git a/common/edid.c b/common/edid.c index 556c4e3434b..865ba9daa78 100644 --- a/common/edid.c +++ b/common/edid.c @@ -9,7 +9,6 @@ * Copyright (C) Nalin Dahyabhai <bigfun@pobox.com> */ -#include <common.h> #include <edid.h> #include <errno.h> #include <fdtdec.h> diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c index f56eebe679f..3bacb1ae7eb 100644 --- a/common/eeprom/eeprom_field.c +++ b/common/eeprom/eeprom_field.c @@ -6,7 +6,8 @@ * Igor Grinberg <grinberg@compulab.co.il> */ -#include <common.h> +#include <stdio.h> +#include <vsprintf.h> #include <linux/string.h> #include <eeprom_field.h> diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c index 5a9be1da061..1a425c1754d 100644 --- a/common/eeprom/eeprom_layout.c +++ b/common/eeprom/eeprom_layout.c @@ -6,8 +6,8 @@ * Igor Grinberg <grinberg@compulab.co.il> */ -#include <common.h> #include <linux/kernel.h> +#include <linux/string.h> #include <eeprom_layout.h> #include <eeprom_field.h> diff --git a/common/event.c b/common/event.c index 16c2ba6cc92..dda569d4478 100644 --- a/common/event.c +++ b/common/event.c @@ -9,13 +9,13 @@ #define LOG_CATEGORY LOGC_EVENT -#include <common.h> #include <event.h> #include <event_internal.h> #include <log.h> #include <linker_lists.h> #include <malloc.h> #include <asm/global_data.h> +#include <linux/errno.h> #include <linux/list.h> #include <relocate.h> diff --git a/common/exports.c b/common/exports.c index 20d8b759bc2..48b084c3861 100644 --- a/common/exports.c +++ b/common/exports.c @@ -1,4 +1,3 @@ -#include <common.h> #include <command.h> #include <exports.h> #include <malloc.h> diff --git a/common/flash.c b/common/flash.c index 848f44e59df..24ddc8bee72 100644 --- a/common/flash.c +++ b/common/flash.c @@ -6,10 +6,10 @@ /* #define DEBUG */ -#include <common.h> #include <flash.h> #include <log.h> #include <uuid.h> +#include <linux/string.h> #include <mtd/cfi_flash.h> diff --git a/common/hash.c b/common/hash.c index 3d6b84de473..ac63803fed9 100644 --- a/common/hash.c +++ b/common/hash.c @@ -10,7 +10,6 @@ */ #ifndef USE_HOSTCC -#include <common.h> #include <command.h> #include <env.h> #include <log.h> diff --git a/common/hwconfig.c b/common/hwconfig.c index cac0b6348f4..afaa6cb37ab 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -10,7 +10,6 @@ #ifndef HWCONFIG_TEST #include <config.h> -#include <common.h> #include <env.h> #include <exports.h> #include <hwconfig.h> diff --git a/common/init/board_init.c b/common/init/board_init.c index ed2365daa35..a06ec1caa2c 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -6,7 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> +#include <config.h> #include <bootstage.h> #include <init.h> #include <asm/global_data.h> diff --git a/common/init/handoff.c b/common/init/handoff.c index d0be1bb17a2..687513bda35 100644 --- a/common/init/handoff.c +++ b/common/init/handoff.c @@ -5,9 +5,9 @@ * Copyright 2018 Google, Inc */ -#include <common.h> #include <handoff.h> #include <asm/global_data.h> +#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/common/iomux.c b/common/iomux.c index c428f7110a7..1224c15eb71 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -4,7 +4,6 @@ * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. */ -#include <common.h> #include <console.h> #include <serial.h> #include <malloc.h> diff --git a/common/iotrace.c b/common/iotrace.c index 63d0cca3a00..a0a5613bd9b 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -5,7 +5,6 @@ #define IOTRACE_IMPL -#include <common.h> #include <mapmem.h> #include <time.h> #include <asm/global_data.h> diff --git a/common/kallsyms.c b/common/kallsyms.c index 13344e634b9..49b3897078a 100644 --- a/common/kallsyms.c +++ b/common/kallsyms.c @@ -5,7 +5,6 @@ * Licensed under the GPL-2 or later. */ -#include <common.h> /* We need the weak marking as this symbol is provided specially */ extern const char system_map[] __attribute__((weak)); diff --git a/common/kgdb.c b/common/kgdb.c index 29b09fcfe56..01a09f17628 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -87,7 +87,6 @@ * ****************************************************************************/ -#include <common.h> #include <asm/ptrace.h> #include <kgdb.h> diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index 66aed7cea1c..256d88697d7 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -7,7 +7,6 @@ * Licensed under the GPL-2 or later. */ -#include <common.h> #include <cpu_func.h> #include <kgdb.h> #include <serial.h> diff --git a/common/log.c b/common/log.c index 42d35f04b68..dfee250b158 100644 --- a/common/log.c +++ b/common/log.c @@ -6,7 +6,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <display_options.h> #include <log.h> #include <malloc.h> diff --git a/common/log_console.c b/common/log_console.c index bb091ce21a4..c27101b8fe2 100644 --- a/common/log_console.c +++ b/common/log_console.c @@ -6,7 +6,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <log.h> #include <asm/global_data.h> diff --git a/common/log_syslog.c b/common/log_syslog.c index 53c4def5d1c..d01bb749c22 100644 --- a/common/log_syslog.c +++ b/common/log_syslog.c @@ -5,7 +5,6 @@ * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk@gmx.de> */ -#include <common.h> #include <log.h> #include <net.h> #include <asm/global_data.h> diff --git a/common/main.c b/common/main.c index 82d3aafa53c..b0b6e74f5d3 100644 --- a/common/main.c +++ b/common/main.c @@ -6,7 +6,6 @@ /* #define DEBUG */ -#include <common.h> #include <autoboot.h> #include <button.h> #include <bootstage.h> diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 0a004d40e1e..4e6d7952b3c 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -7,7 +7,6 @@ #define LOG_CATEGORY LOGC_ALLOC -#include <common.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/common/memsize.c b/common/memsize.c index d646df8b04c..86109579c95 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> +#include <config.h> #include <init.h> #include <asm/global_data.h> #include <cpu_func.h> diff --git a/common/menu.c b/common/menu.c index b55cf7b9996..e48424995b6 100644 --- a/common/menu.c +++ b/common/menu.c @@ -5,7 +5,6 @@ */ #include <ansi.h> -#include <common.h> #include <cli.h> #include <malloc.h> #include <errno.h> diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 194c84e7e89..9b8744e5d8b 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -9,7 +9,6 @@ * channel. */ -#include <common.h> #include <dm.h> #include <log.h> #include <miiphy.h> diff --git a/common/s_record.c b/common/s_record.c index 2b7651fcffc..486dd93abd4 100644 --- a/common/s_record.c +++ b/common/s_record.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> #include <s_record.h> static int hex1_bin (char c); diff --git a/common/scp03.c b/common/scp03.c index 09ef7b5ba3d..54b1bd54b60 100644 --- a/common/scp03.c +++ b/common/scp03.c @@ -4,10 +4,11 @@ * */ -#include <common.h> #include <scp03.h> #include <tee.h> #include <tee/optee_ta_scp03.h> +#include <linux/errno.h> +#include <linux/string.h> static int scp03_enable(bool provision) { diff --git a/common/spl/spl.c b/common/spl/spl.c index e06bc75d36b..4e92771ecaa 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -6,7 +6,7 @@ * Aneesh V <aneesh@ti.com> */ -#include <common.h> +#include <config.h> #include <bloblist.h> #include <binman_sym.h> #include <bootstage.h> diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 3bdd013a35f..0b1c981a105 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -9,7 +9,6 @@ * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH */ -#include <common.h> #include <atf_common.h> #include <cpu_func.h> #include <errno.h> diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index 04eac6f306b..bc551c5c074 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -5,7 +5,6 @@ * */ -#include <common.h> #include <spl.h> #include <spl_load.h> #include <image.h> diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 0eefd39a519..e172a2d7b83 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH */ -#include <common.h> #include <spl.h> __weak int board_return_to_bootrom(struct spl_image_info *spl_image, diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index 8a779da8fa1..e9f381c392c 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -5,7 +5,6 @@ * * Ravi B <ravibabu@ti.com> */ -#include <common.h> #include <env.h> #include <spl.h> #include <linux/compiler.h> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2be6f04b02c..2399e1d806d 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <env.h> #include <part.h> #include <spl.h> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index a52f9e178e6..2e320ba7c01 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -8,7 +8,6 @@ * FAT Image Functions copied from spl_mmc.c */ -#include <common.h> #include <env.h> #include <log.h> #include <spl.h> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index e5195d460c4..988125be008 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -4,7 +4,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <errno.h> #include <fpga.h> #include <gzip.h> diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c index b4ea9241d68..2c31777fcd3 100644 --- a/common/spl/spl_imx_container.c +++ b/common/spl/spl_imx_container.c @@ -4,7 +4,6 @@ */ #define LOG_CATEGORY LOGC_ARCH -#include <common.h> #include <stdlib.h> #include <errno.h> #include <imx_container.h> diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 08687ca8f6c..a77893455f2 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <image.h> #include <log.h> #include <malloc.h> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 3d032bb27ce..f4481b90463 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -5,7 +5,6 @@ * * Aneesh V <aneesh@ti.com> */ -#include <common.h> #include <dm.h> #include <log.h> #include <part.h> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 3b0a1524238..5631fa6d563 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> */ -#include <common.h> #include <config.h> #include <fdt_support.h> #include <image.h> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 898f9df705a..be7278bb933 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -6,7 +6,6 @@ * (C) Copyright 2012 * Ilya Yanok <ilya.yanok@gmail.com> */ -#include <common.h> #include <env.h> #include <errno.h> #include <image.h> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 70745114efe..ed76b5e1293 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Stefan Roese <sr@denx.de> */ -#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c index c8774d67ecf..0e15a3c7545 100644 --- a/common/spl/spl_nvme.c +++ b/common/spl/spl_nvme.c @@ -5,7 +5,6 @@ * */ -#include <common.h> #include <spl.h> #include <nvme.h> diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index 53a8c6de89e..f6f65286c21 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -7,7 +7,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> */ -#include <common.h> #include <config.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index ec62aab929b..5a26d7c31a4 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -5,7 +5,6 @@ * * Based on common/spl/spl_atf.c */ -#include <common.h> #include <cpu_func.h> #include <errno.h> #include <hang.h> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 8aeda237be1..5a23841f698 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -9,7 +9,6 @@ * Michal Simek <michal.simek@amd.com> * Stefan Agner <stefan.agner@toradex.com> */ -#include <common.h> #include <binman_sym.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 32746ce9f3c..18acc40e46f 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -8,7 +8,6 @@ * Derived work from spl_usb.c */ -#include <common.h> #include <spl.h> #include <asm/u-boot.h> #include <sata.h> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 9143c27bbf1..9ca80bd534f 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -4,7 +4,6 @@ * Author: Stefan Agner <stefan.agner@toradex.com> */ -#include <common.h> #include <log.h> #include <spl.h> #include <usb.h> diff --git a/common/spl/spl_semihosting.c b/common/spl/spl_semihosting.c index 941fa911040..2047248f39b 100644 --- a/common/spl/spl_semihosting.c +++ b/common/spl/spl_semihosting.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 Sean Anderson <sean.anderson@seco.com> */ -#include <common.h> #include <image.h> #include <log.h> #include <semihosting.h> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 89de73c726c..8ab4803f7c4 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -8,7 +8,7 @@ * Heiko Schocher, DENX Software Engineering, hs@denx.de. */ -#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index d7ab9efd110..a8d3f43b452 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -4,7 +4,6 @@ * Ladislav Michl <ladis@linux-mips.org> */ -#include <common.h> #include <config.h> #include <image.h> #include <nand.h> diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 479e2dc1826..31fc4b57d48 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -8,7 +8,6 @@ * Derived work from spl_mmc.c */ -#include <common.h> #include <log.h> #include <spl.h> #include <asm/u-boot.h> diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 959915ffa61..1465c3e46b9 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -4,7 +4,7 @@ * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. */ -#include <common.h> +#include <config.h> #include <image.h> #include <log.h> #include <spl.h> diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 1faaa2c938d..fd48f80f75e 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -8,7 +8,6 @@ * * Matt Porter <mporter@ti.com> */ -#include <common.h> #include <gzip.h> #include <image.h> #include <log.h> diff --git a/common/splash.c b/common/splash.c index 6820db683bd..c5591293634 100644 --- a/common/splash.c +++ b/common/splash.c @@ -20,11 +20,12 @@ * */ -#include <common.h> #include <display_options.h> #include <env.h> #include <splash.h> #include <video.h> +#include <vsprintf.h> +#include <linux/kernel.h> static struct splash_location default_splash_locations[] = { { diff --git a/common/splash_source.c b/common/splash_source.c index 2ce0768833d..5b271160449 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -5,7 +5,6 @@ * Authors: Igor Grinberg <grinberg@compulab.co.il> */ -#include <common.h> #include <bmp_layout.h> #include <command.h> #include <env.h> diff --git a/common/stackprot.c b/common/stackprot.c index 6495951a773..4e3297b7d00 100644 --- a/common/stackprot.c +++ b/common/stackprot.c @@ -3,7 +3,6 @@ * Copyright 2021 Broadcom */ -#include <common.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/common/stdio.c b/common/stdio.c index e3354f092dc..a61220ce4b9 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -9,7 +9,6 @@ */ #include <config.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/common/update.c b/common/update.c index ec302ca68fb..eb0b60a2ce4 100644 --- a/common/update.c +++ b/common/update.c @@ -6,7 +6,6 @@ * Bartlomiej Sieka <tur@semihalf.com> */ -#include <common.h> #include <cpu_func.h> #include <image.h> #include <linux/printk.h> diff --git a/common/usb.c b/common/usb.c index 99e6b857c74..84b10f5c7d8 100644 --- a/common/usb.c +++ b/common/usb.c @@ -25,7 +25,6 @@ * * For each transfer (except "Interrupt") we wait for completion. */ -#include <common.h> #include <command.h> #include <dm.h> #include <dm/device_compat.h> diff --git a/common/usb_hub.c b/common/usb_hub.c index 2e054eb9353..807f490bb60 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -21,7 +21,6 @@ * Probes device for being a hub and configurate it */ -#include <common.h> #include <command.h> #include <dm.h> #include <env.h> @@ -29,6 +28,7 @@ #include <log.h> #include <malloc.h> #include <memalign.h> +#include <time.h> #include <asm/processor.h> #include <asm/unaligned.h> #include <linux/ctype.h> diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 820f591fc5b..f3b4a3c94e6 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -6,7 +6,6 @@ * Part of this source has been derived from the Linux USB * project. */ -#include <common.h> #include <console.h> #include <dm.h> #include <env.h> @@ -15,6 +14,7 @@ #include <malloc.h> #include <memalign.h> #include <stdio_dev.h> +#include <time.h> #include <watchdog.h> #include <asm/byteorder.h> #ifdef CONFIG_SANDBOX diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 89e18a2ddad..68a04ac0412 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -7,7 +7,6 @@ * Mostly inspired by Linux kernel v6.1 onboard_usb_hub driver */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <power/regulator.h> diff --git a/common/usb_storage.c b/common/usb_storage.c index 774d5bdf54b..a79ed2e23a4 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -32,7 +32,6 @@ */ -#include <common.h> #include <blk.h> #include <bootdev.h> #include <command.h> diff --git a/common/xyzModem.c b/common/xyzModem.c index fb319f71190..9feb240de28 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -21,12 +21,13 @@ * *========================================================================== */ -#include <common.h> #include <xyzModem.h> #include <stdarg.h> +#include <time.h> #include <u-boot/crc.h> #include <watchdog.h> #include <env.h> +#include <vsprintf.h> /* Assumption - run xyzModem protocol over the console port */ |