]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sat, 27 Jul 2019 13:35:05 +0000 (09:35 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 27 Jul 2019 13:35:05 +0000 (09:35 -0400)
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

12 files changed:
1  2 
MAINTAINERS
arch/arm/dts/Makefile
arch/sandbox/dts/test.dts
cmd/Kconfig
common/spl/Kconfig
configs/sandbox_defconfig
drivers/clk/Kconfig
drivers/clk/Makefile
drivers/clk/clk-uclass.c
drivers/net/Kconfig
scripts/config_whitelist.txt
test/dm/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc cmd/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
index f0ced49e5a3b6287124180270a2f789e06e30178,37dfd281e94777852f7af07dfbd77ad7355a1570..b7fec605c6ced602dcc19dab63be35f26977134c
@@@ -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/
Simple merge
Simple merge
Simple merge
Simple merge