configs: Remove CONFIG_MARVELL

This option is defined by a few boards but doesn't guard any code.
Remove it from the boards and config_whitelist.txt.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 89aa11c0ed4361aa6d1d836caed7659615db40a2..645fc3ffb81c1f91b9895315a039ca2bc2be7f61 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -29,7 +29,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_MARVELL         1
 #define CONFIG_FEROCEON                1       /* CPU Core subversion */
 #define CONFIG_88F5182         1       /* SOC Name */
 

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index e2585171afb9cd37a835b90ff4f39101176d1cb0..0de83f6723c5126c599453bff8196b4ea2e271d9 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -22,7 +22,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_MARVELL
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
 #define CONFIG_KW88F6281               /* SOC Name */
 

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 5eeb5a1624944f6555491f3a471aeea8572aa5d6..a8030931635186289842beb116b03aeb5e2fe8f5 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -19,7 +19,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_MARVELL         1
 
 /*
  * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7dd9d60541455be55780c36906637c8731741e83..69bef5e6dadb3ad06be972e1fc920fd23512a165 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1199,7 +1199,6 @@ CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MARCO_MEMSET
 CONFIG_MARUBUN_PCCARD
-CONFIG_MARVELL
 CONFIG_MARVELL_GPIO
 CONFIG_MARVELL_MFP
 CONFIG_MASK_AER_AO