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>
2025-04-15 17:34:43 +00:00 · 2024-04-27 08:11:02 -06:00 · 2024-04-27 08:11:02 -06:00 · c4b646d436
commit c4b646d436
parent c93cc8ed41
43 changed files with 6 additions and 43 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 */
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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,
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>