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

diff --cc README
Simple merge

diff --cc arch/arm/Kconfig
index bc55e5b1f5e9f1bc4edd94b3a4711f3aed7195e2,eb92297cb3b491630ab002190572810b81c1ddf3..8472d4156596887a980b8f69219c22390ab4f886
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -842,9 -842,9 +846,10 @@@ source "board/ttcontrol/vision2/Kconfig
  source "board/udoo/Kconfig"
  source "board/vpac270/Kconfig"
  source "board/wandboard/Kconfig"
+ source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/xaeniax/Kconfig"
 +source "board/xilinx/zynqmp/Kconfig"
  source "board/zipitz2/Kconfig"
  
  source "arch/arm/Kconfig.debug"