[U-Boot] [PATCH 19/47] Convert CONFIG_CMD_ERRATA to Kconfig

Simon Glass
2017-05-15T10:57:34Z

This converts the following to Kconfig:
CONFIG_CMD_ERRATA

Signed-off-by: Simon Glass <sjg@chromium.org>
---

arch/powerpc/cpu/mpc85xx/Kconfig | 8 ++++++++
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 +
configs/controlcenterd_TRAILBLAZER_defconfig | 1 +
include/configs/B4860QDS.h | 1 -
include/configs/BSC9131RDB.h | 1 -
include/configs/BSC9132QDS.h | 1 -
include/configs/C29XPCIE.h | 1 -
include/configs/MPC8572DS.h | 1 -
include/configs/P1010RDB.h | 1 -
include/configs/P1022DS.h | 1 -
include/configs/P2041RDB.h | 1 -
include/configs/T102xQDS.h | 1 -
include/configs/T102xRDB.h | 1 -
include/configs/T1040QDS.h | 1 -
include/configs/T104xRDB.h | 1 -
include/configs/T208xQDS.h | 1 -
include/configs/T208xRDB.h | 1 -
include/configs/T4240RDB.h | 1 -
include/configs/UCP1020.h | 1 -
include/configs/controlcenterd.h | 1 -
include/configs/corenet_ds.h | 1 -
include/configs/cyrus.h | 1 -
include/configs/km/kmp204x-common.h | 1 -
include/configs/t4qds.h | 1 -
scripts/config_whitelist.txt | 1 -
25 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index a87430cdbc..ca44e0a399 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -4,6 +4,14 @@ menu "mpc85xx CPU"
config SYS_CPU
default "mpc85xx"

+config CMD_ERRATA
+ bool "Enable the 'errata' command"
+ depends on MPC85xx
+ default y if MPC85xx
+ help
+ This enables the 'errata' command which displays a list of errata
+ work-arounds which are enabled for the current board.
+
choice
prompt "Target select"
optional
diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index b197116f1c..a7a31471c6 100644
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_ERRATA is not set
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_EEPROM=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index aee0f3af71..e12bbd8c46 100644
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_ERRATA is not set
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_EEPROM=y
# CONFIG_CMD_FLASH is not set
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index f8c19e1027..2d1e080df8 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 6f2a45a81d..1b342b6d14 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -293,7 +293,6 @@ extern unsigned long get_sdram_size(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 5f112a520a..3f51625f9b 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -521,7 +521,6 @@ combinations. this should be removed later
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 84365f11df..c6afb9a208 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -436,7 +436,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index e6aca11e50..ef3fd090ba 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -547,7 +547,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a101ebf07a..3e1378b866 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -726,7 +726,6 @@ extern unsigned long get_sdram_size(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index db66c309e7..85c050c8e4 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -593,7 +593,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index c3e3fae44f..a8cdfe1ea8 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -580,7 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index c87a73e818..7e4f097927 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -780,7 +780,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 0d6543a329..8bb6eb57f6 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -790,7 +790,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 432f3c7752..ad1d299154 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -661,7 +661,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 5577408015..d21a09c1a7 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -774,7 +774,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index a32ddeed1d..27693e19b9 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -745,7 +745,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 90ce554035..2ebfbb5b76 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -691,7 +691,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_REGINFO

#ifdef CONFIG_PCI
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index cc1f79940c..8b2a232405 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -272,7 +272,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index d004c645b4..6feb9894f9 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -424,7 +424,6 @@
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_ERRATA

/*
* USB
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 162d61e777..9196c86a91 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -344,7 +344,6 @@

#ifndef CONFIG_TRAILBLAZER

-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index f42ba795ea..85c51ed58b 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -593,7 +593,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 904da1a8ac..500987c36e 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -411,7 +411,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_REGINFO

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 9bfcfdefe9..664a64c55a 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -370,7 +370,6 @@ int get_scl(void);
* additionnal command line configuration.
*/
#define CONFIG_CMD_PCI
-#define CONFIG_CMD_ERRATA

/* we don't need flash support */
#undef CONFIG_FLASH_CFI_MTD
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 55b8e3ebfc..f4f9a38b2c 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -241,7 +241,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_IRQ

#ifdef CONFIG_PCI
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c91715ba9e..e981b45ee6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -384,7 +384,6 @@ CONFIG_CM922T_XA10
CONFIG_CMDLINE_EDITING
CONFIG_CMDLINE_PS_SUPPORT
CONFIG_CMDLINE_TAG
-CONFIG_CMD_ERRATA
CONFIG_CMD_ESBC_VALIDATE
CONFIG_CMD_ETHSW
CONFIG_CMD_FDC
--
2.13.0.rc2.291.g57267f2277-goog