lib: Remove <common.h> inclusion from these files

After some header file cleanups to add missing include files, remove
common.h from all files in the lib directory. This primarily means just
dropping the line but in a few cases we need to add in other header
files now.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/lib/abuf.c b/lib/abuf.c
index ce2cff53dc933bf18e4c87daf8abfeca441abc15..937c3df351e9bd69a80e3e7c9037b3ebd430c791 100644 (file)
--- a/lib/abuf.c
+++ b/lib/abuf.c
@@ -7,7 +7,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <string.h>

diff --git a/lib/acpi/acpi.c b/lib/acpi/acpi.c
index f21e5094615c23c8fbe2a19b91b12a0b1d4660b8..939a638bb5b5c34b0cd82ddddb55bb9fb89ba59e 100644 (file)
--- a/lib/acpi/acpi.c
+++ b/lib/acpi/acpi.c
@@ -5,7 +5,6 @@
  * Copyright 2023 Google LLC
  */
 
-#include <common.h>
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>

diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index 1b838fdbd6f041fdc0c5b1e305a718b2296e5251..ed94194346d5e0f15cf4a3f78beb5462732e6b3b 100644 (file)
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -6,7 +6,6 @@
  * Mostly taken from coreboot file of the same name
  */
 
-#include <common.h>
 #include <dm.h>
 #include <irq.h>
 #include <log.h>

diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 7e3e3259d8d477585af29e91ac338445254b4e3b..6733809986aea5f7e72aab6b3ebe261ad7860484 100644 (file)
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -6,7 +6,6 @@
  * Mostly taken from coreboot file acpi_device.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index a8d4b470001d16f3811a42d001184118104087b0..e74522e9972ef6592a4ee874569bdb15f2fe85ab 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <cpu.h>
 #include <log.h>

diff --git a/lib/acpi/acpi_writer.c b/lib/acpi/acpi_writer.c
index 946f90e8e7b1a27d70d571003e5a368c8265dbcc..a8dc207557b42838a675a7030091fffde7dd0055 100644 (file)
--- a/lib/acpi/acpi_writer.c
+++ b/lib/acpi/acpi_writer.c
@@ -7,13 +7,13 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index e395226e3de3d58738df4ca1e0d98dbb2753e170..b95cabb91493ee2bdb13e51edca9dfc2032c97c1 100644 (file)
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <uuid.h>

diff --git a/lib/acpi/base.c b/lib/acpi/base.c
index 26bf0cb8d30d0073ad5a085c0eaae00cdcaff4c7..07b53e0c5614ede9c7dcbd7b0e5cf4027cf9d590 100644 (file)
--- a/lib/acpi/base.c
+++ b/lib/acpi/base.c
@@ -7,12 +7,13 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
 #include <mapmem.h>
 #include <tables_csum.h>
 #include <linux/sizes.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 
 void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
                     struct acpi_xsdt *xsdt)

diff --git a/lib/acpi/csrt.c b/lib/acpi/csrt.c
index 2ba86f229529e9f9ea9375a2dbbcafb33a434286..00927e534063133d4cf32151c5cb66a8557a7783 100644 (file)
--- a/lib/acpi/csrt.c
+++ b/lib/acpi/csrt.c
@@ -7,11 +7,11 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <mapmem.h>
 #include <tables_csum.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 __weak int acpi_fill_csrt(struct acpi_ctx *ctx)
 {

diff --git a/lib/acpi/dsdt.c b/lib/acpi/dsdt.c
index db98cc20e1d04576c076de62c8002ffd0c8f9f05..206e1e2678ff6b76aab6699148fb3f58bd937c16 100644 (file)
--- a/lib/acpi/dsdt.c
+++ b/lib/acpi/dsdt.c
@@ -7,10 +7,10 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
 #include <tables_csum.h>
+#include <linux/string.h>
 
 /*
  * IASL compiles the dsdt entries and writes the hex values

diff --git a/lib/acpi/facs.c b/lib/acpi/facs.c
index e89f43ca5c9143d48df652aca9658d8fd30122f4..86c28120c7e307904d0d9489aa7b8b35b4fee901 100644 (file)
--- a/lib/acpi/facs.c
+++ b/lib/acpi/facs.c
@@ -7,9 +7,9 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 int acpi_write_facs(struct acpi_ctx *ctx, const struct acpi_writer *entry)
 {

diff --git a/lib/acpi/mcfg.c b/lib/acpi/mcfg.c
index 7404ae586ab79d1af5dae4bfda85e5679d3c03b7..8b8a5bfafae23625458fff07d4400cc9bc0149cf 100644 (file)
--- a/lib/acpi/mcfg.c
+++ b/lib/acpi/mcfg.c
@@ -7,11 +7,13 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <mapmem.h>
 #include <tables_csum.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
 
 int acpi_create_mcfg_mmconfig(struct acpi_mcfg_mmconfig *mmconfig, u32 base,
                              u16 seg_nr, u8 start, u8 end)

diff --git a/lib/acpi/ssdt.c b/lib/acpi/ssdt.c
index b140b4b2ff65cd6144ccb4df18f2725748a16a80..b0a96f846e39e6642e84a4d3584c54fab97a4dc8 100644 (file)
--- a/lib/acpi/ssdt.c
+++ b/lib/acpi/ssdt.c
@@ -7,10 +7,11 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
 #include <tables_csum.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 
 int acpi_write_ssdt(struct acpi_ctx *ctx, const struct acpi_writer *entry)
 {

diff --git a/lib/addr_map.c b/lib/addr_map.c
index 86e932e4b561f24ed4b78098b480833e3bf67a76..f85fb0c7fb1b66f97980e1639dc66021ed503696 100644 (file)
--- a/lib/addr_map.c
+++ b/lib/addr_map.c
@@ -3,7 +3,6 @@
  * Copyright 2008 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <addr_map.h>
 #include <mapmem.h>
 

diff --git a/lib/aes.c b/lib/aes.c
index 4fca85ebee265d6b1207e1fda1d770bd033d7531..39ad4a990f07c498ff1252879e2f1c9197cdfbe6 100644 (file)
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -22,9 +22,9 @@
 */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <linux/string.h>
 #else
 #include <string.h>
 #endif

diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 345029fa784787bbc6d7473b56f8d1678615c51e..741102a4723b902667b85f051787da5504016ee9 100644 (file)
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -4,7 +4,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <malloc.h>
 #endif
 #include <image.h>

diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index 216d9716d0d60d2dd963a9675b3ec60973080ec9..4e2dbda9a710fbce1f8aeb0d9e2bcb195a2de75e 100644 (file)
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -11,9 +11,9 @@
  * #defines from the assembly-language output.
  */
 
-#include <common.h>
 #include <asm-offsets.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <linux/kbuild.h>
 

diff --git a/lib/at91/at91.c b/lib/at91/at91.c
index 048597690b1dca7543222b83f1f69218f49999be..bd31e9e41dc12ebdb21f486e4e56494e69e61426 100644 (file)
--- a/lib/at91/at91.c
+++ b/lib/at91/at91.c
@@ -4,7 +4,6 @@
  *              Wenyou.Yang <wenyou.yang@microchip.com>
  */
 
-#include <common.h>
 #include <atmel_lcd.h>
 
 #include "atmel_logo_8bpp.h"

diff --git a/lib/bch.c b/lib/bch.c
index 72b4fdcc9c446d6bc4a7c70aa7911a9ea3a6bc4c..a309a8dfcba4bdec5999cd620869d41c33a150f4 100644 (file)
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -54,7 +54,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <ubi_uboot.h>

diff --git a/lib/binman.c b/lib/binman.c
index cfe1e5f80710ea7eec651176d0452ac80987b926..9047f5275f3250ae1106b859f311a16e0c34cbf6 100644 (file)
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -6,7 +6,6 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
-#include <common.h>
 #include <binman.h>
 #include <dm.h>
 #include <log.h>

diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index bd589aa810c1aa1c72e01565a3661c92de801cff..f7318b7886e0c43d8ba2d9c2cd402b20f2de120e 100644 (file)
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -1,7 +1,6 @@
-#include <config.h>
-#include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
+#include <stdio.h>
 
 /*
  * This file is a modified version of bzlib.c from the bzip2-1.0.2

diff --git a/lib/bzip2/bzlib_decompress.c b/lib/bzip2/bzlib_decompress.c
index 3b417d57b2763d9a30a0b33c3640dd4e38ee1a88..e56ab6674b05232b40f0ab53387a7ced0d8f1502 100644 (file)
--- a/lib/bzip2/bzlib_decompress.c
+++ b/lib/bzip2/bzlib_decompress.c
@@ -1,5 +1,4 @@
 #include <config.h>
-#include <common.h>
 #include <watchdog.h>
 
 /*-------------------------------------------------------------*/

diff --git a/lib/charset.c b/lib/charset.c
index 5e4c4f948a4a2570649d4b83cac405539c3fc6b2..89057ef7ce22a21f33de9df1bfde46971cf551f8 100644 (file)
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -5,7 +5,6 @@
  *  Copyright (c) 2017 Rob Clark
  */
 
-#include <common.h>
 #include <charset.h>
 #include <capitalization.h>
 #include <cp437.h>

diff --git a/lib/circbuf.c b/lib/circbuf.c
index fa79c148dae4ea6818fbdce4a04baba7d121fb79..2e161ae8d8baa69b43c2a79adecdc4e566107d35 100644 (file)
--- a/lib/circbuf.c
+++ b/lib/circbuf.c
@@ -4,7 +4,6 @@
  * Gerry Hamel, geh@ti.com, Texas Instruments
  */
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 

diff --git a/lib/crc16-ccitt.c b/lib/crc16-ccitt.c
index 6cadbc103d3ec8a7487b7c8736792fc8639b5ea2..6fa4e93ed17c4b98079bd4926908cb3bdeee1429 100644 (file)
--- a/lib/crc16-ccitt.c
+++ b/lib/crc16-ccitt.c
@@ -24,8 +24,6 @@
 
 #ifdef USE_HOSTCC
 #include <arpa/inet.h>
-#else
-#include <common.h>
 #endif
 #include <u-boot/crc.h>
 

diff --git a/lib/crc32.c b/lib/crc32.c
index f6fad8c15dfcde18322f5c352bf2e4e169c5c63a..f36f1763064fba5b015e0d9ec416f3959195df7a 100644 (file)
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -11,7 +11,6 @@
 #ifdef USE_HOSTCC
 #include <arpa/inet.h>
 #else
-#include <common.h>
 #include <efi_loader.h>
 #endif
 #include <compiler.h>

diff --git a/lib/crc32c.c b/lib/crc32c.c
index 016b34a523b8952d53f7caf1dffb470903e349a1..7026ac4c330ed02a1bd3c2612cb4587988fc8b51 100644 (file)
--- a/lib/crc32c.c
+++ b/lib/crc32c.c
@@ -10,7 +10,6 @@
  * any later version.
  */
 
-#include <common.h>
 #include <compiler.h>
 
 uint32_t crc32c_cal(uint32_t crc, const char *data, int length,

diff --git a/lib/crc8.c b/lib/crc8.c
index 87b87b675b27fa77280cdf98a5cdf17c66b79566..20d46d161472da092582c01c065e99c3cfae188f 100644 (file)
--- a/lib/crc8.c
+++ b/lib/crc8.c
@@ -5,8 +5,6 @@
 
 #ifdef USE_HOSTCC
 #include <arpa/inet.h>
-#else
-#include <common.h>
 #endif
 #include <u-boot/crc.h>
 

diff --git a/lib/crypt/crypt-port.h b/lib/crypt/crypt-port.h
index 6b9542d75bc20a14b413bf5f70b37622740e5651..50dde68b5cdec8d483c4b8e091f8ebce2ac1f76f 100644 (file)
--- a/lib/crypt/crypt-port.h
+++ b/lib/crypt/crypt-port.h
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss@eyet-services.de> */
 
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <vsprintf.h>
 

diff --git a/lib/crypt/crypt.c b/lib/crypt/crypt.c
index 247c34b2a9c3b8890e0a174885e2fcd6614d8f04..8f5fadb582ed89e2d16e41f0f9af28caa47305f0 100644 (file)
--- a/lib/crypt/crypt.c
+++ b/lib/crypt/crypt.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss@eyet-services.de> */
 
-#include <common.h>
 #include <crypt.h>
 #include "crypt-port.h"
 

diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index 30071233ee79c0972b5fb9aab50e54de764f45b7..a10145a7cdcf106ede0686f438d063f955e620f9 100644 (file)
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -7,7 +7,6 @@
 
 #define pr_fmt(fmt) "X.509: "fmt
 #ifdef __UBOOT__
-#include <common.h>
 #include <image.h>
 #include <dm/devres.h>
 #include <linux/compat.h>

diff --git a/lib/date.c b/lib/date.c
index e3d22459cd058ad6c936c82d16dcd952515b1131..0deac8a1bee1bda1826f5ba47686e0ca05624073 100644 (file)
--- a/lib/date.c
+++ b/lib/date.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <rtc.h>

diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index 77b52a23003cc13b1e732f6357c981018a9ca7a3..e52beaeaadc735d4659affb8d995bc71667bff49 100644 (file)
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -3,9 +3,10 @@
  * (C) Copyright 2015 Google, Inc
  */
 
-#include <common.h>
 #include <command.h>
 #include <div64.h>
+#include <time.h>
+#include <vsprintf.h>
 #include "dhry.h"
 
 static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc,

diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c
index dcc224fb387de8607bb73bf908a4426e8d7a3fa9..252cd14a656e1703d773caac000d4532fd08b79d 100644 (file)
--- a/lib/dhry/dhry_1.c
+++ b/lib/dhry/dhry_1.c
@@ -42,8 +42,8 @@
  ***************************************************************************/
 char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
 
-#include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 
 #include "dhry.h"
 

diff --git a/lib/dhry/dhry_2.c b/lib/dhry/dhry_2.c
index 1ba879673e30b4b119142bac693cd77911d56326..a74197d884de9bb2c8451de490b9a33197528577 100644 (file)
--- a/lib/dhry/dhry_2.c
+++ b/lib/dhry/dhry_2.c
@@ -39,7 +39,7 @@
  ****************************************************************************/
 /* SCCSid is defined in dhry_1.c */
 
-#include <common.h>
+#include <linux/string.h>
 #include "dhry.h"
 
 #ifndef REG

diff --git a/lib/efi/efi.c b/lib/efi/efi.c
index aa42f1842f339a98b39667a7bd4226f9fc0fce1d..bcb34d67465d0f629f8265eddece16123ed5b224 100644 (file)
--- a/lib/efi/efi.c
+++ b/lib/efi/efi.c
@@ -10,7 +10,6 @@
  * Common EFI functions
  */
 
-#include <common.h>
 #include <debug_uart.h>
 #include <errno.h>
 #include <malloc.h>

diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index c5eb816655ea6033c1532b7ed63948a599c5cb21..119db6602cfb8b274dc3b72b6d0ee959768ecf22 100644 (file)
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -8,7 +8,6 @@
  * This file implements U-Boot running as an EFI application.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <dm.h>

diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 4d78923c4d40735a45d7a7beec3606ed7226faf0..5b564c5651d59682f3cb533c37ff8ed003b6d92b 100644 (file)
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -5,7 +5,6 @@
  * Access to the EFI information table
  */
 
-#include <common.h>
 #include <efi.h>
 #include <errno.h>
 #include <mapmem.h>

diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index c9eb32ec1046a4bb7a0245998160dba2cc9aa818..40fc29d9adf7a5869ce5fded95c11fa0be323bc0 100644 (file)
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -9,7 +9,6 @@
  * EFI application. It can be built either in 32-bit or 64-bit mode.
  */
 
-#include <common.h>
 #include <debug_uart.h>
 #include <efi.h>
 #include <efi_api.h>

diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index e3abd90275c8200824ff761d5bdebca4ad7792e4..34a0365739d7f17fd72656d7e5eddb2e7b121bc2 100644 (file)
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -28,7 +28,6 @@
  * iPXE uses the simple file protocol to load Grub or the Linux Kernel.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <efi_driver.h>

diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 66a45e156d60fb85f79d38089d832a29e6abfb57..e1e28df20b2c47768377e09c961cc7c9f2624e91 100644 (file)
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -17,7 +17,6 @@
  * controllers.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <efi_driver.h>
 #include <log.h>

diff --git a/lib/efi_selftest/efi_selftest_esrt.c b/lib/efi_selftest/efi_selftest_esrt.c
index 922ff253c72cf71a266e281d03f2e0323514b094..b7688deb4964384e42274d844be166d40860288a 100644 (file)
--- a/lib/efi_selftest/efi_selftest_esrt.c
+++ b/lib/efi_selftest/efi_selftest_esrt.c
@@ -4,7 +4,6 @@
  *
  *  Copyright (C) 2021 Arm Ltd.
  */
-#include <common.h>
 #include <efi_loader.h>
 #include <efi_selftest.h>
 

diff --git a/lib/efi_selftest/efi_selftest_miniapp_exception.c b/lib/efi_selftest/efi_selftest_miniapp_exception.c
index a9ad381001f951ee1c4ff388d2aa6e5995e30f9b..f668cdac4ab2de0259374722958f0178d8693fd6 100644 (file)
--- a/lib/efi_selftest/efi_selftest_miniapp_exception.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_exception.c
@@ -7,7 +7,6 @@
  * This EFI application triggers an exception.
  */
 
-#include <common.h>
 #include <efi_api.h>
 #include <host_arch.h>
 

diff --git a/lib/efi_selftest/efi_selftest_miniapp_exit.c b/lib/efi_selftest/efi_selftest_miniapp_exit.c
index 1c42d6dd400facaf71deadcfa2aa0575e3f09c93..8b2e60cc71140b1f242abbda477efe4f97bc56bc 100644 (file)
--- a/lib/efi_selftest/efi_selftest_miniapp_exit.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_exit.c
@@ -8,7 +8,6 @@
  * It uses the Exit boot service to return.
  */
 
-#include <common.h>
 #include <efi_selftest.h>
 
 static efi_guid_t loaded_image_protocol_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;

diff --git a/lib/efi_selftest/efi_selftest_miniapp_return.c b/lib/efi_selftest/efi_selftest_miniapp_return.c
index 45366aa9c638fdc65a11adec30570902e665dcbb..8792d78ab30f1057b7fa1c5b3b86f3bc2159fbbb 100644 (file)
--- a/lib/efi_selftest/efi_selftest_miniapp_return.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_return.c
@@ -8,7 +8,6 @@
  * It returns directly without calling the Exit boot service.
  */
 
-#include <common.h>
 #include <efi_api.h>
 
 /*

diff --git a/lib/elf.c b/lib/elf.c
index 0476b2614c33f484c672fc563c8c917bc3f35a88..9a794f9cba89a91d7a5eecae20696d6abfed79e5 100644 (file)
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -3,7 +3,6 @@
    Copyright (c) 2001 William L. Pitts
 */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <elf.h>

diff --git a/lib/errno_str.c b/lib/errno_str.c
index 2e5f4a887d5b0f1351ba0765b8bbd096d7c7e2e3..752d4eb47aa60970e6cb3cb8056cf5c5e3d5625d 100644 (file)
--- a/lib/errno_str.c
+++ b/lib/errno_str.c
@@ -4,8 +4,8 @@
  *
  * SDPX-License-Identifier:    GPL-2.0+
  */
-#include <common.h>
 #include <errno.h>
+#include <linux/kernel.h>
 
 #define ERRNO_MSG(errno, msg)  msg
 #define SAME_AS(x)             (const char *)&errno_message[x]

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 7a69167648354f005e1d6791e8d1955c879912cd..4016bf3c1130401dca574c7f99dd15144f4e51a7 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -7,7 +7,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <boot_fit.h>
 #include <display_options.h>
 #include <dm.h>

diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c
index ddaca0087e19d97091677ea8ed8bcfab24f60c95..ca36ff15952b8e9b8bd9cad549a7902798a830db 100644 (file)
--- a/lib/fdtdec_common.c
+++ b/lib/fdtdec_common.c
@@ -8,7 +8,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>

diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 85351c75ca2997e1ec733097dcb154a2d4553d84..1e4d5fc8326433fbdc0f3f31da32ca8918b34871 100644 (file)
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <command.h>
 #include <fdtdec.h>
 #include <linux/libfdt.h>

diff --git a/lib/getopt.c b/lib/getopt.c
index 8b4515dc196750eddf5102adf0d9c9496bdaa23e..e9175e2fff49adec2795337e5b0dc89adf794f35 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -8,9 +8,9 @@
 
 #define LOG_CATEGORY LOGC_CORE
 
-#include <common.h>
 #include <getopt.h>
 #include <log.h>
+#include <linux/string.h>
 
 void getopt_init_state(struct getopt_state *gs)
 {

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 932e3e8036d162217a752ae3d7f5535a55ff46b5..e71d8d00ccb52e1257e08dc2f240aad8410cd810 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <console.h>

diff --git a/lib/gzip.c b/lib/gzip.c
index 2595b2d04b42899e103e717bb5e9c071f76a2d78..5d9c19598d5e5bfd84973c20d38ee8d7485ec1e5 100644 (file)
--- a/lib/gzip.c
+++ b/lib/gzip.c
@@ -4,7 +4,6 @@
  * Lei Wen <leiwen@marvell.com>, Marvell Inc.
  */
 
-#include <common.h>
 #include <watchdog.h>
 #include <command.h>
 #include <gzip.h>

diff --git a/lib/hang.c b/lib/hang.c
index 2735774f9a4061c8252cc735ce66558c3ac5f4bc..3cfb06e9ca8d06b43946513df3b2867414c2d183 100644 (file)
--- a/lib/hang.c
+++ b/lib/hang.c
@@ -7,9 +7,9 @@
  * u-boot.
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <hang.h>
+#include <stdio.h>
 #include <os.h>
 
 /**

diff --git a/lib/hash-checksum.c b/lib/hash-checksum.c
index 68c290d64d86760f6ef124447a05f3749534ce5e..1970a741294d6fd4a97e3d7e3e7464d96966eb94 100644 (file)
--- a/lib/hash-checksum.c
+++ b/lib/hash-checksum.c
@@ -4,7 +4,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <fdtdec.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>

diff --git a/lib/hashtable.c b/lib/hashtable.c
index f2d36bd34b4c8efcacd200e311938d8bb18c40cd..a0060f6a0d63138ac524d3900db3d30582117e4a 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -30,7 +30,6 @@
 #  endif
 # endif
 #else                          /* U-Boot build */
-# include <common.h>
 # include <linux/string.h>
 # include <linux/ctype.h>
 #endif

diff --git a/lib/hexdump.c b/lib/hexdump.c
index 149c93ead8b8c8fa413e444aa872c1ff60cc1a08..33e3e6e5182438b63f105676f3e5fbed3b4ff09d 100644 (file)
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -8,9 +8,9 @@
  * more details.
  */
 
-#include <common.h>
 #include <hexdump.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
 #include <linux/log2.h>

diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 323aad981c6493ebd5225a9281b5bc6c9d865373..f82890646920657d0acb51029d32945784eb7cd5 100644 (file)
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -35,7 +35,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <blk.h>
 #include <image-sparse.h>
 #include <div64.h>

diff --git a/lib/initcall.c b/lib/initcall.c
index 33b7d761dc7e1e3011ff7ee445a2aa2f434d0a03..ce317af213aba7975dea11d0e292ca969e9a3122 100644 (file)
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2013 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <efi.h>
 #include <initcall.h>
 #include <log.h>

diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index c83426f59dc208fd51f53d1c3f447c52e955602b..985e88eb3976203b06de5d478c0965375a44fd17 100644 (file)
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -1,5 +1,4 @@
 
-#include <common.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <asm/cache.h>

diff --git a/lib/list_sort.c b/lib/list_sort.c
index 1c9e0617327046ba33e0f7f5ee9a7df9a5624ddf..a6e54d5bc46e92c69a619a26b493cb2f007a3b07 100644 (file)
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -6,7 +6,6 @@
 #include <linux/slab.h>
 #else
 #include <linux/compat.h>
-#include <common.h>
 #include <malloc.h>
 #include <linux/printk.h>
 #endif

diff --git a/lib/lmb.c b/lib/lmb.c
index da924c6789acd4211faa7af07b6375e74beb7665..44f98205310146f1bf45ab569b067a81dc153879 100644 (file)
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -6,7 +6,6 @@
  * Copyright (C) 2001 Peter Bergner.
  */
 
-#include <common.h>
 #include <efi_loader.h>
 #include <image.h>
 #include <mapmem.h>

diff --git a/lib/lz4.c b/lib/lz4.c
index 5337842126c8ea220e8b73e6738b422a81804c7b..d365dc727cfd1ba9a3879d19a431d8789edd8bea 100644 (file)
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -27,7 +27,6 @@
  *     - LZ4 homepage : http://www.lz4.org
  *     - LZ4 source repository : https://github.com/lz4/lz4
  */
-#include <common.h>
 #include <compiler.h>
 #include <linux/kernel.h>
 #include <linux/types.h>

diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index 67dea2ff39043925d77ab273b02bf86259e14836..4d48e7b0e8bfaba077caa0b62b28d20fb2b2f11b 100644 (file)
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -3,7 +3,6 @@
  * Copyright 2015 Google Inc.
  */
 
-#include <common.h>
 #include <compiler.h>
 #include <image.h>
 #include <linux/kernel.h>

diff --git a/lib/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c
index a90b35c6a993b96353cd57cc7b80308145d824bc..1da3f0a14a7d04a829f007212be4f773c8bf556f 100644 (file)
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
@@ -2,7 +2,6 @@
 2009-09-20 : Igor Pavlov : Public domain */
 
 #include <config.h>
-#include <common.h>
 #include <watchdog.h>
 #include "LzmaDec.h"
 

diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 55f64cd28908e801fa150a3ce492da5437cedf98..400d606784eaabcd1029cb41be3f02fbe4663500 100644 (file)
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <watchdog.h>
 

diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 65fef0b0eb90591d2c03e6acaf8c267e7b2c9021..5d70fa4133796ae652273f04714e26a94ef42adb 100644 (file)
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -11,8 +11,9 @@
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
-#include <common.h>
+#include <linux/kernel.h>
 #include <linux/lzo.h>
+#include <linux/string.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include "lzodefs.h"

diff --git a/lib/md5.c b/lib/md5.c
index 1636ab9366195c179a3f0b4ef69a79e49c273222..faf3f78ab1edddc77f5d5c9defb4a45cd6eac41e 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -28,7 +28,6 @@
 #include "compiler.h"
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <watchdog.h>
 #endif /* USE_HOSTCC */
 #include <u-boot/md5.h>

diff --git a/lib/membuff.c b/lib/membuff.c
index 36dc43a523fb33f7b80551f89ddb2e71a2a0e144..3c6c0ae125c4c2129255a3a6444e188f3ab87f8c 100644 (file)
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -6,7 +6,6 @@
  * Copyright (c) 1992 Simon Glass
  */
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>

diff --git a/lib/net_utils.c b/lib/net_utils.c
index 4283c13a31d9394db20ce759512000428caeba90..c70fef0d991bcbd497b77a675b0ab4158fdbdf36 100644 (file)
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -9,9 +9,9 @@
  * Copyright 2009 Dirk Behme, dirk.behme@googlemail.com
  */
 
-#include <common.h>
 #include <net.h>
 #include <net6.h>
+#include <vsprintf.h>
 
 struct in_addr string_to_ip(const char *s)
 {

diff --git a/lib/of_live.c b/lib/of_live.c
index 812c488f6067295d320df6c2ef1f87182fc21eec..90b9459ede313e492e28c8556c730f3bd8aaa9df 100644 (file)
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -10,7 +10,6 @@
 
 #define LOG_CATEGORY   LOGC_DT
 
-#include <common.h>
 #include <abuf.h>
 #include <log.h>
 #include <linux/libfdt.h>

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index b0362240446960fe3f1b58705bba119e809a35cc..393f2715a9c128f715f27413168cefa7403bde56 100644 (file)
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -4,7 +4,6 @@
  * Bryan O'Donoghue <bryan.odonoghue@linaro.org>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <image.h>
 #include <log.h>

diff --git a/lib/panic.c b/lib/panic.c
index 66ae17f3df9942a4ffd16003314bd1ab727e8257..0f578b5b5131589d215f5f4b16b95d9c9f3e8ce3 100644 (file)
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -9,7 +9,6 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-#include <common.h>
 #include <hang.h>
 #if !defined(CONFIG_PANIC_HANG)
 #include <command.h>

diff --git a/lib/physmem.c b/lib/physmem.c
index fc90ce4d7cfd092c1ad71196226e0a03130cd11f..562c74d37f310cb58fe4be8b63438327da69d3ad 100644 (file)
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -8,11 +8,11 @@
  * Software Foundation.
  */
 
-#include <common.h>
 #include <log.h>
 #include <mapmem.h>
 #include <physmem.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
 {

diff --git a/lib/qsort.c b/lib/qsort.c
index 2f18588dfccd2bd2179069197aa17c6d86fce431..a2562c4942ea8b175c503728cf646fbd7381ea98 100644 (file)
--- a/lib/qsort.c
+++ b/lib/qsort.c
@@ -17,7 +17,6 @@
 
 #include <log.h>
 #include <linux/types.h>
-#include <common.h>
 #include <exports.h>
 #include <sort.h>
 

diff --git a/lib/rand.c b/lib/rand.c
index d256baf5cee7f4a525c8776576d634b7632bf168..d6f2977e8dcc8083940a7f2e1ca26860e5affab2 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -7,7 +7,6 @@
  * Michael Walle <michael@walle.cc>
  */
 
-#include <common.h>
 #include <rand.h>
 
 static unsigned int y = 1U;

diff --git a/lib/rc4.c b/lib/rc4.c
index 720112d1fd8e90c312d721999b34697fbb68f1b1..3839924a2b2c7790dc8cb596c7409e32f698e671 100644 (file)
--- a/lib/rc4.c
+++ b/lib/rc4.c
@@ -7,9 +7,6 @@
  * Rivest Cipher 4 (RC4) implementation
  */
 
-#ifndef USE_HOSTCC
-#include <common.h>
-#endif
 #include <rc4.h>
 
 void rc4_encode(unsigned char *buf, unsigned int len, const unsigned char key[16])

diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index 98855f67b8906d1ea756fd78ea281c4eaaf92bf2..80d0594a43033a66a6de496f0a6dad2eb491b8af 100644 (file)
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -9,7 +9,6 @@
  * Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
  */
 
-#include <common.h>
 #include <image.h>
 #include <malloc.h>
 #include <crypto/internal/rsa.h>

diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index d259b2aedf27fd8deaa1b8a933a55a336fa6048d..5b3ea02f82f83dc8d5126e445f56fe14c783dcb8 100644 (file)
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -4,7 +4,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/types.h>

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 096e7f6d178e4079294508619ccf83dcd7e56798..1007b6979a4f58c32303b76c2dcf7f74f34b2d21 100644 (file)
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -4,7 +4,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>

diff --git a/lib/rtc-lib.c b/lib/rtc-lib.c
index 1f7bdade298a05f1e9b633ca319b078dc4058ab8..46dcfba27157d548184a16f3130b20b5448f9cf4 100644 (file)
--- a/lib/rtc-lib.c
+++ b/lib/rtc-lib.c
@@ -10,7 +10,6 @@
  * - January is month 1.
  */
 
-#include <common.h>
 #include <rtc.h>
 #include <linux/math64.h>
 

diff --git a/lib/semihosting.c b/lib/semihosting.c
index 831774e35664aac289bf4f51cee5676438e47aa0..9be5bffd30124777c4f8110065e6cca5640312ac 100644 (file)
--- a/lib/semihosting.c
+++ b/lib/semihosting.c
@@ -4,9 +4,10 @@
  * Copyright 2014 Broadcom Corporation
  */
 
-#include <common.h>
 #include <log.h>
 #include <semihosting.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 
 #define SYSOPEN                0x01
 #define SYSCLOSE       0x02

diff --git a/lib/slre.c b/lib/slre.c
index e1a50443e04641d8f0b8a9c078455f87d2013b8c..277a59a03a712321492ee2989acfc36630e9c554 100644 (file)
--- a/lib/slre.c
+++ b/lib/slre.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #else
 #include <log.h>
-#include <common.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #endif /* SLRE_TEST */
 
 #include <errno.h>

diff --git a/lib/smbios-parser.c b/lib/smbios-parser.c
index 2b9392936b99d43f0cf26d62b904fcf40d2c8951..b578c3084081380face3a519070c879d2531bc27 100644 (file)
--- a/lib/smbios-parser.c
+++ b/lib/smbios-parser.c
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY   LOGC_BOOT
 
-#include <common.h>
 #include <smbios.h>
 
 static inline int verify_checksum(const struct smbios_entry *e)

diff --git a/lib/smbios.c b/lib/smbios.c
index 3f0e1d529537f5f0bfbcacb5499c995103843302..45480b01af4ac713222916e1d1b5568e373c4702 100644 (file)
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -5,7 +5,6 @@
  * Adapted from coreboot src/arch/x86/smbios.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <linux/stringify.h>

diff --git a/lib/strto.c b/lib/strto.c
index 154921165cb204127d29bebce7eab871efc940b3..5157332d6c1d7966e783455d57f8bc1115c29f40 100644 (file)
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -9,9 +9,9 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-#include <common.h>
 #include <errno.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 
 /* from lib/kstrtox.c */

diff --git a/lib/tables_csum.c b/lib/tables_csum.c
index e2630d57d91240b45963dc338a09b9056084b76a..636aa596768178df8a7ae173faed396c45e98501 100644 (file)
--- a/lib/tables_csum.c
+++ b/lib/tables_csum.c
@@ -3,8 +3,7 @@
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
  */
 
-#include <common.h>
-#include <linux/ctype.h>
+#include <linux/types.h>
 
 u8 table_compute_checksum(void *v, int len)
 {

diff --git a/lib/time.c b/lib/time.c
index 00f4a1ac8fb3c86791441366bddc4331f86c610b..872f73d521e1e0f3e231a1add6591418e1a43c21 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <bootstage.h>
 #include <dm.h>

diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index f661fc65054ae88e60684c235d689053c84de85c..9a70c6095b317726d525e250fe11dd265770e2a2 100644 (file)
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -8,7 +8,6 @@
  * Copyright (C) 2004,2008  Kustaa Nyholm
  */
 
-#include <common.h>
 #include <log.h>
 #include <serial.h>
 #include <stdarg.h>

diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index 82ffdc5341bce21aecbd088d1921b73f93f15f2c..b592c22bfc132a790c320dc892945e12c44c99c5 100644 (file)
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_TPM
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>

diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index 60a18ca50400404b3a16bdbc431898f7fb211186..e66023da5e67e6ee1faea5909b147d06b46a9e9d 100644 (file)
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_TPM
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>

diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index bd0fb078dc3c354cd95e309ba57fb8a7ddb9a288..68eaaa639f89d97965eaccda5d67ff3723f6c4ea 100644 (file)
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -5,7 +5,6 @@
  * Author: Miquel Raynal <miquel.raynal@bootlin.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/of_access.h>
 #include <tpm_api.h>

diff --git a/lib/tpm_api.c b/lib/tpm_api.c
index 3ef5e811794faf5762c0334c3b66594bc834feb7..39a5121e3028ce5c2b4fef9923672b0138476716 100644 (file)
--- a/lib/tpm_api.c
+++ b/lib/tpm_api.c
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <tpm_api.h>

diff --git a/lib/trace.c b/lib/trace.c
index 4874bef861bf6c56cc459ea20b8d1af5b3793b49..cabbe47b58a3f5f494182e4b6145b1da311e921a 100644 (file)
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -3,10 +3,10 @@
  * Copyright (c) 2012 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <mapmem.h>
 #include <time.h>
 #include <trace.h>
+#include <linux/errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>

diff --git a/lib/uuid.c b/lib/uuid.c
index afb40bff507af4bb5adeed6be8934fc38b5e226f..0be22bc05f7810f3aa5d06cee4d8385f6c5382e0 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -9,7 +9,6 @@
 
 #define LOG_CATEGOT LOGC_CORE
 
-#include <common.h>
 #include <command.h>
 #include <efi_api.h>
 #include <env.h>
@@ -18,7 +17,6 @@
 #include <uuid.h>
 #include <linux/ctype.h>
 #include <errno.h>
-#include <common.h>
 #include <asm/io.h>
 #include <part_efi.h>
 #include <malloc.h>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index e14c6ca9f96670e348b1de46e0296d3c648eba39..27ea9c907a32cbc936481d19b3dc8a66c994a92e 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -13,7 +13,6 @@
  * from hush: simple_itoa() was lifted from boa-0.93.15
  */
 
-#include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
 #include <div64.h>

diff --git a/lib/zstd/zstd.c b/lib/zstd/zstd.c
index 3a2abc836734ca849888cb824bc1020fbdc959ff..14bde369068dc74ad5280505aadbefdfed9fbe2b 100644 (file)
--- a/lib/zstd/zstd.c
+++ b/lib/zstd/zstd.c
@@ -5,10 +5,10 @@
 
 #define LOG_CATEGORY   LOGC_BOOT
 
-#include <common.h>
 #include <abuf.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/zstd.h>
 
 int zstd_decompress(struct abuf *in, struct abuf *out)