efi_loader: Remove <common.h>

We largely do not need <common.h> in these files, so drop it. The only exception here is that efi_freestanding.c needs <linux/types.h> and had been getting that via <common.h>. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
2024-11-10 15:14:43 +00:00 · 2023-12-14 13:16:55 -05:00 · 2023-12-14 13:16:55 -05:00 · c38cb227d3
commit c38cb227d3
parent d1f072aa25
42 changed files with 1 additions and 42 deletions
--- a/lib/efi_loader/dtbdump.c
+++ b/lib/efi_loader/dtbdump.c
@ -6,7 +6,6 @@
 * to a file.
 */

-#include <common.h>
 #include <efi_api.h>
 #include <efi_dt_fixup.h>
 #include <part.h>
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@ -5,7 +5,6 @@
 *  Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <mapmem.h>
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@ -11,7 +11,6 @@

 #include <blk.h>
 #include <blkmap.h>
-#include <common.h>
 #include <charset.h>
 #include <dm.h>
 #include <log.h>
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@ -5,7 +5,6 @@
 * Copyright (c) 2016 Alexander Graf
 */

-#include <common.h>
 #include <bootm.h>
 #include <div64.h>
 #include <dm/device.h>
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@ -8,7 +8,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <env.h>
--- a/lib/efi_loader/efi_conformance.c
+++ b/lib/efi_loader/efi_conformance.c
@ -5,7 +5,6 @@
 *  Copyright (C) 2022 Arm Ltd.
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <efi_api.h>
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@ -8,7 +8,6 @@
 #define LOG_CATEGORY LOGC_EFI

 #include <ansi.h>
-#include <common.h>
 #include <charset.h>
 #include <malloc.h>
 #include <time.h>
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <dm/root.h>
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2017 Heinrich Schuchardt
 */

-#include <common.h>
 #include <blk.h>
 #include <efi_loader.h>
 #include <malloc.h>
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2017 Leif Lindholm
 */

-#include <common.h>
 #include <efi_loader.h>

 const efi_guid_t efi_guid_device_path_utilities_protocol =
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <dm/device-internal.h>
--- a/lib/efi_loader/efi_dt_fixup.c
+++ b/lib/efi_loader/efi_dt_fixup.c
@ -5,7 +5,6 @@
 * Copyright (c) 2020 Heinrich Schuchardt
 */

-#include <common.h>
 #include <efi_dt_fixup.h>
 #include <efi_loader.h>
 #include <efi_rng.h>
--- a/lib/efi_loader/efi_esrt.c
+++ b/lib/efi_loader/efi_esrt.c
@ -5,7 +5,6 @@
 *  Copyright (C) 2021 Arm Ltd.
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <efi_api.h>
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@ -5,7 +5,6 @@
 * Copyright (c) 2017 Rob Clark
 */

-#include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
 #include <log.h>
--- a/lib/efi_loader/efi_firmware.c
+++ b/lib/efi_loader/efi_firmware.c
@ -6,7 +6,6 @@
 *			Author: AKASHI Takahiro
 */

-#include <common.h>
 #include <charset.h>
 #include <dfu.h>
 #include <efi_loader.h>
--- a/lib/efi_loader/efi_freestanding.c
+++ b/lib/efi_loader/efi_freestanding.c
@ -8,7 +8,7 @@
 * memset(), and memcmp().
 */

-#include <common.h>
+#include <linux/types.h>

 /**
 * memcmp() - compare memory areas
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2016 Alexander Graf
 */

-#include <common.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <log.h>
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@ -4,7 +4,6 @@
 */

 #define LOG_CATEGORY LOGC_EFI
-#include <common.h>
 #include <env.h>
 #include <malloc.h>
 #include <dm.h>
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@ -6,7 +6,6 @@
 *  Copyright (c) 2018 AKASHI Takahiro, Linaro Limited
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
 #include <asm/unaligned.h>
--- a/lib/efi_loader/efi_hii_config.c
+++ b/lib/efi_loader/efi_hii_config.c
@ -10,7 +10,6 @@
 * the Makefile.
 */

-#include <common.h>
 #include <efi_loader.h>

 const efi_guid_t efi_guid_hii_config_routing_protocol
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@ -9,7 +9,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <log.h>
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@ -4,7 +4,6 @@
 */

 #define LOG_CATEGORY LOGC_EFI
-#include <common.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
 #include <efi_variable.h>
--- a/lib/efi_loader/efi_load_options.c
+++ b/lib/efi_loader/efi_load_options.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <charset.h>
 #include <log.h>
 #include <malloc.h>
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <efi_loader.h>
 #include <init.h>
 #include <log.h>
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@ -15,7 +15,6 @@
 * Reset():	 EfiSimpleNetworkInitialized -> EfiSimpleNetworkInitialized
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
--- a/lib/efi_loader/efi_riscv.c
+++ b/lib/efi_loader/efi_riscv.c
@ -7,7 +7,6 @@
 */

 #define LOG_CATEGORY LOGC_EFI
-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <log.h>
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <efi_rng.h>
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2018 Heinrich Schuchardt
 */

-#include <common.h>
 #include <malloc.h>
 #include <efi_dt_fixup.h>
 #include <efi_loader.h>
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2016 Alexander Graf
 */

-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <dm.h>
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <log.h>
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@ -4,7 +4,6 @@
 * Copyright (c) 2019 Linaro Limited, Author: AKASHI Takahiro
 */

-#include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <malloc.h>
--- a/lib/efi_loader/efi_string.c
+++ b/lib/efi_loader/efi_string.c
@ -5,7 +5,6 @@
 * Copyright (c) 2020 AKASHI Takahiro, Linaro Limited
 */

-#include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
 #include <malloc.h>
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@ -8,7 +8,6 @@
 */

 #define LOG_CATEGORY LOGC_EFI
-#include <common.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@ -5,7 +5,6 @@
 * Copyright (c) 2018 Heinrich Schuchardt <xypron.glpk@gmx.de>
 */

-#include <common.h>
 #include <charset.h>
 #include <cp1250.h>
 #include <cp437.h>
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@ -6,7 +6,6 @@
 * Copyright (c) 2020 Linaro Limited, Author: AKASHI Takahiro
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <stdlib.h>
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <charset.h>
 #include <fs.h>
 #include <log.h>
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@ -5,7 +5,6 @@
 * Copyright (c) 2020, Heinrich Schuchardt
 */

-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <u-boot/crc.h>
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@ -7,7 +7,6 @@

 #define LOG_CATEGORY LOGC_EFI

-#include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <env.h>
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@ -10,7 +10,6 @@
 *    Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
 */

-#include <common.h>
 #if CONFIG_IS_ENABLED(ARM_FFA_TRANSPORT)
 #include <arm_ffa.h>
 #endif
--- a/lib/efi_loader/efi_watchdog.c
+++ b/lib/efi_loader/efi_watchdog.c
@ -5,7 +5,6 @@
 *  Copyright (c) 2017 Heinrich Schuchardt
 */

-#include <common.h>
 #include <efi_loader.h>

 /* Conversion factor from seconds to multiples of 100ns */
--- a/lib/efi_loader/initrddump.c
+++ b/lib/efi_loader/initrddump.c
@ -9,7 +9,6 @@
 * clearing of the screen.
 */

-#include <common.h>
 #include <efi_api.h>
 #include <efi_load_initrd.h>