From: Tom Rini <trini@konsulko.com>
Date: Mon, 8 May 2017 19:44:44 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2017.07-rc1~394
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-sunxi
---

a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc
diff --cc arch/arm/Kconfig
index 054ccac12b,3adafd6c6e..b2d6e80716
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1121,10 -1321,13 +1131,9 @@@ source "board/spear/spear320/Kconfig
  source "board/spear/spear600/Kconfig"
  source "board/spear/x600/Kconfig"
  source "board/st/stv0991/Kconfig"
- source "board/sunxi/Kconfig"
  source "board/syteco/zmx25/Kconfig"
  source "board/tcl/sl50/Kconfig"
 -source "board/ti/am335x/Kconfig"
 -source "board/ti/am43xx/Kconfig"
  source "board/birdland/bav335x/Kconfig"
 -source "board/ti/ti814x/Kconfig"
 -source "board/ti/ti816x/Kconfig"
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/technologic/ts4600/Kconfig"