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

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc board/amlogic/odroid-c2/MAINTAINERS
index 699850f,fd74d53..6a85306
--- 1/board/amlogic/odroid-c2/MAINTAINERS
--- 2/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 6575f17,6575f17..07ca6f2
--- 1/board/amlogic/p212/MAINTAINERS
--- 2/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 c128538,a696245..9acbb1a
--- 1/drivers/clk/Makefile
--- 2/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/