This was being used by some Marvell boards to enable some file system related features (many of which have already been moved to Kconfig). Make the future migration of the final 2 or 3 config options easier by expanding #define CONFIG_SYS_MVFS into the options that it enables and remove CONFIG_SYS_MVFS.

Signed-off-by: Chris Packham judge.packham@gmail.com ---

README | 5 ----- include/configs/dns325.h | 3 ++- include/configs/ds414.h | 3 ++- include/configs/goflexhome.h | 3 ++- include/configs/guruplug.h | 4 +++- include/configs/ib62x0.h | 3 ++- include/configs/iconnect.h | 3 ++- include/configs/mv-common.h | 8 -------- include/configs/mv-plug-common.h | 7 ------- include/configs/nsa310s.h | 3 ++- include/configs/openrd.h | 3 ++- include/configs/pogo_e02.h | 3 ++- include/configs/sheevaplug.h | 4 +++- scripts/config_whitelist.txt | 1 - 14 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/README b/README index df1d5d67b4ad..fb331f910d0c 100644 --- a/README +++ b/README @@ -331,11 +331,6 @@ The following options need to be configured:

- Board Type: Define exactly one, e.g. CONFIG_MPC8540ADS.

-- Marvell Family Member - CONFIG_SYS_MVFS - define it if you want to enable - multiple fs option at one time - for marvell soc family - - 85xx CPU Options: CONFIG_SYS_PPC64

diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 5b78785ee255..dec71038bf21 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -27,7 +27,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

#define CONFIG_NR_DRAM_BANKS 1

diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 5b444542f4e9..27308c92ffb9 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -61,7 +61,8 @@ #endif

/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 1d9fe29f9ed4..8b05e0a53d71 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -41,7 +41,8 @@ * Commands configuration */

-#define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index d59cddb002e5..9e7ca60f112f 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -17,7 +17,9 @@ /* * Standard filesystems */ -#define CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 5f071d02b739..a7643166f417 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -26,7 +26,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 66131cca622b..1fe4618da5e5 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -28,7 +28,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index c7673838faf2..79d61c599e54 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -97,12 +97,4 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif

-/* - * File system - */ -#ifdef CONFIG_SYS_MVFS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS -#endif - #endif /* _MV_COMMON_H */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index fa2b59559205..81c07a889a36 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -16,13 +16,6 @@ /* Add target to build it automatically upon "make" */ #define CONFIG_BUILD_TARGET "u-boot.kwb"

-/* - * Compression configuration - */ -#ifdef CONFIG_SYS_MVFS -#define CONFIG_BZIP2 -#endif /* CONFIG_SYS_MVFS */ - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 4c320522d2f7..2f9043938341 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -22,7 +22,8 @@ #define CONFIG_BZIP2

/* commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/openrd.h b/include/configs/openrd.h index dfdad56dcc92..aa5425af02ea 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -23,7 +23,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 0416baef452a..a654df6d6f85 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -27,7 +27,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 656db45adf19..23dd5ceb7cb9 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -21,7 +21,9 @@ /* * Standard filesystems */ -#define CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS

/* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 705ed89a659f..aa6dec0c7bf6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3578,7 +3578,6 @@ CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL CONFIG_SYS_MTDPARTS_RUNTIME -CONFIG_SYS_MVFS CONFIG_SYS_MX5_CLK32 CONFIG_SYS_MX5_HCLK CONFIG_SYS_MX6_CLK32

On 26.05.2018 12:32, Chris Packham wrote:

mv-common.h and mv-plug-common.h still had comments delimiting sections of configuration options that have all been moved to Kconfig by previous treewide efforts. Remove the redundant comment sections.

Signed-off-by: Chris Packham judge.packham@gmail.com

include/configs/mv-common.h | 4 ---- include/configs/mv-plug-common.h | 8 -------- 2 files changed, 12 deletions(-)

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 8c5350ea0cef..c7673838faf2 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -28,10 +28,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000

-/*

• • CLKs configurations
• */
• /*
  • NS16550 Configuration
  */

diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index df686dbe4f6c..fa2b59559205 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -23,14 +23,6 @@ #define CONFIG_BZIP2 #endif /* CONFIG_SYS_MVFS */

-/*

• • Commands configuration
• */

-/*

• • Extra file system
• */
• /*
  • mv-common.h should be defined after CMD configs since it used them
  • to enable certain macros

Reviewed-by: Stefan Roese sr@denx.de

Thanks, Stefan