[U-Boot] [PATCH] configs: Remove CONFIG_MARVELL

Chris Packham judge.packham at gmail.com
Wed Nov 21 07:24:51 UTC 2018


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 at gmail.com>
---

 include/configs/edminiv2.h   | 1 -
 include/configs/km/km_arm.h  | 1 -
 include/configs/mv-common.h  | 1 -
 scripts/config_whitelist.txt | 1 -
 4 files changed, 4 deletions(-)

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 89aa11c0ed43..645fc3ffb81c 100644
--- 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 e2585171afb9..0de83f6723c5 100644
--- 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 5eeb5a162494..a80309316351 100644
--- 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 abfb0ff89fa9..2d5cad986897 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1200,7 +1200,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
-- 
2.19.1



More information about the U-Boot mailing list