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>

diff --combined arch/arm/dts/Makefile
index 2cbdb17ca54b7d6604877dbea2681bb602a6cef9,21a8103aeeeb7fffd65c136cfedf330fa1f67fae..f94c2471b4e88b4275f2ad4231bc3d7ee63aed9e
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -42,7 -42,6 +42,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
        rk3328-evb.dtb \
 +      rk3368-lion.dtb \
        rk3368-sheep.dtb \
        rk3368-geekbox.dtb \
        rk3368-px5-evb.dtb \
@@@ -336,6 -335,8 +336,8 @@@ dtb-$(CONFIG_MACH_SUN50I_H5) += 
        sun50i-h5-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-bananapi-m64.dtb \
+       sun50i-a64-nanopi-a64.dtb \
+       sun50i-a64-olinuxino.dtb \
        sun50i-a64-orangepi-win.dtb \
        sun50i-a64-pine64-plus.dtb \
        sun50i-a64-pine64.dtb

diff --combined configs/A20-OLinuXino-Lime2-eMMC_defconfig
index 0000000000000000000000000000000000000000,034ae983a5c7801438a4a0ddf9a26e7173e2ca78..1c58c5443507b9ca3366579be19efccab377c425
mode 000000,100644..100644
--- /dev/null
--- 2/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@@ -1,0 -1,36 +1,37 @@@
+ CONFIG_ARM=y
+ CONFIG_ARCH_SUNXI=y
+ CONFIG_MACH_SUN7I=y
+ CONFIG_DRAM_CLK=384
+ CONFIG_MMC0_CD_PIN="PH1"
+ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+ CONFIG_USB0_VBUS_PIN="PC17"
+ CONFIG_USB0_VBUS_DET="PH5"
+ CONFIG_I2C1_ENABLE=y
+ CONFIG_SATAPWR="PC3"
+ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc"
+ CONFIG_AHCI=y
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+ CONFIG_SPL=y
+ CONFIG_SPL_I2C_SUPPORT=y
+ # CONFIG_CMD_IMLS is not set
+ # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_DFU=y
+ CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_FPGA is not set
+ # CONFIG_SPL_DOS_PARTITION is not set
+ # CONFIG_SPL_ISO_PARTITION is not set
+ # CONFIG_SPL_PARTITION_UUIDS is not set
+ CONFIG_DFU_RAM=y
+ CONFIG_ETH_DESIGNWARE=y
+ CONFIG_RGMII=y
+ CONFIG_SUN7I_GMAC=y
+ CONFIG_AXP_ALDO3_VOLT=2800
+ CONFIG_AXP_ALDO4_VOLT=2800
++CONFIG_SCSI=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_MUSB_GADGET=y
+ CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
+ CONFIG_G_DNL_VENDOR_NUM=0x1f3a
+ CONFIG_G_DNL_PRODUCT_NUM=0x1010