common: Drop part.h from common header

Move this uncommon header out of the common header.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/api/api_storage.c b/api/api_storage.c
index 7ae03ac2306eb97b806592eee429260a0fe0c21d..a0dacad1a55ec7468573b6f5c7cae5b8abe4214b 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <api_public.h>
+#include <part.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>

diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 6e519d8c910df798b1f4fb19f2c0dfd6ccf2b9b7..6e6791fc6595320c56ea745573c1e88c433d9aac 100644 (file)
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <env.h>
+#include <part.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>

diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index 79eb19992d058b53c04404c259485974c2144c1d..12c26a91c65c6710f7cd8a88167521fcac9f2a27 100644 (file)
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <part.h>
 #include <smem.h>
 #include <fdt_support.h>
 #include <asm/arch/dram.h>

diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h
index e9ac86b2da69dbe66798de5c4592d9ffbd38a1f3..4941e2d74f09343cfa6106b79a993ed83c2e1af0 100644 (file)
--- a/arch/x86/include/asm/fsp/fsp_api.h
+++ b/arch/x86/include/asm/fsp/fsp_api.h
@@ -6,6 +6,8 @@
 #ifndef __ASM_FSP_API_H
 #define __ASM_FSP_API_H
 
+#include <linux/linkage.h>
+
 enum fsp_phase {
        /* Notification code for post PCI enuermation */
        INIT_PHASE_PCI  = 0x20,

diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h
index 511dfb78b81dae33a009938529df9b3ce5f46f7d..7492c87c34ab011febfaa4133178a1fd3f84597f 100644 (file)
--- a/arch/x86/include/asm/fsp/fsp_fv.h
+++ b/arch/x86/include/asm/fsp/fsp_fv.h
@@ -7,6 +7,8 @@
 #ifndef __FSP_FV___
 #define __FSP_FV___
 
+#include <efi.h>
+
 /* Value of EFI_FV_FILE_ATTRIBUTES */
 #define EFI_FV_FILE_ATTR_ALIGNMENT     0x0000001F
 #define EFI_FV_FILE_ATTR_FIXED         0x00000100

diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 56d69cddacf2aac7163282fa083788f1fadb9c8f..1ed6b2aa929698adbe4813d3f26055d8b85dfaf9 100644 (file)
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <part.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>

diff --git a/cmd/ab_select.c b/cmd/ab_select.c
index d0d957d4f9d67a653f63ecf030d84c1f2414e24e..7a4e51571b6d1b550a7c0d7ed014d89dd58b4c70 100644 (file)
--- a/cmd/ab_select.c
+++ b/cmd/ab_select.c
@@ -3,8 +3,10 @@
  * Copyright (C) 2017 The Android Open Source Project
  */
 
+#include <common.h>
 #include <android_ab.h>
 #include <command.h>
+#include <part.h>
 
 static int do_ab_select(cmd_tbl_t *cmdtp, int flag, int argc,
                        char * const argv[])

diff --git a/cmd/bcb.c b/cmd/bcb.c
index 62f9a44e38a35a078c4fd496b2a7f62f2ffe40a3..b944e62b6a92225626228d1c372eafa5fa464d9d 100644 (file)
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -8,6 +8,7 @@
 #include <android_bootloader_message.h>
 #include <command.h>
 #include <common.h>
+#include <part.h>
 
 enum bcb_cmd {
        BCB_CMD_LOAD,

diff --git a/cmd/fat.c b/cmd/fat.c
index 854fe274bcf4c758d00389c86857cdbd3eb25b1f..a063a623ceda542567df4a803c580f9655d56d7d 100644 (file)
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <fat.h>
 #include <fs.h>
+#include <part.h>
 #include <asm/cache.h>
 
 int do_fat_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

diff --git a/cmd/gpt.c b/cmd/gpt.c
index f2b1ad5489bc6ad79f5001521cb4cf3fb6d4f001..c2964d85086dfee23c279844b9fcfc3ef2db4729 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -11,9 +11,11 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <env.h>
 #include <malloc.h>
 #include <command.h>
+#include <part.h>
 #include <part_efi.h>
 #include <exports.h>
 #include <uuid.h>

diff --git a/cmd/mmc.c b/cmd/mmc.c
index 6142ec8e2058abda9f5eb425e83fd3eb246e2416..a29650b28efb7f96916fdb848ae8be28cd7ec0bc 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
 #include <mmc.h>
+#include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
 

diff --git a/cmd/nvme.c b/cmd/nvme.c
index 5da903bd524dc924b2b8284ef723c0062bfa15e0..9ae91ce9cb5aac33ed456ece9df71a8f1374caab 100644 (file)
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <nvme.h>

diff --git a/cmd/sata.c b/cmd/sata.c
index 6bdb516cb5d0cd3c71fb608c063eb0dfea6acbde..c507e9dbd80ff51d4988771f4b644bc97b5d8657 100644 (file)
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <blk.h>
 #include <dm.h>
 #include <command.h>
 #include <part.h>

diff --git a/cmd/scsi.c b/cmd/scsi.c
index 67de1a3bdc2c0085f393d18ba5f8d509348fb1d3..e81194de0f4199119663c1542807d27a506feeda 100644 (file)
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -8,6 +8,7 @@
  * SCSI support.
  */
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <scsi.h>
 

diff --git a/cmd/unzip.c b/cmd/unzip.c
index afd58e7cdb12757c3cf333919e2087d711213ecd..725624627c10bcbba10b28e42e69bc47a838548b 100644 (file)
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <gzip.h>
+#include <part.h>
 
 static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {

diff --git a/cmd/usb.c b/cmd/usb.c
index dd9ac0bc9761d1fbb593256f042b2a2d7b20ba64..98fa300dfe4ca4e676d14f9fc9b11e0c61224872 100644 (file)
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
 #include <dm.h>

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 52ff637e2fb0d1d82f66537c6ce62a799fa8086f..b60373024878ee4712ea931cc8cb5116e3e8b53b 100644 (file)
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -6,10 +6,11 @@
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
  */
 
-#include <errno.h>
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
+#include <errno.h>
 #include <g_dnl.h>
 #include <malloc.h>
 #include <part.h>

diff --git a/cmd/virtio.c b/cmd/virtio.c
index b7082bc63adcda0c77c4955f558edbf3157b539e..f38cc56598caebaf4568c066c1767d9c7a8a101f 100644 (file)
--- a/cmd/virtio.c
+++ b/cmd/virtio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <virtio_types.h>

diff --git a/common/android_ab.c b/common/android_ab.c
index b5b8af1b2784be5805134ccfc17a2ce521512f47..72025bb552c175763769910692f50e9e10a2f9ad 100644 (file)
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -5,9 +5,11 @@
 #include <common.h>
 #include <android_ab.h>
 #include <android_bootloader_message.h>
+#include <blk.h>
 #include <malloc.h>
-#include <linux/err.h>
+#include <part.h>
 #include <memalign.h>
+#include <linux/err.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 

diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 954133ba84e9841b2646810f19dfe275603895f4..3898041d106c926e85016bc69330b6dd7fba7745 100644 (file)
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <part.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <ext4fs.h>

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index fcdd3caeac76efa1d03fc74125aeacfb783b2ddf..95d5a7271f5e9b69a1050f90c88dce16af71adb4 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <part.h>
 #include <spl.h>
 #include <linux/compiler.h>
 #include <errno.h>

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 76af7cc6bd40f5082df86adc3783d4305dfd0d7f..aba9ccb7f5b7bfd58062a6726cfd334d835ea12a 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -33,6 +33,7 @@
 
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <errno.h>

diff --git a/disk/part.c b/disk/part.c
index 68cba61c5a05a864b1bc03f44246c7f3cbe86b0e..bb0f6e20469e2439c20a2399b65f8ecee8dc8708 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <env.h>
 #include <errno.h>

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 5a17d11b9b7950ed502cfa6aa9c2673b7d77eabc..7eea60b564de3312c1add557f8dc8d0c446040c6 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <ide.h>
 #include "part_amiga.h"
+#include <part.h>
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
 

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 6e2a11090cb4648158e21c99425cf9e9f7314740..04f53106f7ce8762aa89468397c969bb0fd4ae65 100644 (file)
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -14,10 +14,12 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <ide.h>
 #include <memalign.h>
 #include "part_dos.h"
+#include <part.h>
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
 

diff --git a/disk/part_efi.c b/disk/part_efi.c
index 6b206ddb4fb1ee53c427ecd7adf09b8cd425dd64..72bfb4b609ade53e0da5c1aa27787445fa5c0bbf 100644 (file)
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -9,10 +9,12 @@
  *   when CONFIG_SYS_64BIT_LBA is not defined, lbaint_t is 32 bits; this
  *   limits the maximum size of addressable storage to < 2 Terra Bytes
  */
+#include <common.h>
+#include <blk.h>
+#include <part.h>
 #include <uuid.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
-#include <common.h>
 #include <command.h>
 #include <fdtdec.h>
 #include <ide.h>

diff --git a/disk/part_iso.c b/disk/part_iso.c
index 2ccb7867c9b846ec287b6207fcbe23a91068b7e0..822f2c4d9f4084abf7e3424d8face1e55a353108 100644 (file)
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
+#include <part.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include "part_iso.h"

diff --git a/disk/part_mac.c b/disk/part_mac.c
index fbd0ad73e35ddfc3b2f7eb4eba5b3d573bd60133..cda497e04a66dc3b67beaed4f716f8118f3b16cf 100644 (file)
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <ide.h>
 #include "part_mac.h"
+#include <part.h>
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
 

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 4cd7420c3cac38f84bd2a7a29b2e7397e5061ebf..d54acc96ee4f6dfcbc367901987705ed9f05d699 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -9,6 +9,7 @@
  * This driver provides a SCSI interface to SATA.
  */
 #include <common.h>
+#include <blk.h>
 #include <cpu_func.h>
 
 #include <command.h>

diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index d2aa1a64d1f933bdb3c27cf83fdceff99d1e1069..6a71f17684d5b73aca0480f0854f9ce6ac7bb51e 100644 (file)
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <blk.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <dwc_ahsata.h>
@@ -13,6 +14,7 @@
 #include <libata.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <part.h>
 #include <sata.h>
 #include <asm/cache.h>
 #include <asm/io.h>

diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index c6680dc1c98f06c572ced5a371d0bf910b913a54..0ef70d0d59af141d530c2d389053224ea4eeef32 100644 (file)
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
 #include <cpu_func.h>

diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index e384b805b212cc3574fefd472c97f577c9628f6c..6a38d5002455f2a3a0743ea94034c21f91e971d1 100644 (file)
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -11,7 +11,9 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <blk.h>
 #include <dm.h>
+#include <part.h>
 #include <sata.h>
 
 #ifndef CONFIG_AHCI

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 7f51fb693e96cffb361b5050be3779b03d2a2ad5..552c53282603c2f68a7d27fe193a59650a26658d 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -33,6 +33,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <blk.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/cache.h>

diff --git a/drivers/ata/sata_sandbox.c b/drivers/ata/sata_sandbox.c
index a28ac56ccd9bc54d664e0d9ca8d9cccb70df2c70..e64cc4a5c10c2bb7e5a4bd4fe1f72307a270683e 100644 (file)
--- a/drivers/ata/sata_sandbox.c
+++ b/drivers/ata/sata_sandbox.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 
 int init_sata(int dev)
 {

diff --git a/drivers/ata/sata_sil3114.c b/drivers/ata/sata_sil3114.c
index 41635742a81737fffcae4dd053d539700785d95c..4a7ffad6bdfb166c261cc0482df3944c6ff2f445 100644 (file)
--- a/drivers/ata/sata_sil3114.c
+++ b/drivers/ata/sata_sil3114.c
@@ -8,6 +8,8 @@
  */
 
 #include <common.h>
+#include <blk.h>
+#include <part.h>
 #include <pci.h>
 #include <command.h>
 #include <config.h>

diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 7c39aa5f2f5fd99c34101a1f636e7dba95bd9d28..4bda74bd067cefb06cca803089f00dfeed52ed27 100644 (file)
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <part.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>

diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index 0c343f7b6460add4cfd9c3cb2bd1fbb2195640a3..e3ee778c29d20b7fab46a81c813bbefd8b357096 100644 (file)
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -5,6 +5,8 @@
  */
 
 #include <common.h>
+#include <blk.h>
+#include <part.h>
 #include <linux/err.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)

diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c
index ea40929e3e520e6748e151561cc8ea9ed55626c9..6a8f789ff0888c80cba79628f378da3a8e362747 100644 (file)
--- a/drivers/block/blkcache.c
+++ b/drivers/block/blkcache.c
@@ -4,8 +4,8 @@
  * Author: Eric Nelson<eric@nelint.com>
  *
  */
-#include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <malloc.h>
 #include <part.h>
 #include <linux/ctype.h>

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 67cc4fbc02eee2de58600a40764e9aaf58d9451a..868726c50c25d781790435c9e3ee910d0fa0268a 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -6,8 +6,10 @@
 
 #include <common.h>
 #include <ata.h>
+#include <blk.h>
 #include <dm.h>
 #include <ide.h>
+#include <part.h>
 #include <watchdog.h>
 #include <asm/io.h>
 

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index cddca0c45fe3f327e3d06543c9d208c6cd53a645..8cd466f02e5746f98c6930da1b8a3c496666f86e 100644 (file)
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -14,6 +14,7 @@
 #include <ext4fs.h>
 #include <fat.h>
 #include <mmc.h>
+#include <part.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 467a8618fe3cf80e5611a8a7c7b018e630137719..52da34b1e37e6fe5f79eaec3d8c79189ef46d1cb 100644 (file)
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -10,6 +10,7 @@
 #include <fb_mmc.h>
 #include <fb_nand.h>
 #include <fs.h>
+#include <part.h>
 #include <version.h>
 
 static void getvar_version(char *var_parameter, char *response);

diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index b165468145060a851f1d68c868cf2518c4f25f2e..eb8a36f29222cc2afbcc8c7124ea904f8d8f5dff 100644 (file)
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <flash.h>
 
 #include <fastboot.h>

diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 0dbf304487fc6c8793666722868771d36af583c6..8fdaacd5e04c05a65e857403b1351410d94b62e5 100644 (file)
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <fsl_ifc.h>
+#include <part.h>
 
 #ifdef CONFIG_TFABOOT
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 523c0559676d8263a269a98f3e63246d2f725413..ca62bb9891e35190604b10be25c76f9594a48767 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <dm/device-internal.h>

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index b52ff9f3bc0fd53d9cd769b9f80a2d5dd2fa26fb..6a4453ca02e76e9d8db2fadab59aff83c24b8ac2 100644 (file)
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <dm.h>
 #include <part.h>
 #include <div64.h>

diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 2202158c88afa03fdb42109bb5fe2ceefd3035ea..4851198571c561cff44caaa2443ece3b60abc406 100644 (file)
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <dm.h>
+#include <part.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/compat.h>

diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index 0983fbced3fb19151f5c576cb16a0d1b554dfc75..b7e37416a49b8d0c27ed10be5773f476eba219c6 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
+#include <part.h>
 #include <linux/mtd/rawnand.h>
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>

diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 5f1a0233525cf56b1efd7346b4cca0568f72f801..1d0c9988b1e778ca3f7140b5e8793467af9bb041 100644 (file)
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -5,6 +5,7 @@
  *     Dave Liu <daveliu@freescale.com>
  */
 #include <common.h>
+#include <part.h>
 #include <asm/io.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>

diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c
index 2d88efdb619ba6500a76631ac52842f4ddfe945d..277e31e1f3973de54198312d9884693d85a49bd5 100644 (file)
--- a/drivers/nvme/nvme-uclass.c
+++ b/drivers/nvme/nvme-uclass.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <errno.h>
 #include <dm.h>
 #include <dm/device.h>

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index ef4382da1a1f17f9d9ebebd52dbbc83dfceb178d..5e75152f421eee4387bb9e175d07b0dec83441a4 100644 (file)
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 69de6a53d56a3d226f8f44f56f1aa345283ec4e6..849c42f0cd2c0a53503d1b3f3b20aab6a1ec0366 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <dm.h>
 #include <env.h>
+#include <part.h>
 #include <pci.h>
 #include <scsi.h>
 #include <dm/device-internal.h>

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 8533abfd9301835caa591727ae6395f2d8e67460..33f9a44d04356c9bd9218b13b83ae1b47c789482 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <console.h>
 #include <env.h>
+#include <part.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/usb/ch9.h>

diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 1cfeabcd31ae7c318cb9a7136bd87e4e9560a5fd..da3d63c0f0d9a1f229fcf896127a681a6c78bae7 100644 (file)
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <part.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>

diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 62acccedf377ee1ba6d823f7129bb8fae9262c5c..0fd74fdec9642353d282a2925f1c394a3bc8dea3 100644 (file)
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <malloc.h>
+#include <part.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index bd2e9c0c9bf5a569c1023ab258258937ed717c50..8cc2eb1973e30080398e6bb43c30ccb2c70d7191 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -9,6 +9,7 @@
 #include <atmel_lcd.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <part.h>
 #include <video.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>

diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index db8eb4ade8855f54e8c9938c754fc21113610915..f8ed0a9fea230a1ea184bd75c80615ca0134dd58 100644 (file)
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <part.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/global_data.h>

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index ed47192bf639b93f2a9a17cbf59912a91a28cf84..60fa263d743227c51cf7b80e0f2e7c407d7d8283 100644 (file)
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <efi_loader.h>
 #include <fdt_support.h>
+#include <part.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>

diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index 2907c533783f34b2b9aec3d6b2944d6040e113b2..d5ed8d009627d914de9d84aad6fa75f7dff537fe 100644 (file)
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <part.h>
 #include <video.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>

diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index c6e7a3533886db3c712b4e5df29320dab36e254a..93383eba9c39f8167af8a5c0e312f4c42085bd92 100644 (file)
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -12,6 +12,7 @@
 #include <efi_loader.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
+#include <part.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>

diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 1fa052e306e1a6d63498d30f895d183e6b6baf0e..82ba5c4e7ec5efd14f79d6589149cf193bd7e48b 100644 (file)
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <panel.h>
+#include <part.h>
 #include <pwm.h>
 #include <video.h>
 #include <asm/cache.h>

diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index f08f117cf8d6108c2720edfcbeee771829a5606f..913beab4d492fe43aceeefb6c9b033453b14bc20 100644 (file)
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -12,6 +12,7 @@
 #include <display.h>
 #include <edid.h>
 #include <lcd.h>
+#include <part.h>
 #include <video.h>
 #include <asm/gpio.h>
 #include <asm/io.h>

diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index e793e34e836640c283ecb524d4dfe1e71b0fa50a..992118c60758470c05c19cb3ac4b5ff1d67a4c00 100644 (file)
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <blk.h>
 #include <dm.h>
+#include <part.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>

diff --git a/env/ext4.c b/env/ext4.c
index 6b5c4d855a1ae7693b7de03c993bf0be8ec74a8b..8e90bb71b75681a14e3240bd3508576ef3863e32 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <part.h>
 
 #include <command.h>
 #include <env.h>

diff --git a/env/fat.c b/env/fat.c
index f13b88b5f62ef2d4f4d952a16883e8aa6fc958c3..35a1955e634330e6b5bb5160b809b5bec20f4a66 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -7,18 +7,18 @@
  */
 
 #include <common.h>
-#include <asm/cache.h>
-
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <linux/stddef.h>
+#include <part.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <search.h>
 #include <errno.h>
 #include <fat.h>
 #include <mmc.h>
+#include <asm/cache.h>
+#include <linux/stddef.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg@chromium.org): Figure out why this is needed */

diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c
index e686abc5e3b2e73af86716bbebefb2c4337ecd27..1e5b83235ad5f8674857fc2ec8e76149355b1620 100644 (file)
--- a/fs/btrfs/dev.c
+++ b/fs/btrfs/dev.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <compiler.h>
 #include <fs_internal.h>
 

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b693a073fc0b9106719ca9fecca33125778a2c95..f80c14862768b97f59b0695b778e3a364332ba16 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -5,9 +5,11 @@
  * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
  */
 
-#include "btrfs.h"
+#include <common.h>
 #include <memalign.h>
+#include <part.h>
 #include <linux/compat.h>
+#include "btrfs.h"
 
 #define BTRFS_SUPER_FLAG_SUPP  (BTRFS_HEADER_FLAG_WRITTEN      \
                                 | BTRFS_HEADER_FLAG_RELOC      \

diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 5bf78b530a989108e9298f4c374f7794de10a9a5..9adef57476a0ce27d6f71b7d108ceff1f8040db9 100644 (file)
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -19,10 +19,12 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <part.h>
 #include <stddef.h>
 #include <linux/stat.h>
 #include <linux/time.h>

diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 0ceb73d9c916201327f89dcc04bfc546ac4bc4dc..2a8d397af4b2a958ea6e381fbb7da657d923141d 100644 (file)
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <ext4fs.h>
 #include <malloc.h>
 #include <ext_common.h>

diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 67aeba1339d84298fb2c9b4335b6be391322dec4..ce1fddc9a47af73a1adef36c2167231cbbb5a5fb 100644 (file)
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -22,8 +22,10 @@
 
 
 #include <common.h>
+#include <blk.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <part.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include "ext4_common.h"

diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index ad71f5ab6e256963c2a4afd20ca6f8ead630b6b8..4c89152ce4ad88004fd9e2a1fe0ce4b09afbd2b9 100644 (file)
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -21,11 +21,13 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
 #include "ext4_common.h"
 #include <div64.h>
 #include <malloc.h>
+#include <part.h>
 #include <uuid.h>
 
 int ext4fs_symlinknest;

diff --git a/fs/fs.c b/fs/fs.c
index e3de25da5b6ebe0ef5feda217c4611f93ad37f92..061917a984704ee43a49656cebba12a8fa59168b 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <common.h>
 #include <env.h>
+#include <lmb.h>
 #include <mapmem.h>
 #include <part.h>
 #include <ext4fs.h>

diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 1ff804d13ba85f86d2c7f73a26d4d6f0e109dea9..115c010ef8856a82f7c5e1cd01077cf2bde0ae38 100644 (file)
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <compiler.h>
 #include <part.h>
 #include <memalign.h>

diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 5851fe2434f5b563c3ce5fab53857c995d6118ae..4ae41d5b4db19b0bdf61ec42698a2eb0af503522 100644 (file)
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -7,6 +7,7 @@
 #include <fs.h>
 #include <malloc.h>
 #include <os.h>
+#include <sandboxfs.h>
 
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info)
 {

diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 742c2f47ebf6ebcd8fac4e90b64ba1e4c4f8336d..bb3551238033c104f2bfd10af2e8b024b7fce435 100644 (file)
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include "ubifs.h"
+#include <part.h>
 #include <dm/devres.h>
 #include <u-boot/zlib.h>
 

diff --git a/include/android_ab.h b/include/android_ab.h
index 3f4e69be9ef727e6177897ca3f14c419511beaa5..0941eb6b9cc4556f491f2d68793cd019be05854d 100644 (file)
--- a/include/android_ab.h
+++ b/include/android_ab.h
@@ -6,7 +6,8 @@
 #ifndef __ANDROID_AB_H
 #define __ANDROID_AB_H
 
-#include <common.h>
+struct blk_desc;
+struct disk_partition;
 
 /* Android standard boot slot names are 'a', 'b', 'c', ... */
 #define BOOT_SLOT_NAME(slot_num) ('a' + (slot_num))

diff --git a/include/btrfs.h b/include/btrfs.h
index f7f82ad7d1091d32f765bd52aaf72e6d4e1d1204..a7605e15897039c059e29d8fdd26551a33daa959 100644 (file)
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -8,6 +8,9 @@
 #ifndef __U_BOOT_BTRFS_H__
 #define __U_BOOT_BTRFS_H__
 
+struct blk_desc;
+struct disk_partition;
+
 int btrfs_probe(struct blk_desc *fs_dev_desc,
                struct disk_partition *fs_partition);
 int btrfs_ls(const char *);

diff --git a/include/common.h b/include/common.h
index a900596c5f9a5c6b715f1ad41167a81e241b3db7..85a211554a1a7c2f278860b77a9c383c4924daae 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
-#include <part.h>
 #include <image.h>
 #include <log.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 75c20e4679507791119409562925b5077ff42b14..20f86c3a9fe276360c8b92bc8dfdd97f1bbc9b38 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -9,11 +9,14 @@
 #define _EFI_LOADER_H 1
 
 #include <common.h>
+#include <blk.h>
 #include <part_efi.h>
 #include <efi_api.h>
 #include <image.h>
 #include <pe.h>
 
+struct blk_desc;
+
 static inline int guidcmp(const void *g1, const void *g2)
 {
        return memcmp(g1, g2, sizeof(efi_guid_t));

diff --git a/include/ext4fs.h b/include/ext4fs.h
index aafcd841402de7c53a51a3605414b8decd562ce7..cb5d9cc0a5c050dcc0fa33b22eb72c4a8555205d 100644 (file)
--- a/include/ext4fs.h
+++ b/include/ext4fs.h
@@ -28,6 +28,8 @@
 #define __EXT4__
 #include <ext_common.h>
 
+struct disk_partition;
+
 #define EXT4_INDEX_FL          0x00001000 /* Inode uses hash tree index */
 #define EXT4_EXTENTS_FL                0x00080000 /* Inode uses extents */
 #define EXT4_EXT_MAGIC                 0xf30a

diff --git a/include/fat.h b/include/fat.h
index 84573fd3fe90869c92fc11b2c8f8f3fa6d2f2170..02742f92a5c879869c0fa9855b29dba724ac1858 100644 (file)
--- a/include/fat.h
+++ b/include/fat.h
@@ -12,6 +12,8 @@
 #include <asm/byteorder.h>
 #include <fs.h>
 
+struct disk_partition;
+
 /* Maximum Long File Name length supported here is 128 UTF-16 code units */
 #define VFAT_MAXLEN_BYTES      256 /* Maximum LFN buffer in bytes */
 #define VFAT_MAXSEQ            9   /* Up to 9 of 13 2-byte UTF-16 entries */

diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 0c58109e2f86d3b9cc8cbd689cc5d8029c0bcdb4..76ed7cd6be11c977d787f57a561ad7df52f67559 100644 (file)
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -6,6 +6,9 @@
 #ifndef _FB_MMC_H_
 #define _FB_MMC_H_
 
+struct blk_desc;
+struct disk_partition;
+
 /**
  * fastboot_mmc_get_part_info() - Lookup eMMC partion by name
  *

diff --git a/include/fs.h b/include/fs.h
index 37e35c21206e96a1dac5320f28295cc92a595e15..9fdb4a342492d610a01a2b19bd9c5b77e81ac466 100644 (file)
--- a/include/fs.h
+++ b/include/fs.h
@@ -14,6 +14,8 @@
 #define FS_TYPE_UBIFS  4
 #define FS_TYPE_BTRFS  5
 
+struct blk_desc;
+
 /**
  * do_fat_fsload - Run the fatload command
  *

diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index 3edcc39f4e2ee338b582f8e5dd6049fad4435cd3..fd915335b2c26c9fdc6e73f5370ead00d756a5c1 100644 (file)
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -10,6 +10,7 @@
 #ifdef CONFIG_FSL_IFC
 #include <config.h>
 #include <common.h>
+#include <part.h>
 #ifdef CONFIG_ARM
 #include <asm/arch/soc.h>
 #endif

diff --git a/include/gzip.h b/include/gzip.h
index 2e340673c38a601dc72beb7876123b6c7f1cfe9a..783acbb60d2a4b6ca76f9ca4d80a719426e1abb1 100644 (file)
--- a/include/gzip.h
+++ b/include/gzip.h
@@ -7,6 +7,8 @@
 #ifndef __GZIP_H
 #define __GZIP_H
 
+struct blk_desc;
+
 /**
  * gzip_parse_header() - Parse a header from a gzip file
  *

diff --git a/include/initcall.h b/include/initcall.h
index b5acdd01bdb4cf0a3e45e583ad74ff7ceef8295d..c871767e20ad10f97e98329eec453b58d77f1dad 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -8,6 +8,10 @@
 
 typedef int (*init_fnc_t)(void);
 
+#ifdef CONFIG_EFI_APP
+#include <efi.h>
+#endif
+
 /*
  * To enable debugging. add #define DEBUG at the top of the including file.
  *

diff --git a/include/reiserfs.h b/include/reiserfs.h
index a655d5ea9fce4fc24a0db4d2cb995e7ebd1a1763..b61bb6006791766b74f9ee5f1f2016263e8d507e 100644 (file)
--- a/include/reiserfs.h
+++ b/include/reiserfs.h
@@ -18,6 +18,9 @@
 #define SECTOR_SIZE            0x200
 #define SECTOR_BITS            9
 
+struct blk_desc;
+struct disk_partition;
+
 /* Error codes */
 typedef enum
 {

diff --git a/include/sandboxfs.h b/include/sandboxfs.h
index 49724d05c89fc23cc70d1e203b28b4be9ca428ae..783dd5c88a7325c3ddccedce87c04acb0335adfd 100644 (file)
--- a/include/sandboxfs.h
+++ b/include/sandboxfs.h
@@ -18,6 +18,9 @@
 #ifndef __SANDBOX_FS__
 #define __SANDBOX_FS__
 
+struct blk_desc;
+struct disk_partition;
+
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info);
 
 int sandbox_fs_read_at(const char *filename, loff_t pos, void *buffer,

diff --git a/include/spl.h b/include/spl.h
index 5a67c826c26a6a683494dedc9b9d6c0aa6eb2dda..abd75c61cd55672d1b9c2336e5fc3e7e5190cc6f 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -26,6 +26,7 @@ struct image_header;
 #define MMCSD_MODE_FS          2
 #define MMCSD_MODE_EMMCBOOT    3
 
+struct blk_desc;
 struct image_header;
 
 /*

diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h
index 16b757286e40386b932bb01ae8017f5ead04f4d8..b025779d59ff679c2748c7e5948cb0fda8bc2466 100644 (file)
--- a/include/ubifs_uboot.h
+++ b/include/ubifs_uboot.h
@@ -14,6 +14,9 @@
 #ifndef __UBIFS_UBOOT_H__
 #define __UBIFS_UBOOT_H__
 
+struct blk_desc;
+struct disk_partition;
+
 int ubifs_init(void);
 int uboot_ubifs_mount(char *vol_name);
 void uboot_ubifs_umount(void);

diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 33e66fcad2e745ecd4ef862d865bf3d56ec4cd71..e7d8745ad858bc2ca0bb5274a0adc742d4ffbbfd 100644 (file)
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -28,6 +28,8 @@
  * iPXE uses the simple file protocol to load Grub or the Linux Kernel.
  */
 
+#include <common.h>
+#include <blk.h>
 #include <efi_driver.h>
 #include <malloc.h>
 #include <dm/device-internal.h>

diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index af1adbb71efebf40a2264ff3cf5e66087164a934..49bebb58cc25377bee719d585a76e339fe012c88 100644 (file)
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <efi_loader.h>
 
 #define MAC_OUTPUT_LEN 22

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 1fe7cf539e3900c4412612e983c815f4b42794d3..9233767ee26acef9adf2c452b41a3405f20bba4f 100644 (file)
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <fs.h>
+#include <part.h>
 
 /* GUID for file system information */
 const efi_guid_t efi_file_system_info_guid = EFI_FILE_SYSTEM_INFO_GUID;

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 9e6ccd692a39d43607eaf5afbd62bc95765d9e69..bee3b9261f3449c438c43fac77bac45cde127238 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
 #include <div64.h>

diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index df623adc58e8d85667ee5fcff4af689127ba506f..3170c024f7b5b0de71d0cdc323a95d850efd1e77 100644 (file)
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -36,6 +36,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <blk.h>
 #include <image-sparse.h>
 #include <div64.h>
 #include <malloc.h>

diff --git a/test/dm/blk.c b/test/dm/blk.c
index 9c71adc69d914977a9cb0460980c949a4ae3af91..94b2855b8e9efa9aa5736022c08aba9474ead81f 100644 (file)
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <part.h>
 #include <usb.h>
 #include <asm/state.h>
 #include <dm/test.h>

diff --git a/test/dm/mmc.c b/test/dm/mmc.c
index 9ab0db1b66fee7f27489cd20311b6692d7e82491..49402b9c90298c59644f1fce3093ce5e1e2d5c37 100644 (file)
--- a/test/dm/mmc.c
+++ b/test/dm/mmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mmc.h>
+#include <part.h>
 #include <dm/test.h>
 #include <test/ut.h>
 

diff --git a/test/dm/usb.c b/test/dm/usb.c
index e396c2a0ea1c3e7a34db4380fe2a73f2a981df19..a25c2c1482061d0f2f16c8ac19c73ea31a0ee551 100644 (file)
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <console.h>
 #include <dm.h>
+#include <part.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/state.h>