Merge tag 'for-master-20181206' of git://git.denx.de/u-boot-rockchip