Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 16 Aug 2017 22:12:35 +0000 (18:12 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 16 Aug 2017 22:12:40 +0000 (18:12 -0400)
commitceff355a5f3038ddb49618d9adc716b0ed978aea
tree930e9ae87c1fe2a0d8a3d80aa3d6cc254a0b2a33
parent470135be276b2d92c6da464c68839202d4ff0d08
parent585bf8ae6f467d85b8e9f17141c8562d96a83c51
Merge git://git.denx.de/u-boot-sunxi

Update A20-OLinuXino-Lime2-eMMC_defconfig to include CONFIG_SCSI

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/dts/Makefile
configs/A20-OLinuXino-Lime2-eMMC_defconfig