[U-Boot] [PATCH v2 13/19] dm: omap3: Move driver model CONFIGs to Kconfig

[Simon Glass]

On 9 February 2015 at 22:04, Simon Glass <sjg at chromium.org> wrote:
> Hi Masahiro,
>
> On 8 February 2015 at 22:35, Masahiro Yamada <yamada.m at jp.panasonic.com> wrote:
>> Hi Simon,
>>
>>
>> On Thu,  5 Feb 2015 21:41:44 -0700
>> Simon Glass <sjg at chromium.org> wrote:
>>
>>> Remove driver model CONFIGs from the board config headers and use Kconfig
>>> instead.
>>>
>>> Signed-off-by: Simon Glass <sjg at chromium.org>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>>  arch/arm/cpu/armv7/omap3/Kconfig       |  9 +++++++++
>>>  board/compulab/cm_t335/Kconfig         |  9 +++++++++
>>>  board/gumstix/pepper/Kconfig           |  9 +++++++++
>>>  board/isee/igep0033/Kconfig            |  9 +++++++++
>>>  board/phytec/pcm051/Kconfig            |  9 +++++++++
>>>  board/silica/pengwyn/Kconfig           |  9 +++++++++
>>>  board/ti/am335x/Kconfig                | 10 ++++++++++
>>>  configs/am3517_crane_defconfig         |  3 +++
>>>  configs/am3517_evm_defconfig           |  3 +++
>>>  configs/cm_t3517_defconfig             |  3 +++
>>>  configs/cm_t35_defconfig               |  3 +++
>>>  configs/devkit8000_defconfig           |  3 +++
>>>  configs/dig297_defconfig               |  3 +++
>>>  configs/eco5pk_defconfig               |  3 +++
>>>  configs/mcx_defconfig                  |  3 +++
>>>  configs/mt_ventoux_defconfig           |  3 +++
>>>  configs/nokia_rx51_defconfig           |  3 +++
>>>  configs/omap3_beagle_defconfig         |  3 +++
>>>  configs/omap3_evm_defconfig            |  3 +++
>>>  configs/omap3_evm_quick_mmc_defconfig  |  3 +++
>>>  configs/omap3_evm_quick_nand_defconfig |  3 +++
>>>  configs/omap3_ha_defconfig             |  3 +++
>>>  configs/omap3_logic_defconfig          |  3 +++
>>>  configs/omap3_mvblx_defconfig          |  3 +++
>>>  configs/omap3_pandora_defconfig        |  3 +++
>>>  configs/omap3_sdp3430_defconfig        |  3 +++
>>>  configs/tao3530_defconfig              |  3 +++
>>>  configs/tricorder_defconfig            |  3 +++
>>>  configs/tricorder_flash_defconfig      |  3 +++
>>>  configs/twister_defconfig              |  3 +++
>>>  include/configs/nokia_rx51.h           |  1 +
>>>  include/configs/ti_am335x_common.h     |  5 -----
>>>  include/configs/ti_omap3_common.h      |  4 ----
>>>  33 files changed, 134 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
>>> index a029379..2fe3232 100644
>>> --- a/arch/arm/cpu/armv7/omap3/Kconfig
>>> +++ b/arch/arm/cpu/armv7/omap3/Kconfig
>>> @@ -93,6 +93,15 @@ config TARGET_TWISTER
>>>
>>>  endchoice
>>>
>>> +config DM
>>> +     default y if !SPL_BUILD
>>> +
>>> +config DM_GPIO
>>> +     default y if DM && !SPL_BUILD
>>> +
>>> +config DM_SERIAL
>>> +     default y if DM && !SPL_BUILD
>>> +
>>>  config SYS_SOC
>>>       default "omap3"
>>>
>>
>> I realized a problem when I looked at this patch.
>>
>> In order to put the default values into board-Kconfig files,
>> we have to describe the "if ..." part correctly.
>> (otherwise, the dependencies between CONFIGs get broken.)
>>
>> We had already added the same dependencies in the common parts:
>>
>> config DM
>>         bool "Enable Driver Model"
>>         depends on !SPL_BUILD
>>
>>
>> config DM_SERIAL
>>         bool "Enable Driver Model for serial drivers"
>>         depends on DM
>>
>>
>>
>> Now, we are duplicating the same dependencies in each board-Kconfig.
>> This is not nice.
>>
>> I am very sorry, I have misguided you.
>> (What is worse, I can not suggest a good idea to solve this problem.)
>
> Yes it is unfortunate. However the problem of SPL not working for DM
> is only waiting on the removal of gdata. In fact I have a series which
> adds an #ifndef CONFIG_DM to the gdata and enables SPL for Tegra. I'll
> send it soon.
>
> So I think we can live with this for a while until we can remove the
> 'depends on !SPL_BUILD' everywhere. It does seem to work well
> enough...
>
> Regards,
> Simon

Applied to u-boot-dm.