common: Drop uuid.h from common header

Move this uncommon header out of the common header.

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

diff --git a/cmd/gpt.c b/cmd/gpt.c
index b8d11c167df776476a39e64137153e953b6538f8..98c788e75793f306dd615e52c8de9925c531b25e 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <part_efi.h>
 #include <exports.h>
+#include <uuid.h>
 #include <linux/ctype.h>
 #include <div64.h>
 #include <memalign.h>

diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 6f69a84feaa0e2d4fb146e8a1dc34a52b58119b8..75e4e51495353371a2c80994d41ac5cddb1965e9 100644 (file)
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -14,6 +14,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <uuid.h>
 #include <linux/kernel.h>
 
 /*

diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 3967a7ca5a79b0dc47d9cd05e5549f8bed0d88c2..29d9e3d5a27b708d15710c0c5256847b4bd3db5d 100644 (file)
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <efi.h>
+#include <uuid.h>
 #include <asm/hob.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/disk/part_efi.c b/disk/part_efi.c
index 83876a7bd979c2504abdb9deb1786190f79d2b3c..2970ce5babfcaf7b9907196a59d2e60b1f43fa22 100644 (file)
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -9,6 +9,7 @@
  *   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 <uuid.h>
 #include <asm/unaligned.h>
 #include <common.h>
 #include <command.h>

diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index cb7e18274221463528149ea9ad4c7569e2c21031..2e3985e38556795f1c324d45a3e43d8b527d139f 100644 (file)
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -8,6 +8,7 @@
 #include "btrfs.h"
 #include <config.h>
 #include <malloc.h>
+#include <uuid.h>
 #include <linux/time.h>
 
 struct btrfs_info btrfs_info;

diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 966b427a974ec7e45aea0c90ae0d8c4849c241ca..96ca276839e3733b113b4e95ad09396ede64ea9a 100644 (file)
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -26,6 +26,7 @@
 #include "ext4_common.h"
 #include <div64.h>
 #include <malloc.h>
+#include <uuid.h>
 
 int ext4fs_symlinknest;
 struct ext_filesystem ext_fs;

diff --git a/include/common.h b/include/common.h
index 0ef8505fc79326359b59a4b52cb10f413e749b1f..a8242cafc513655366bdb48ce8fbc03eda9fabbc 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -36,7 +36,6 @@
 #include <asm/global_data.h>   /* global data used for startup functions */
 #include <init.h>
 #include <display_options.h>
-#include <uuid.h>
 #include <vsprintf.h>
 #include <net.h>
 #include <bootstage.h>

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 10892684d1b22bde8fbcfc47ecc239037064a3b0..04080794cafa56c9b8a3f21e5c4f7616b6bd2c41 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <search.h>
+#include <uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <u-boot/crc.h>

diff --git a/lib/uuid.c b/lib/uuid.c
index c1cb9df6aac60f064428dc2216c537017fa73034..bdb137884c013a6ddf700940b21b53a9b9836c5e 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <time.h>
+#include <uuid.h>
 #include <linux/ctype.h>
 #include <errno.h>
 #include <common.h>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b4edee29b0dbe07e39cf1016d31fbc62c16beabb..de9ef902b96fff3a1044e430dd49e69fcedc4325 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <uuid.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/err.h>

diff --git a/net/bootp.c b/net/bootp.c
index 505489140e8a099a71f409bf9e8b8d443ac8ba2c..c73a82e642c2bffa4de5098328400282fc49fad0 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <efi_loader.h>
 #include <net.h>
+#include <uuid.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_LED_STATUS