Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 20 May 2019 17:53:51 +0000 (13:53 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 20 May 2019 17:53:51 +0000 (13:53 -0400)
commit79764b5081d276596dc9294dece73354f81a6801
tree35b590b7fa99f65de5b44efa9e208af58dfa028d
parent956520cd7012dfa871bfd06b5f9defd148b4572c
parentc598c4837d782f6d9481f4be07ae5d679c6df976
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

- H6 WDT reset fix (Clément)
- H6 SPL_TEXT_BASE fixes (Clément, Jonas)
- NPI-M1+ emac enablment (Emmanuel)
arch/arm/mach-sunxi/board.c