From: Tom Rini <trini@konsulko.com>
Date: Sat, 27 Jul 2019 13:35:05 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Tag: v2025.01-rc5-pxa1908~2865
X-Git-Url: http://git.dujemihanovic.xyz/img/static/html/index.html?a=commitdiff_plain;h=df9a7a195bdf0722399199bf373afc8309ae3ad7;p=u-boot.git

Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

u-boot-imx-20190719

- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP

Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
---

df9a7a195bdf0722399199bf373afc8309ae3ad7
diff --cc drivers/clk/Makefile
index f0ced49e5a,37dfd281e9..b7fec605c6
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -7,8 -7,9 +7,10 @@@
  obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-uclass.o
  obj-$(CONFIG_$(SPL_TPL_)CLK) += clk_fixed_rate.o
  obj-$(CONFIG_$(SPL_TPL_)CLK) += clk_fixed_factor.o
+ obj-$(CONFIG_$(SPL_TPL_)CLK_CCF) += clk.o clk-divider.o clk-mux.o
+ obj-$(CONFIG_$(SPL_TPL_)CLK_CCF) += clk-fixed-factor.o
  
 +obj-y += analogbits/
  obj-y += imx/
  obj-y += tegra/
  obj-$(CONFIG_ARCH_ASPEED) += aspeed/