Hi Tom,

Please pull u-boot-sunxi/master into master for a small bugfix for v2015.04. This fixes the CONFIG_FDTFILE setting in a defconfig file so that we do not end up loading the wrong dtb:

The following changes since commit d68df028099235c5316eec1ed5f586f3744a8707:

Merge git://git.denx.de/u-boot-arc (2015-04-03 09:14:44 -0400)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to 47bdb9f892667904aeab831b622d4a52b90b4de0:

sunxi: Fix Orangepi_mini dtb filename (2015-04-04 15:37:22 +0200)

---------------------------------------------------------------- Hans de Goede (1): sunxi: Fix Orangepi_mini dtb filename

configs/Orangepi_defconfig | 7 +++++++ configs/Orangepi_mini_defconfig | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)

Regards,

Hans