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/include/android_ab.h b/include/android_ab.h
index 3f4e69b..0941eb6 100644
--- 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 f7f82ad..a7605e1 100644
--- 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 a900596..85a2115 100644
--- 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 75c20e4..20f86c3 100644
--- 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 aafcd84..cb5d9cc 100644
--- 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 84573fd..02742f9 100644
--- 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 0c58109..76ed7cd 100644
--- 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 37e35c2..9fdb4a3 100644
--- 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 3edcc39..fd91533 100644
--- 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 2e34067..783acbb 100644
--- 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 b5acdd0..c871767 100644
--- 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 a655d5e..b61bb60 100644
--- 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 49724d0..783dd5c 100644
--- 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 5a67c82..abd75c6 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -26,6 +26,7 @@
#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 16b7572..b025779 100644
--- 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);