diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-31 12:47:53 +0900 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:30 -0600 |
commit | 58d423b88e5bc1b6e43aa04a05feccd0e737c061 (patch) | |
tree | 73da7d15fbaadbb8248fe6b43abb11a08ea51463 /configs | |
parent | b3d023b4058acc83d211555e62068f84e322bcac (diff) | |
download | u-boot-58d423b88e5bc1b6e43aa04a05feccd0e737c061.tar.gz |
dm: select CONFIG_DM* options
As mentioned in the previous commit, adding default values in each
Kconfig causes problems because it does not co-exist with the
"depends on" syntax. (Please note this is not a bug of Kconfig.)
We should not do so unless we have a special reason. Actually,
for CONFIG_DM*, we have no good reason to do so.
Generally, CONFIG_DM is not a user-configurable option. Once we
convert a driver into Driver Model, the board only works with Driver
Model, i.e. CONFIG_DM must be always enabled for that board.
So, using "select DM" is more suitable rather than allowing users to
modify it. Another good thing is, Kconfig warns unmet dependencies
for "select" syntax, so we easily notice bugs.
Actually, CONFIG_DM and other related options have been added
without consistency: some into arch/*/Kconfig, some into
board/*/Kconfig, and some into configs/*_defconfig.
This commit prefers "select" and cleans up the following issues.
[1] Never use "CONFIG_DM=n" in defconfig files
It is really rare to add "CONFIG_FOO=n" to disable CONFIG options.
It is more common to use "# CONFIG_FOO is not set". But here, we
do not even have to do it.
Less than half of OMAP3 boards have been converted to Driver Model.
Adding the default values to arch/arm/cpu/armv7/omap3/Kconfig is
weird. Instead, add "select DM" only to appropriate boards, which
eventually eliminates "CONFIG_DM=n", etc.
[2] Delete redundant CONFIGs
Sandbox sets CONFIG_DM in arch/sandbox/Kconfig and defines it again
in configs/sandbox_defconfig.
Likewise, OMAP3 sets CONFIG_DM arch/arm/cpu/armv7/omap3/Kconfig and
defines it also in omap3_beagle_defconfig and devkit8000_defconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'configs')
25 files changed, 0 insertions, 71 deletions
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 0e39c7dd1af..e4ffe5f37a7 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -9,4 +9,3 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 72cc2d75f02..cd16724a727 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_AM3517_CRANE=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 6d6b0d2a8a0..daf1ae4f9c7 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_AM3517_EVM=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 5c40b900c7f..2d05ffb30f8 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=n CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T3517=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 4a99263d9b8..63a85b4a22b 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T35=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 97564617c24..84a1a258eae 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_DEVKIT8000=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig index 0d182900f94..95bc3539267 100644 --- a/configs/dig297_defconfig +++ b/configs/dig297_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_DIG297=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index fbe6335a88d..8587c519118 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_ECO5PK=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 2f6185879bc..4abf34d3c5f 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_MCX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 5b1da8c30d6..fd4f649c9a1 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_MT_VENTOUX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 20a51e1d2fd..e03f5868808 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_NOKIA_RX51=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 51068210d69..2a3cc661661 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_BEAGLE=y -CONFIG_DM=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index fb4a80092ae..91c290b17ba 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig index d4594cb2c08..12005bf6209 100644 --- a/configs/omap3_evm_quick_mmc_defconfig +++ b/configs/omap3_evm_quick_mmc_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig index 1a78a6e4910..5cc9512a773 100644 --- a/configs/omap3_evm_quick_nand_defconfig +++ b/configs/omap3_evm_quick_nand_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index 344eca5db80..250890b0051 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TAO3530=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 790ccbaa344..5f2c063b6ec 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_LOGIC=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig index b75f51323e8..fb6edc252af 100644 --- a/configs/omap3_mvblx_defconfig +++ b/configs/omap3_mvblx_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_MVBLX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index dd0f17c20c5..bf285378a3f 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_PANDORA=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig index b3a8745a02f..1172c2adc59 100644 --- a/configs/omap3_sdp3430_defconfig +++ b/configs/omap3_sdp3430_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_SDP3430=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 6ce1f0a804c..3731c71ce35 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -3,7 +3,6 @@ CONFIG_OF_HOSTFILE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_CROS_EC=y CONFIG_CROS_EC_SANDBOX=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index 077dc892d6e..86ba4cd37ae 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TAO3530=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 745ebc83a55..e307c65d667 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TRICORDER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index cc935669e85..de6c16e7256 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TRICORDER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 5e7250ab99c..344369d34a2 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TWISTER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n |