fdt_support: add missing #ifdef after merge

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b709e96ef6d09d69b53ba4fb1384e9bca4e1dd82..26d0d2747996a80368d4cb52294834be7a5e2397 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -148,22 +148,21 @@ F:        arch/arm/mach-tegra/
 F:     arch/arm/include/asm/arch-tegra*/
 
 ARM TI
-M:     Tom Rini <trini@ti.com>
+M:     Tom Rini <trini@konsulko.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-ti.git
-F:     arch/arm/cpu/arm926ejs/davinci/
+F:     arch/arm/mach-davinci/
+F:     arch/arm/mach-keystone/
 F:     arch/arm/cpu/arm926ejs/omap/
 F:     arch/arm/cpu/armv7/omap*/
-F:     arch/arm/include/asm/arch-davinci/
 F:     arch/arm/include/asm/arch-omap*/
 F:     arch/arm/include/asm/ti-common/
 
 ARM UNIPHIER
-M:     Masahiro Yamada <yamada.m@jp.panasonic.com>
+M:     Masahiro Yamada <yamada.masahiro@socionext.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-uniphier.git
-F:     arch/arm/cpu/armv7/uniphier/
-F:     arch/arm/include/asm/arch-uniphier/
+F:     arch/arm/mach-uniphier/
 F:     configs/ph1_*_defconfig
 N:     uniphier
 
@@ -173,6 +172,12 @@ S: Maintained
 F:     arch/arm/cpu/armv7/zynq/
 F:     arch/arm/include/asm/arch-zynq/
 
+ARM ZYNQMP
+M:     Michal Simek <michal.simek@xilinx.com>
+S:     Maintained
+F:     arch/arm/cpu/armv8/zynqmp/
+F:     arch/arm/include/asm/arch-zynqmp/
+
 AVR32
 M:     Andreas Bießmann <andreas.devel@googlemail.com>
 S:     Maintained
@@ -214,6 +219,7 @@ F:  drivers/usb/gadget/
 DRIVER MODEL
 M:     Simon Glass <sjg@chromium.org>
 S:     Maintained
+T:     git git://git.denx.de/u-boot-dm.git
 F:     drivers/core/
 F:     include/dm/
 F:     test/dm/
@@ -412,7 +418,7 @@ T:  git git://git.denx.de/u-boot-x86.git
 F:     arch/x86/
 
 THE REST
-M:     Tom Rini <trini@ti.com>
+M:     Tom Rini <trini@konsulko.com>
 L:     u-boot@lists.denx.de
 Q:     http://patchwork.ozlabs.org/project/uboot/list/
 S:     Maintained