From 854fcd553764709939ad542c2c5bd5470b780c2f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 26 Apr 2017 22:28:00 -0600 Subject: Convert CONFIG_CMD_CHIP_CONFIG to Kconfig This converts the following to Kconfig: CONFIG_CMD_CHIP_CONFIG Signed-off-by: Simon Glass diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index a6066ef..38121c1 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 7ac77d9..50fdbd4 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 da52580..c76c8d6 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 94e5e85..cbb0f2a 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 0d8a0cd..f6b6c95 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 cf9a1d7..5a82757 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 bf1ae12..4601963 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 ddb0900..9e3d16d 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 c2e510d..117fcb5 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 bd19956..eb47db4 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 3eb3ff6..9701135 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 aee12e7..9c80f06 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 eea989a..2ec7fa8 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 aa3b9cc..0a0b4dd 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 ed9eb35..6690e9b 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 554d124..628cdd8 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 3214d45..ddafa27 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 a804e95..21c4c89 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 a7d7bbf..2c5bcbd 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 9babc3d..5c1422d 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 3cb2196..b459366 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 3477059..7f73b66 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 8619de4..8e754fc 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 45c1e06..f33bfd6 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 43eb405..f89f0ce 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 b047522..f5b03ca 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 d3f2050..964115f 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 56af3c7..7db1365 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 -- cgit v0.10.2