[U-Boot] [GIT PULL] Kconfig changes

[Michal Simek]

Hi Tom,

On 30.7.2018 22:03, Tom Rini wrote:
> On Mon, Jul 30, 2018 at 08:27:19AM +0200, Michal Simek wrote:
> 
>> Hi Tom,
>>
>> I have put together that CMD_DM enabling we have discussed (and small
>> Kconfig changes). I have rebased it on Friday and travis also looks
>> good. https://travis-ci.org/michalsimek/u-boot/builds/408812930
>>
>> There will be more and more collisions when new stuff is coming that's
>> why please consider to pull these patches to your tree.
>>
>> Thanks,
>> Michal
>>
>>
>> The following changes since commit 2547e91dc15e5203e15d4ebde9172174743b14a7:
>>
>>   tegra: Indicate that binman makes all three output files (2018-07-26
>> 15:49:40 -0400)
>>
>> are available in the git repository at:
>>
>>   git://www.denx.de/git/u-boot-microblaze.git kconfig
>>
>> for you to fetch changes up to 4f19bb26b78a45ce291bab587396e5fc51821690:
>>
>>   kconfig: Replace spaces with tabs (2018-07-27 08:19:02 +0200)
>>
>> ----------------------------------------------------------------
>> Michal Simek (8):
>>       Kconfig: Remove trailing whitespaces in prompt
>>       common: Log should depends on DM not be selected by DM
>>       Kconfig: Replace spaces with tabs and missing newline
>>       Kconfig: Sort bool, default, select and imply options
>>       dm: Change CMD_DM enabling
>>       Kconfig: Sort bool, default, select and imply options
>>       fpga: Kconfig: Replace spaces with tabs
>>       kconfig: Replace spaces with tabs
> 
> So, I had also been testing these changes over the weekend.  Sorry, I
> thought I had moved them to under review but clearly did not.
> 

Not an issue. I have rebased this patchset and I see that there is one
thing incorrectly resolved. This should be applied on the top of rc1.
I have sent a proper patch for that.

Thanks,
Michal

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 1acd7f3c7cb7..232f33285d40 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -43,6 +43,7 @@ config TARGET_PICO_IMX7D
        select DM_THERMAL
        select MX7D
        select SUPPORT_SPL
+       imply CMD_DM

 config TARGET_WARP7
        bool "warp7"
@@ -51,7 +52,6 @@ config TARGET_WARP7
        select DM_THERMAL
        select MX7D
        imply CMD_DM
-       imply CMD_DM

 config TARGET_COLIBRI_IMX7
        bool "Support Colibri iMX7S/iMX7D modules"