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 Kconfig | 54 +++++++++++++++++++------------------- arch/Kconfig | 57 +++++++++++++++++++++------------------- arch/arc/Kconfig | 10 +++---- arch/arm/Kconfig | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- arch/arm/cpu/armv7/ls102xa/Kconfig | 10 +++---- arch/arm/cpu/armv8/Kconfig | 4 +-- arch/arm/mach-at91/Kconfig | 66 +++++++++++++++++++++++++--------------------- arch/arm/mach-davinci/Kconfig | 4 +-- arch/arm/mach-exynos/Kconfig | 30 ++++++++++----------- arch/arm/mach-imx/mx3/Kconfig | 2 +- arch/arm/mach-imx/mx5/Kconfig | 14 +++++----- arch/arm/mach-imx/mx6/Kconfig | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- arch/arm/mach-imx/mx7/Kconfig | 23 +++++++++------- arch/arm/mach-meson/Kconfig | 2 ++ arch/arm/mach-mvebu/Kconfig | 6 ++--- arch/arm/mach-omap2/Kconfig | 6 ++--- arch/arm/mach-omap2/am33xx/Kconfig | 64 +++++++++++++++++++++++++++++---------------- arch/arm/mach-omap2/omap3/Kconfig | 30 ++++++++++++++------- arch/arm/mach-omap2/omap5/Kconfig | 12 ++++----- arch/arm/mach-qemu/Kconfig | 2 +- arch/arm/mach-rmobile/Kconfig.32 | 22 +++++++++++----- arch/arm/mach-rockchip/rk3288/Kconfig | 20 +++++++------- arch/arm/mach-socfpga/Kconfig | 4 +-- arch/arm/mach-stm32/Kconfig | 20 +++++++------- arch/arm/mach-tegra/Kconfig | 9 ++++--- arch/arm/mach-tegra/tegra124/Kconfig | 4 +-- arch/arm/mach-uniphier/Kconfig | 7 ++--- arch/microblaze/Kconfig | 5 ++-- arch/mips/Kconfig | 56 +++++++++++++++++++++------------------ arch/mips/mach-ath79/Kconfig | 10 +++---- arch/mips/mach-bmips/Kconfig | 36 +++++++++++++------------- arch/mips/mach-pic32/Kconfig | 6 ++--- arch/powerpc/Kconfig | 2 +- arch/powerpc/cpu/mpc83xx/Kconfig | 7 ++--- cmd/Kconfig | 20 +++++++------- common/Kconfig | 2 +- drivers/fpga/Kconfig | 16 ++++++------ drivers/power/pmic/Kconfig | 2 +- dts/Kconfig | 2 +- 39 files changed, 596 insertions(+), 482 deletions(-) _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot