boot: Remove <common.h> and add needed includes

Remove <common.h> from all "boot/" files and when needed add
missing include files directly.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/android_ab.c b/boot/android_ab.c
index 1e5aa81b75033564b68d51f18a02e80b56c9067c..143f373aae96f9ea5bac04c660148a0fb413ce10 100644 (file)
--- a/boot/android_ab.c
+++ b/boot/android_ab.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2017 The Android Open Source Project
  */
-#include <common.h>
 #include <android_ab.h>
 #include <android_bootloader_message.h>
 #include <blk.h>

diff --git a/boot/boot_fit.c b/boot/boot_fit.c
index 9d3941265636196e5321f38521291b373ba475fa..4dcaf95c6ae3059ec625a4369e5c629aa42ce746 100644 (file)
--- a/boot/boot_fit.c
+++ b/boot/boot_fit.c
@@ -7,7 +7,6 @@
  */
 
 #include <boot_fit.h>
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 46815ea2fdbfc4964a39932a7b9032916af8d333..7c7bba088c999f96862b6bb76616e9d0c3e6b13a 100644 (file)
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <dm.h>
 #include <bootdev.h>
 #include <bootflow.h>

diff --git a/boot/bootflow.c b/boot/bootflow.c
index 68bf99329ab0df7b579dad37cce9d34aeb80b642..9aa3179c388153cbe2ca567238a69122caa6d90e 100644 (file)
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
index 16f9cd8f8ca572c590e555ce7abb657af6530831..143ef8413326e079bebe0649433ed0178bc08dad 100644 (file)
--- a/boot/bootflow_menu.c
+++ b/boot/bootflow_menu.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootflow.h>
 #include <bootstd.h>
 #include <cli.h>

diff --git a/boot/bootm.c b/boot/bootm.c
index 032f5a4a160540a1e265886c121660fd08b4d0cb..6fa8edab021e9bf8f7b121b4d1b4ee2278e4f443 100644 (file)
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -5,7 +5,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <cli.h>

diff --git a/boot/bootm_os.c b/boot/bootm_os.c
index ccde72d22c17f29131a1d3a5a171657564a0252e..15297ddb530b48e1e923b81e46ed69f7df03cb58 100644 (file)
--- a/boot/bootm_os.c
+++ b/boot/bootm_os.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <cpu_func.h>

diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c
index 1d157d54dbdd301cc4b08cf5650cf7379114133c..c0abadef97cae87d2df27dd30daa8c0d10ca2ba1 100644 (file)
--- a/boot/bootmeth-uclass.c
+++ b/boot/bootmeth-uclass.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c
index f015f2e1c75faad5862ef875b54b0d869aa21feb..645b8bed10202a9171dd5bbeb8d8037524c76924 100644 (file)
--- a/boot/bootmeth_cros.c
+++ b/boot/bootmeth_cros.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootdev.h>
 #include <bootflow.h>

diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index aebc5207fc01b043b2379da8c574b79cc4e690b2..c7035c0d0c4e2fed5a0eeae63fdf8ffd40e54905 100644 (file)
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c
index b7d429f2c3dae608c4f9fabba11394e7de579bfe..23ae1e610ac77b6fb354e5d63af156868cc07de7 100644 (file)
--- a/boot/bootmeth_efi_mgr.c
+++ b/boot/bootmeth_efi_mgr.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c
index ae0ad1d53e3fbc03a115bca8b7a12f97c96e60b5..9b55686948f7cbabe029affdcc0ed72d276a8efe 100644 (file)
--- a/boot/bootmeth_extlinux.c
+++ b/boot/bootmeth_extlinux.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c
index 70f693aa239b13889199267a1d7ba10d8199d783..03d2589c264f20f0f2274436af52691b028e0b6f 100644 (file)
--- a/boot/bootmeth_pxe.c
+++ b/boot/bootmeth_pxe.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_qfw.c b/boot/bootmeth_qfw.c
index 8ebbc3ebcd580355ad53d09f76bf07c17189461d..dfaa944594e3856a9a0996fe5e4abddf1d219b0f 100644 (file)
--- a/boot/bootmeth_qfw.c
+++ b/boot/bootmeth_qfw.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <command.h>
 #include <bootdev.h>
 #include <bootflow.h>

diff --git a/boot/bootmeth_sandbox.c b/boot/bootmeth_sandbox.c
index aabc57e635a88bc9e41a572330392af80acf4326..0bc8f688e30be6990f6e24b3f44909911215291c 100644 (file)
--- a/boot/bootmeth_sandbox.c
+++ b/boot/bootmeth_sandbox.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c
index 06340e43d2d7abc072a5fcc1194fdbe1e71809fc..0e05d28d4d9b81feb2c152a0230be8d557c43e13 100644 (file)
--- a/boot/bootmeth_script.c
+++ b/boot/bootmeth_script.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/bootretry.c b/boot/bootretry.c
index 8d850df9d4875c41cadabdeb4df9c6fde3fed99a..587b2de7d6b08db07e1dea512a834cb5590c2d12 100644 (file)
--- a/boot/bootretry.c
+++ b/boot/bootretry.c
@@ -4,12 +4,13 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <env.h>
 #include <errno.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 
 static uint64_t endtime;  /* must be set, default is instant timeout */

diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c
index 81555d341e32b11d09b7c8bc50af6f8c31abb48c..5de8efce19a5482bc25b27db525baf7c270f266e 100644 (file)
--- a/boot/bootstd-uclass.c
+++ b/boot/bootstd-uclass.c
@@ -6,7 +6,6 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
-#include <common.h>
 #include <bootflow.h>
 #include <bootstd.h>
 #include <dm.h>

diff --git a/boot/cedit.c b/boot/cedit.c
index 8c654dba6dc35c900bbad0479ae96ea253f9f1e0..c29a2be14ce2e531cb6e9dc7d8cd8a1dcf953284 100644 (file)
--- a/boot/cedit.c
+++ b/boot/cedit.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_EXPO
 
-#include <common.h>
 #include <abuf.h>
 #include <cedit.h>
 #include <cli.h>

diff --git a/boot/common_fit.c b/boot/common_fit.c
index cde2dc45e9076e740d18dcbc42caf4f29ee5968c..a2f9b8d83c3b66a39ae0e172445d162f5146578a 100644 (file)
--- a/boot/common_fit.c
+++ b/boot/common_fit.c
@@ -4,7 +4,6 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>

diff --git a/boot/expo.c b/boot/expo.c
index cadb6a0ad6e3b2424930ecadbbc7001f49729608..ed01483f1d3ac640791ee5aac7fff2d5f35c92aa 100644 (file)
--- a/boot/expo.c
+++ b/boot/expo.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY   LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>

diff --git a/boot/expo_build.c b/boot/expo_build.c
index 04d88a2c30815695b1acfafe8d569d860fdfd0dd..a4df798adebd474a48281fa10bf74716aec59a9c 100644 (file)
--- a/boot/expo_build.c
+++ b/boot/expo_build.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY   LOGC_EXPO
 
-#include <common.h>
 #include <expo.h>
 #include <fdtdec.h>
 #include <log.h>

diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c
index 837920bd3a33fe939426d614fa7cbecd4fb2c009..53415548459ad2d7eee87954b8e3f7c44f2fe6ee 100644 (file)
--- a/boot/fdt_simplefb.c
+++ b/boot/fdt_simplefb.c
@@ -6,7 +6,6 @@
  * Stephen Warren <swarren@wwwdotorg.org>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>

diff --git a/boot/fdt_support.c b/boot/fdt_support.c
index 2bd80a9dfb18e5d0fcb5605d9e1bce0ff53fdbb6..874ca4d6f5afe7fb2bc0da6102d7ac0f535eb763 100644 (file)
--- a/boot/fdt_support.c
+++ b/boot/fdt_support.c
@@ -6,7 +6,6 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <env.h>
 #include <log.h>

diff --git a/boot/image-android-dt.c b/boot/image-android-dt.c
index fb014190d44519977bd0b3d5d873e27b5b76e1ff..3b25018c2e774e4db72fc2a88fff0af29044bfd8 100644 (file)
--- a/boot/image-android-dt.c
+++ b/boot/image-android-dt.c
@@ -6,7 +6,6 @@
 
 #include <image-android-dt.h>
 #include <dt_table.h>
-#include <common.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 

diff --git a/boot/image-android.c b/boot/image-android.c
index 88e40bc7ec6c8a69c0b10885ea0bc5ebd31cf9a0..ddd8ffd5e5408a7a517918753656a887cc233dd6 100644 (file)
--- a/boot/image-android.c
+++ b/boot/image-android.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2011 Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  */
 
-#include <common.h>
 #include <env.h>
 #include <image.h>
 #include <image-android-dt.h>

diff --git a/boot/image-board.c b/boot/image-board.c
index 09b6e4e0bdca7244c586398df01ebd322c6bf79e..b7884b8c5dc73e0d5d5be50fcc6ebd24d62041fe 100644 (file)
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -8,7 +8,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
+#include <config.h>
 #include <bootstage.h>
 #include <cpu_func.h>
 #include <display_options.h>

diff --git a/boot/image-cipher.c b/boot/image-cipher.c
index b9061489396c3d6d34890a64d600c6738bef1f14..9d389f26cea55b5ff212c815a8b35417c447311d 100644 (file)
--- a/boot/image-cipher.c
+++ b/boot/image-cipher.c
@@ -7,7 +7,6 @@
 #include "mkimage.h"
 #include <time.h>
 #else
-#include <common.h>
 #include <malloc.h>
 #include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index f09716cba303ed3da3b3db3edfb861ad70bdbf95..56dd7687f51ca3638e109d1e25d8cd924c5cf74b 100644 (file)
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -8,7 +8,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <command.h>
 #include <fdt_support.h>
 #include <fdtdec.h>

diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c
index 12369896fe3f614b5dedbec793a54831562a5d1c..fe328df4a8500e6b0088a81b9b7358085bf488df 100644 (file)
--- a/boot/image-fit-sig.c
+++ b/boot/image-fit-sig.c
@@ -7,7 +7,6 @@
 #include "mkimage.h"
 #include <time.h>
 #else
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>

diff --git a/boot/image-fit.c b/boot/image-fit.c
index 89e377563ce6f3efd69dcbbab1b2e4efd8249bdb..fb03cab831bd068f62bb0a89fbfd69532a7d11a8 100644 (file)
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -19,7 +19,6 @@
 #else
 #include <linux/compiler.h>
 #include <linux/sizes.h>
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <mapmem.h>

diff --git a/boot/image-pre-load.c b/boot/image-pre-load.c
index b504ab42a5448a05943da69d524d2d6aa242b964..cc19017404c83c64ac8d4e2857883b0e1dfcbcbf 100644 (file)
--- a/boot/image-pre-load.c
+++ b/boot/image-pre-load.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2021 Philippe Reynes <philippe.reynes@softathome.com>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #include <image.h>

diff --git a/boot/image-sig.c b/boot/image-sig.c
index 0421a61b0406640b158f49ba06acec213a1ae60b..6bc74866eaedca3f17e78136ebad2c7c74178928 100644 (file)
--- a/boot/image-sig.c
+++ b/boot/image-sig.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2013, Google Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>

diff --git a/boot/image.c b/boot/image.c
index 073931cd7a3febb29a5f550070f24b256c6e8aa2..eb12e4be04ac40d4c9d6d0aa162b9f49a5da30cf 100644 (file)
--- a/boot/image.c
+++ b/boot/image.c
@@ -7,7 +7,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <env.h>
 #include <display_options.h>
 #include <init.h>

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 5c1c962ff4c13a52beb1822da62bf0a6513e12ea..4b22bb6f525a38d257d65d6e1a4dc1aa126b3652 100644 (file)
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>

diff --git a/boot/scene.c b/boot/scene.c
index d4dfb49ada157e8b0f499a0b15a72a4bbd4830e1..ac976aa26bbe28d1c1292585009a0a6b8bc72da0 100644 (file)
--- a/boot/scene.c
+++ b/boot/scene.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY   LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>

diff --git a/boot/scene_menu.c b/boot/scene_menu.c
index 63994165efba41192d1138dd17b9fcb11cedb272..80bd7457cb1a1c3888b078e1e47cd9126e9e97ad 100644 (file)
--- a/boot/scene_menu.c
+++ b/boot/scene_menu.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY   LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>

diff --git a/boot/scene_textline.c b/boot/scene_textline.c
index 6ea072a1c2688bb62a3d4664fd11ad8b9c8df347..bba8663b98da695255696da85b22fb25e6d10110 100644 (file)
--- a/boot/scene_textline.c
+++ b/boot/scene_textline.c
@@ -8,10 +8,12 @@
 
 #define LOG_CATEGORY   LOGC_EXPO
 
-#include <common.h>
 #include <expo.h>
 #include <menu.h>
+#include <log.h>
 #include <video_console.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 #include "scene_internal.h"
 
 int scene_textline(struct scene *scn, const char *name, uint id, uint max_chars,

diff --git a/boot/vbe.c b/boot/vbe.c
index 52b328300374fab943c584810f4bf13140edf1d8..00673de7ee2ec30ace7233e0583750ab30e6742e 100644 (file)
--- a/boot/vbe.c
+++ b/boot/vbe.c
@@ -6,7 +6,6 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
-#include <common.h>
 #include <bootmeth.h>
 #include <bootstd.h>
 #include <dm.h>

diff --git a/boot/vbe_request.c b/boot/vbe_request.c
index 0293ac6c869ff4322d7cf2e52bec53b5c0a1ab3e..a1350c1a706ea8f234e0015c4757b1a370d5b0b4 100644 (file)
--- a/boot/vbe_request.c
+++ b/boot/vbe_request.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <dm.h>
 #include <event.h>
 #include <image.h>

diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c
index 12682abd3996c54eb7d01b2dc4e33c4b62833e10..189e86d2a223ba742f8b470123881cbe00cc8b58 100644 (file)
--- a/boot/vbe_simple.c
+++ b/boot/vbe_simple.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>

diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c
index d59a704ddbade4708aceb025b66c57996357f459..4d6da9490a76f364d1ab9b0250d8ab7456951fba 100644 (file)
--- a/boot/vbe_simple_fw.c
+++ b/boot/vbe_simple_fw.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <bloblist.h>
 #include <bootdev.h>
 #include <bootflow.h>

diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c
index 84626cdeaf24a9c9051a5a68dded112246b83d49..b4126d8d2d0b32247ac1a6b9490581b277b26ab3 100644 (file)
--- a/boot/vbe_simple_os.c
+++ b/boot/vbe_simple_os.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <dm.h>
 #include <bootflow.h>
 #include <vbe.h>