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>

diff --git a/common/autoboot.c b/common/autoboot.c
index 6f0aeae6bf331afeb7ca0c365e3da078a653092b..898a57bc92bda200840ba480d28cd85eb13a48d8 100644 (file)
--- 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 ad06d7a1795deb9b1799abfd9348fcfa4706f776..11d6422b695a7544dc48749c38cfbcf852cffa3e 100644 (file)
--- 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 039d6d712d05251d8a1d9133b6d3cda92e04ac8d..212ffb3090b202dff40273abe76a892a40cb49da 100644 (file)
--- 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 f4c385add90c7b92299b6ffe2b1cf321f0f98cae..33c260b404e896c5e1ba86f4259f092dc808dafb 100644 (file)
--- 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 da0b80f24ff07b6ae767704df2a64505edc457a8..c823cd262f16e0d7b038bea3b1f120beb2a1d56e 100644 (file)
--- 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 0e6d80718fd59b92051fd8b47d9a4a6d74ed1be0..fb6befcbc4a87306eb65aecb4701997d760b3686 100644 (file)
--- 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 934b83f7ec3fd2147f2a49386b09e0e642a74aa8..b2f87e4d939b307b3a0909983f2a7f2a355f81ee 100644 (file)
--- 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 1c33daf1149a85792f0cd6ceaf35de65140c0112..4694a35cd0e0c926b38c7d5ec17eb46048aaf726 100644 (file)
--- 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 0ee790877748125007bc77ea14e363bb15d2cb98..a5ed6eb6fcfa7841b4f54d5125c4e60b804e325e 100644 (file)
--- 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 9cda97f30e3c7fb241bf74b12b49f54f4565e0fc..96a98209b9d292b57d6339b89b523af7d8c064e9 100644 (file)
--- 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 cf4339d0e509e95d3b78c9d88ebf013c0ba0defc..4cb82b40149a9888fb881d0fb8b5bae39cc3dec7 100644 (file)
--- 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 f89ba92d1b05c50bfa01a52498de5b7a5558e1c9..266c444334ebfb23e8ce180986a7af8a7594fa94 100644 (file)
--- 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 af8ffdba8f8ce1a5cfa9c50bac58a6840e73b8d3..3f691399cbee5aea2afc407d609ebc1a3175f31a 100644 (file)
--- 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 aa3053bc441405d177adaaf456a8265054ed038e..63f78004fdbc95f9453f42ca1cf063747e0c1ab8 100644 (file)
--- 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 249d1f19411ef56305da9cd65777a51d24f1a623..9ccc8fa16cdb616c49e673fab812b6fdc7711964 100644 (file)
--- 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 58dc9b3781b7ca93eb2e5d51908a440dfc01c817..2f6eb99bf0cfbf4259b1c34b0e662ee024a48fb0 100644 (file)
--- 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 0d154e8d4c482a0f48dcf311cbef17eacfade4b8..1af8194139c336389d9a331e8873022d13ef1ab4 100644 (file)
--- 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 a0616217d4953599b953a6571935f257e66b6d17..9549c59f3585f44bbdb0f57dceae522b03881f7b 100644 (file)
--- 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 556c4e3434b609711ae7f5e6e83f2fcd54b57633..865ba9daa78a8681ea685d1eb73f0d1fc13ce82b 100644 (file)
--- 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 f56eebe679f78c94b1e0e36809ed858242c3d017..3bacb1ae7eb79a20d94714ffdc20348c46de0356 100644 (file)
--- 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 5a9be1da061fe72c378a5692081fc1950fc4dd52..1a425c1754d4ab881ecca97b722d247f10ca77c8 100644 (file)
--- 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 16c2ba6cc92112907cb97b97331bac2a8c8a9ac2..dda569d447851f559a83f98fb7b1f3543156eab5 100644 (file)
--- 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 20d8b759bc25da2c583f360ce1fa8af973bda3c6..48b084c3861377b5cdd9ed5232863e45f078f6eb 100644 (file)
--- 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 848f44e59dfdb349dec436e1f1176b5303633814..24ddc8bee72423bd1a6e3c5d3062757fec22aa54 100644 (file)
--- 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 3d6b84de4738223ebb83048dd394b422f7157b94..ac63803fed95b553a015f2fd65dd0c7c644e2cb4 100644 (file)
--- 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 cac0b6348f469aa1bb0fdd13ca1a38dfe5c596bd..afaa6cb37ab4252a3ebf9bddf9f50d08b46802d6 100644 (file)
--- 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 ed2365daa35e3acb49c21b9f85dc6be48a90b588..a06ec1caa2ca55d5f83742a981cb49c7a24ee122 100644 (file)
--- 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 d0be1bb17a2cfe5800fc9ae920287b3593fbcd2b..687513bda353fc55bba6adef877c93101662ce06 100644 (file)
--- 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 c428f7110a7a790d5d8c95a05a604c721fdba7a0..1224c15eb718b5e78f625f57274000114d85c7de 100644 (file)
--- 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 63d0cca3a00434b22616da06d80c6946211acb27..a0a5613bd9b345e1fd5f192865fd01b3f4b7c733 100644 (file)
--- 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 13344e634b9910d5a6267492496db16e2dae0bb2..49b3897078ae9490295784b1cf625fc847e9722c 100644 (file)
--- 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 29b09fcfe56b3cf4d6a69b54dbdc9dd0af648be2..01a09f1762869b95abfdc992ae5c38d3e91e823e 100644 (file)
--- 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 66aed7cea1c7e268afcbb7274e1c71fa5208c0e8..256d88697d7e5b2d879b94841624f5071e4b0b72 100644 (file)
--- 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 42d35f04b689b26d21723d5c7c9bb518366dd9a4..dfee250b158a77f6284de849953702ba8b5cf537 100644 (file)
--- 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 bb091ce21a4a616e763406b4f4c8e1a61acd0932..c27101b8fe2237e0e2ef09b58a238fd8792a8c67 100644 (file)
--- 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 53c4def5d1c0f140780061d4f386342801602f16..d01bb749c22d88c676902b0d0c4437975e114524 100644 (file)
--- 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 82d3aafa53c916229a206e84d053b44d53963257..b0b6e74f5d3d385df0be498240d9001dfa2c5136 100644 (file)
--- 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 0a004d40e1ec80ae9e7b5d61c4f8d831462083d8..4e6d7952b3ca9711113a5c9f5d14c1bf97aa1e8c 100644 (file)
--- 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 d646df8b04cb6f5d2e26c84e6d6b34d84ad14f66..86109579c95402f2e2230971973700c87c2d1d94 100644 (file)
--- 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 b55cf7b9996795d95283ef493ee708cd2c52965f..e48424995b649561b9d346299dea3c9e97f3342f 100644 (file)
--- 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 194c84e7e89d1c2515e6dec34ca55283ec9801fe..9b8744e5d8bfd96eb139d48cac6f91822a5d3b15 100644 (file)
--- 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 2b7651fcffca011c4f272baf8319dae75c22f99e..486dd93abd41f9b33cb5de625b7bcf5d2dbe5f71 100644 (file)
--- 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 09ef7b5ba3dcbe9620fb049ad43cdff66e5a6dfd..54b1bd54b6044f8384c7be92f16d99e065fbef4a 100644 (file)
--- 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 e06bc75d36b29921d55f5e6bc6e22dc4ee9e1b70..4e92771ecaae7dd50754c523f11ab32a71b0312a 100644 (file)
--- 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 3bdd013a35fe138e43cf4d2bf8bfd27f6ceb0c87..0b1c981a105d207196a85d3ce3c1c1c3ce3e3a2f 100644 (file)
--- 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 04eac6f306bdda08113d04cd220473c61149094e..bc551c5c074cffc9f7bafddbea9da3b1cc07ad13 100644 (file)
--- 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 0eefd39a51985247727bbcd579fb24c557a6c03a..e172a2d7b83c0811a2abe558380fc25a32208e2f 100644 (file)
--- 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 8a779da8fa1e08220c98ee5a417237ba5dfbb69a..e9f381c392cd785c5675e7563d4b250c44c5e088 100644 (file)
--- 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 2be6f04b02c5e6b2573a5556483dfc8dc094d657..2399e1d806d4eb625aa59540d35f8e19008f8551 100644 (file)
--- 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 a52f9e178e664813f0109305ab6e2bfa1ccf7631..2e320ba7c01878fd2a1e935672714562c9d23eaa 100644 (file)
--- 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 e5195d460c490960ab35428dda64e112b0048a0e..988125be008d56d68fd1ac7da5c1d36ca07db406 100644 (file)
--- 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 b4ea9241d68595c7e852c7eb0fbb49c9e251ee44..2c31777fcd3af2bc5c738f492a465df280197933 100644 (file)
--- 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 08687ca8f6c49b9e9a03d9da4d9eaa01c74c4d9c..a77893455f256d5b485f692b9150f4cef1e18aaf 100644 (file)
--- 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 3d032bb27ce3ff89dff674498eaa48098cf6d9cf..f4481b90463a9a65f8ec9a498251fa73663d9c35 100644 (file)
--- 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 3b0a15242389e43d303d1338f9491e4c30dac3a4..5631fa6d5635044b33e2a4748d4bbeb5ed4c42fd 100644 (file)
--- 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 898f9df705a29996da45c7575695dc49be137284..be7278bb93344d756135fdf6f38919bb557fa9ae 100644 (file)
--- 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 70745114efedf438f422db688297d34388641fce..ed76b5e1293b574b9598c401317c9a56a317843e 100644 (file)
--- 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 c8774d67ecf132ae7bf81c9d5cacea47995a5be4..0e15a3c7545a3d7104de8ddb6a03abb72068fcf1 100644 (file)
--- 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 53a8c6de89eb0f90bf26e7d0152b667e10e78c03..f6f65286c21670c887b4aa27e69b1da7efe6d8dc 100644 (file)
--- 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 ec62aab929b9ccd7c9041785f98226e0dbf9fbf1..5a26d7c31a43b24baf27cb7701973851bb61d77b 100644 (file)
--- 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 8aeda237be13cc46fb970d0ddc0993327956d543..5a23841f6981589344499bfdbd98611904379f31 100644 (file)
--- 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 32746ce9f3cf70de6ad201a146ff93d3c97ce704..18acc40e46fcfc206bfafd91b1b479d45123878d 100644 (file)
--- 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 9143c27bbf1d9028fcee587de8272fe9cb4a06cb..9ca80bd534f8ba5bad46d6df5e5c1664af6b6a33 100644 (file)
--- 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 941fa911040ea31b6439a8564149e3e7c04131b2..2047248f39b0a3f608f7b33329f186508ea62c1e 100644 (file)
--- 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 89de73c726cd294db3922bf1173b0ab677306e2b..8ab4803f7c4bf5f1a34535d3e5409fc52d6c8668 100644 (file)
--- 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 d7ab9efd1108c08c42e65f85635c186c6041d489..a8d3f43b452849d2e75fad6ae69317b17624a0c8 100644 (file)
--- 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 479e2dc1826ecab55946c92293be5ed41dfc246b..31fc4b57d486bbc63e0b6c175d0c473ad03cdfdf 100644 (file)
--- 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 959915ffa6100e2f52336e104e8dedd8c16537ad..1465c3e46b921652626f5aee8d37b063035e380d 100644 (file)
--- 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 1faaa2c938d4ba637a25af552e320a2e3e857f25..fd48f80f75e3977b7d14a917b2d125278a50e78c 100644 (file)
--- 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 6820db683bd6cabbd68d45a499390717801c60b0..c5591293634a171be87c2a4ce57741df22e471bb 100644 (file)
--- 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 2ce0768833d9d1f4058fa005728aa21b5b283c58..5b27116044954fb3b7de7184ceb3bca966aae4c1 100644 (file)
--- 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 6495951a773c5bf71c7d06576034024049692911..4e3297b7d0069860fcad53b1357c886d47934697 100644 (file)
--- 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 e3354f092dc9f0dc07247e8a87bfa54f426b4e26..a61220ce4b9c606419534cf2178109fbbc138f20 100644 (file)
--- 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 ec302ca68fb0925a590eb1e94f3db67507cb500d..eb0b60a2ce4897053ee2dadfe0e9102587fb2c6d 100644 (file)
--- 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 99e6b857c74ce281431995f2fd41a4328ed9e6b4..84b10f5c7d8c2b5993827e2aa8c84482684b4a0d 100644 (file)
--- 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 2e054eb93537a2e62e9bcc1ec53ac193895d5ba2..807f490bb6094788321f2f9e9f472ecd8eb06501 100644 (file)
--- 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 820f591fc5bb5d408be2fdba8868e51cb8d85c8b..f3b4a3c94e6de4f84cc9ee7cf7d95d131e82d94b 100644 (file)
--- 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 89e18a2ddad66c48b6d5e24fda05d9bcf8c2a284..68a04ac0412b3d1ebe42d795f71fcdad637c5eab 100644 (file)
--- 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 774d5bdf54b4be7d56bfe12b5aaf86cc2d5bf248..a79ed2e23a441d6df3759349b040ee20a9212a90 100644 (file)
--- 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 fb319f71190735a9fd07dad187deaeb1dca70a71..9feb240de28143d3caa516febbd7a1c3289ebd84 100644 (file)
--- 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 */
 

diff --git a/include/atf_common.h b/include/atf_common.h
index d69892fac6cbc142c4830a45c55e69ff5a5ff2be..5ae4509025232ffda704ab05161df80c18b3843a 100644 (file)
--- a/include/atf_common.h
+++ b/include/atf_common.h
@@ -74,6 +74,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 /*******************************************************************************
  * Structure used for telling the next BL how much of a particular type of
  * memory is available for its use and how much is already used.

diff --git a/include/autoboot.h b/include/autoboot.h
index eb204995d079b7b893df1bb21f880426bbb5eb6b..c68bd79f8dca9e9b890358e578f5c2131ed324df 100644 (file)
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -12,6 +12,7 @@
 #define __AUTOBOOT_H
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #ifdef CONFIG_SANDBOX
 

diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index a5c9498dc9fba6b3e167321b77f50c8b60009e72..eabbd25a3309c3da67277bce70770b64358b4460 100644 (file)
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -10,6 +10,8 @@
 #ifndef _BMP_H_
 #define _BMP_H_
 
+#include <linux/compiler.h>
+
 struct __packed bmp_color_table_entry {
        __u8    blue;
        __u8    green;

diff --git a/include/ddr_spd.h b/include/ddr_spd.h
index fe163da43e562b06c19d5ba13a30faf96e0b9423..c4d199fd7e14c86b8c66350299821f9b42b5c89a 100644 (file)
--- a/include/ddr_spd.h
+++ b/include/ddr_spd.h
@@ -6,6 +6,8 @@
 #ifndef _DDR_SPD_H_
 #define _DDR_SPD_H_
 
+#include <linux/types.h>
+
 /*
  * Format from "JEDEC Standard No. 21-C,
  * Appendix D: Rev 1.0: SPD's for DDR SDRAM

diff --git a/include/flash.h b/include/flash.h
index 3710a2731b760b2500eba76b4b69ef271b451825..0f7369774117c0cdf28635ac2aa96b5cf871d0f3 100644 (file)
--- a/include/flash.h
+++ b/include/flash.h
@@ -7,6 +7,8 @@
 #ifndef _FLASH_H_
 #define _FLASH_H_
 
+#include <linux/types.h>
+
 /*-----------------------------------------------------------------------
  * FLASH Info: contains chip specific data, per FLASH bank
  */

diff --git a/include/gzip.h b/include/gzip.h
index e578b283edcd56f81217a4e029ae8823cf6f7f8f..5e0d0ec07fbccb7a14862efea44495e57619a7d0 100644 (file)
--- a/include/gzip.h
+++ b/include/gzip.h
@@ -7,6 +7,8 @@
 #ifndef __GZIP_H
 #define __GZIP_H
 
+#include <linux/types.h>
+
 struct blk_desc;
 
 /**

diff --git a/include/handoff.h b/include/handoff.h
index 0104b834f2c4cfbceb445d01bf90508bdf182b8a..c0ae7b19a75949ebfec5109131486d7bd1ef7041 100644 (file)
--- a/include/handoff.h
+++ b/include/handoff.h
@@ -10,6 +10,7 @@
 
 #if CONFIG_IS_ENABLED(HANDOFF)
 
+#include <linux/types.h>
 #include <asm/handoff.h>
 
 /**

diff --git a/include/nand.h b/include/nand.h
index 220ffa202ef93436dfa3cd9d1b1ba72f70be5841..cdba7384ad1439a08df0cb9fb39835f03a78bcae 100644 (file)
--- a/include/nand.h
+++ b/include/nand.h
@@ -8,8 +8,6 @@
 #ifndef _NAND_H_
 #define _NAND_H_
 
-#include <config.h>
-
 extern void nand_init(void);
 void nand_reinit(void);
 unsigned long nand_size(void);

diff --git a/include/s_record.h b/include/s_record.h
index 3ece695941d3f68e837d8579599b73b656562013..aab09d9c3c81deabb7c186b4bc41572badb81f6f 100644 (file)
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -4,6 +4,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
+#include <linux/types.h>
+
 /*--------------------------------------------------------------------------
  *
  * Motorola S-Record Format: