]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'u-boot-amlogic-20200406' of https://gitlab.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Wed, 8 Apr 2020 12:48:31 +0000 (08:48 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 8 Apr 2020 12:48:31 +0000 (08:48 -0400)
- clk: meson-g12a: missing break
- sync all Amlogic DT from Linux v5.6-rc2
- MMC clock fixups
- add support for Libre Computer AML-S905D-PC and AML-S912-PC

1  2 
arch/arm/dts/Makefile

diff --combined arch/arm/dts/Makefile
index ec8fd112f91a8c4c0da14c1bc831313db4d79021,a80ce9c791f8eed44a37c0974b828a64813bd5d5..2a89da2ce9e9013b67deb8da92353344ba77773c
@@@ -147,7 -147,9 +147,9 @@@ dtb-$(CONFIG_ARCH_MESON) += 
        meson-gxl-s805x-libretech-ac.dtb \
        meson-gxl-s905x-libretech-cc.dtb \
        meson-gxl-s905x-khadas-vim.dtb \
+       meson-gxl-s905d-libretech-pc.dtb \
        meson-gxm-khadas-vim2.dtb \
+       meson-gxm-s912-libretech-pc.dtb \
        meson-axg-s400.dtb \
        meson-g12a-u200.dtb \
        meson-g12a-sei510.dtb \
@@@ -277,7 -279,6 +279,7 @@@ dtb-$(CONFIG_ARCH_ZYNQMP) += 
        zynqmp-zcu102-revA.dtb                  \
        zynqmp-zcu102-revB.dtb                  \
        zynqmp-zcu102-rev1.0.dtb                \
 +      zynqmp-zcu102-rev1.1.dtb                \
        zynqmp-zcu104-revA.dtb                  \
        zynqmp-zcu104-revC.dtb                  \
        zynqmp-zcu106-revA.dtb                  \