From: Tom Rini <trini@konsulko.com>
Date: Thu, 29 Nov 2018 14:33:33 +0000 (-0500)
Subject: Merge tag 'u-boot-amlogic-20181126' of git://git.denx.de/u-boot-amlogic
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=93e72ac472b537bb4b0c6a97a7e6aab2b37860c6;p=u-boot.git

Merge tag 'u-boot-amlogic-20181126' of git://git.denx.de/u-boot-amlogic

Cleanup and update towards support for Amlogic Meson AXG SoCs :
- mmc: meson-gx: Add AXG compatible
- net: designware: add meson meson compatibles
- Amlogic Meson cleanup for AXG SoC support
---

93e72ac472b537bb4b0c6a97a7e6aab2b37860c6
diff --cc board/amlogic/odroid-c2/MAINTAINERS
index 699850fd0c,fd74d53bfe..6a853066d7
--- a/board/amlogic/odroid-c2/MAINTAINERS
+++ b/board/amlogic/odroid-c2/MAINTAINERS
@@@ -3,4 -4,4 +4,5 @@@ M:	Neil Armstrong <narmstrong@baylibre.
  S:	Maintained
  F:	board/amlogic/odroid-c2/
  F:	include/configs/odroid-c2.h
++F:	configs/nanopi-k2_defconfig
  F:	configs/odroid-c2_defconfig
diff --cc board/amlogic/p212/MAINTAINERS
index 6575f17e14,6575f17e14..07ca6f204d
--- a/board/amlogic/p212/MAINTAINERS
+++ b/board/amlogic/p212/MAINTAINERS
@@@ -3,4 -3,4 +3,6 @@@ M:	Neil Armstrong <narmstrong@baylibre.
  S:	Maintained
  F:	board/amlogic/p212/
  F:	include/configs/p212.h
++F:	configs/khadas-vim_defconfig
++F:	configs/libretech-cc_defconfig
  F:	configs/p212_defconfig
diff --cc drivers/clk/Makefile
index c128538303,a6962453a1..9acbb1a650
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -9,8 -9,7 +9,8 @@@ obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-ucl
  obj-y += imx/
  obj-y += tegra/
  obj-$(CONFIG_ARCH_ASPEED) += aspeed/
- obj-$(CONFIG_ARCH_MESON) += clk_meson.o
 +obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
+ obj-$(CONFIG_ARCH_MESON) += clk_meson.o clk_meson_axg.o
  obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
  obj-$(CONFIG_ARCH_SOCFPGA) += altera/
  obj-$(CONFIG_CLK_AT91) += at91/