From patchwork Tue Apr  7 02:40:14 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Simon Glass <sjg@chromium.org>
X-Patchwork-Id: 237261
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: sjg at chromium.org (Simon Glass)
Date: Mon,  6 Apr 2020 20:40:14 -0600
Subject: [PATCH 01/18] common: Drop uuid.h from common header
In-Reply-To: <20200407024032.82983-1-sjg@chromium.org>
References: <20200407024032.82983-1-sjg@chromium.org>
Message-ID: <20200406203250.1.I36629b17c76b81872773a2302a8ab42f01d1db99@changeid>

Move this uncommon header out of the common header.

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

 cmd/gpt.c                     | 1 +
 cmd/nvedit_efi.c              | 1 +
 cmd/x86/hob.c                 | 1 +
 disk/part_efi.c               | 1 +
 fs/btrfs/btrfs.c              | 1 +
 fs/ext4/ext4fs.c              | 1 +
 include/common.h              | 1 -
 lib/efi_loader/efi_variable.c | 1 +
 lib/uuid.c                    | 1 +
 lib/vsprintf.c                | 1 +
 net/bootp.c                   | 1 +
 11 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmd/gpt.c b/cmd/gpt.c
index efaf1bcecb2..e05ef4355bc 100644
--- 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 8ea0da01283..3fdeec945c6 100644
--- 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 3967a7ca5a7..29d9e3d5a27 100644
--- 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 b2e157d9c1e..2709aebd60e 100644
--- 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 cb7e1827422..2e3985e3855 100644
--- 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 966b427a974..96ca276839e 100644
--- 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 0ef8505fc79..a8242cafc51 100644
--- 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 fe2f2645913..81a678c2036 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -11,6 +11,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <search.h>
+#include <uuid.h>
 #include <u-boot/crc.h>
 
 #define READ_ONLY BIT(31)
diff --git a/lib/uuid.c b/lib/uuid.c
index 3d3c7abcaea..db26911414a 100644
--- 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 b4edee29b0d..de9ef902b96 100644
--- 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 505489140e8..c73a82e642c 100644
--- 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