From 854fcd553764709939ad542c2c5bd5470b780c2f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 26 Apr 2017 22:28:00 -0600 Subject: [PATCH] Convert CONFIG_CMD_CHIP_CONFIG to Kconfig This converts the following to Kconfig: CONFIG_CMD_CHIP_CONFIG Signed-off-by: Simon Glass --- arch/powerpc/cpu/ppc4xx/Kconfig | 8 ++++++++ configs/PMC405DE_defconfig | 1 + configs/arches_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/icon_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kilauea_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/t3corp_defconfig | 1 + include/configs/PMC405DE.h | 1 - include/configs/canyonlands.h | 1 - include/configs/icon.h | 1 - include/configs/intip.h | 1 - include/configs/io64.h | 1 - include/configs/katmai.h | 1 - include/configs/kilauea.h | 1 - include/configs/sequoia.h | 1 - include/configs/t3corp.h | 1 - scripts/config_whitelist.txt | 1 - 28 files changed, 25 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index a6066efe81..38121c1427 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -129,6 +129,14 @@ config TARGET_XILINX_PPC440_GENERIC endchoice +config CMD_CHIP_CONFIG + bool "Enable the 'chip_config' command" + help + This command programs the I2C bootstrap EEPROM or shows a list of + possible configurations. The configurations are board-specific + and control the CPU and peripehrals clocks. The programmed + configuration is then used when the board boots. + source "board/amcc/acadia/Kconfig" source "board/amcc/bamboo/Kconfig" source "board/amcc/bubinga/Kconfig" diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig index 7ac77d915b..50fdbd4dab 100644 --- a/configs/PMC405DE_defconfig +++ b/configs/PMC405DE_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_PMC405DE=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/arches_defconfig b/configs/arches_defconfig index da525800f2..c76c8d6ebf 100644 --- a/configs/arches_defconfig +++ b/configs/arches_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_ARCHES=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_DEFAULT_DEVICE_TREE="arches" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index 94e5e856b0..cbb0f2a69f 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_CANYONLANDS=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_DEFAULT_DEVICE_TREE="canyonlands" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig index 0d8a0cd768..f6b6c95028 100644 --- a/configs/devconcenter_defconfig +++ b/configs/devconcenter_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" devconcenter 0.06" CONFIG_4xx=y CONFIG_TARGET_INTIP=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER" diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index cf9a1d73a3..5a82757b6a 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig index bf1ae128ef..4601963930 100644 --- a/configs/glacier_ramboot_defconfig +++ b/configs/glacier_ramboot_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds" diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig index ddb0900ced..9e3d16dab9 100644 --- a/configs/haleakala_defconfig +++ b/configs/haleakala_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_KILAUEA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA" CONFIG_BOOTDELAY=5 diff --git a/configs/icon_defconfig b/configs/icon_defconfig index c2e510dd9b..117fcb559d 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_VIDEO=y CONFIG_4xx=y CONFIG_TARGET_ICON=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/intip_defconfig b/configs/intip_defconfig index bd199564fa..eb47db4f0c 100644 --- a/configs/intip_defconfig +++ b/configs/intip_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" intip 0.06" CONFIG_4xx=y CONFIG_TARGET_INTIP=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="INTIB" diff --git a/configs/io64_defconfig b/configs/io64_defconfig index 3eb3ff6aa3..9701135f98 100644 --- a/configs/io64_defconfig +++ b/configs/io64_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" io64 0.02" CONFIG_4xx=y CONFIG_TARGET_IO64=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig index aee12e7b99..9c80f06d94 100644 --- a/configs/katmai_defconfig +++ b/configs/katmai_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_KATMAI=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig index eea989a9d3..2ec7fa84d5 100644 --- a/configs/kilauea_defconfig +++ b/configs/kilauea_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_KILAUEA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="KILAUEA" CONFIG_BOOTDELAY=5 diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig index aa3b9cc2f7..0a0b4ddd9f 100644 --- a/configs/rainier_defconfig +++ b/configs/rainier_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_SEQUOIA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAINIER" CONFIG_BOOTDELAY=5 diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig index ed9eb356b4..6690e9b568 100644 --- a/configs/rainier_ramboot_defconfig +++ b/configs/rainier_ramboot_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_SEQUOIA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds" CONFIG_BOOTDELAY=5 diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig index 554d12483b..628cdd8b05 100644 --- a/configs/sequoia_defconfig +++ b/configs/sequoia_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_SEQUOIA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA" CONFIG_BOOTDELAY=5 diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig index 3214d45f94..ddafa27581 100644 --- a/configs/sequoia_ramboot_defconfig +++ b/configs/sequoia_ramboot_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_SEQUOIA=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds" CONFIG_BOOTDELAY=5 diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig index a804e95b40..21c4c89212 100644 --- a/configs/t3corp_defconfig +++ b/configs/t3corp_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_T3CORP=y +CONFIG_CMD_CHIP_CONFIG=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index a7d7bbf10b..2c5bcbd60e 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,7 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 9babc3d62c..5c1422d347 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -372,7 +372,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #if defined(CONFIG_ARCHES) #define CONFIG_CMD_DTT #define CONFIG_CMD_PCI diff --git a/include/configs/icon.h b/include/configs/icon.h index 3cb2196d79..b459366719 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -159,7 +159,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/intip.h b/include/configs/intip.h index 3477059865..7f73b66b55 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -272,7 +272,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE #define CONFIG_CMD_DTT #define CONFIG_CMD_PCI diff --git a/include/configs/io64.h b/include/configs/io64.h index 8619de4af9..8e754fc10b 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -373,7 +373,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DTT #define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 45c1e06fbd..f33bfd6f44 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -170,7 +170,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE #define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 43eb405e63..f89f0ce92d 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -364,7 +364,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index b0475229c3..f5b03caf83 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -222,7 +222,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index d3f2050736..964115f980 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -349,7 +349,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 56af3c7a5a..7db1365d2b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -393,7 +393,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_CHIP_CONFIG CONFIG_CMD_CLEAR CONFIG_CMD_CLK CONFIG_CMD_CRAMFS -- 2.25.1