common: Drop flash.h from common header
Move this uncommon header out of the common header.
Fix up some style problems in flash.h while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 6872b0d..f82f3dd 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <console.h>
+#include <flash.h>
#include <asm/io.h>
#define MAX_REGIONS 4
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 9e2f1b0..c6bbed9 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -10,6 +10,7 @@
#include <command.h>
#include <cros_ec.h>
#include <dm.h>
+#include <flash.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index 230d840..df97fe7 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -9,6 +9,7 @@
*/
#include <common.h>
#include <command.h>
+#include <uuid.h>
#if defined(CONFIG_CMD_MTDPARTS)
#include <jffs2/jffs2.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index da2580d..748a73e 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -73,6 +73,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
+#include <flash.h>
#include <image.h>
#include <malloc.h>
#include <jffs2/jffs2.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index ef53153..f0ee54d 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
+#include <flash.h>
#include <image.h>
#include <vsprintf.h>
#include <errno.h>
diff --git a/cmd/sf.c b/cmd/sf.c
index e993b3e..2b9c268 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <div64.h>
#include <dm.h>
+#include <flash.h>
#include <malloc.h>
#include <mapmem.h>
#include <spi.h>