From ea944003d57e9ac68774742b98bb15ca6a9b6d9c Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Wed, 28 Oct 2015 00:47:18 +0000
Subject: [PATCH] arm: kirkwood: Use common definition for filesystems

include/configs/mv-common.h brings in the required filesystems if
CONFIG_SYS_MVFS is defined, so use it for Sheevaplug and Guruplug.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
 include/configs/guruplug.h   | 25 ++++++++++---------------
 include/configs/sheevaplug.h | 25 ++++++++++---------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 3f52f11758..3a1f0fae76 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -32,7 +32,6 @@
  */
 #define CONFIG_BZIP2
 #define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Enable device tree support
@@ -49,6 +48,16 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_MII
 
+/*
+ * Standard filesystems
+ */
+#define CONFIG_SYS_MVFS
+
+/*
+ * Extra file system
+ */
+#define CONFIG_CMD_EXT4
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
@@ -124,20 +133,6 @@
 #define CONFIG_RTC_MV
 #endif /* CONFIG_CMD_DATE */
 
-/*
- * File system
- */
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-
 #define CONFIG_SYS_ALT_MEMTEST
 
 #endif /* _CONFIG_GURUPLUG_H */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 60294ff697..f466ee46ec 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -32,7 +32,6 @@
  */
 #define CONFIG_BZIP2
 #define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Enable device tree support
@@ -50,6 +49,16 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
 
+/*
+ * Standard filesystems
+ */
+#define CONFIG_SYS_MVFS
+
+/*
+ * Extra file system
+ */
+#define CONFIG_CMD_EXT4
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
@@ -134,20 +143,6 @@
 #define CONFIG_RTC_MV
 #endif /* CONFIG_CMD_DATE */
 
-/*
- * File system
- */
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-
 #define CONFIG_SYS_ALT_MEMTEST
 
 #endif /* _CONFIG_SHEEVAPLUG_H */
-- 
2.39.5