Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
commit504bf790da08db9b4a443566cf6ef577f9c7996a
tree20eb0e88c11749a6c14ae1b5bc7b0823efd6ef7b
parent8c66fb88e3bd00b486d2da2b90f5ff8534b7e3c0
parentc23b33f5311abe32db96884318996d2b41db4c94
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

- H6 Beelink GS1 board (ClĂ©ment)
- Olimex A64-Teres-I board (Jonas)
- sunxi build fix for CONFIG_CMD_PXE|DHCP (Ondrej)
- Change include order (Jagan)
- EPHY clock changes (Jagan)
- EMAC enablement on Cubietruck Plus, BPI-M3 (Chen-Yu Tsai)
arch/arm/dts/Makefile
configs/Cubietruck_plus_defconfig
configs/Sinovoip_BPI_M3_defconfig
include/configs/sunxi-common.h
include/reset.h