Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3c7438dd1eb26f4eeac5d5aa1601f2f2d4a0cb26..f7e6abd6fdc73b192d2839e8f85d2a4cb83df8bb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -78,8 +78,8 @@ T:    git git://git.denx.de/u-boot-atmel.git
 F:     arch/arm/mach-at91/
 
 ARM BROADCOM BCM283X
-M:     Stephen Warren <swarren@wwwdotorg.org>
-S:     Maintained
+#M:    Stephen Warren <swarren@wwwdotorg.org>
+S:     Orphaned (Since 2017-07)
 F:     arch/arm/mach-bcm283x/
 F:     drivers/gpio/bcm2835_gpio.c
 F:     drivers/mmc/bcm2835_sdhci.c
@@ -89,17 +89,18 @@ F:  include/dm/platform_data/serial_bcm283x_mu.h
 
 ARM FREESCALE IMX
 M:     Stefano Babic <sbabic@denx.de>
+M:     Fabio Estevam <fabio.estevam@nxp.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-imx.git
 F:     arch/arm/cpu/arm1136/mx*/
 F:     arch/arm/cpu/arm926ejs/mx*/
 F:     arch/arm/cpu/armv7/mx*/
 F:     arch/arm/cpu/armv7/vf610/
-F:     arch/arm/imx-common/
+F:     arch/arm/mach-imx/
 F:     arch/arm/include/asm/arch-imx/
 F:     arch/arm/include/asm/arch-mx*/
 F:     arch/arm/include/asm/arch-vf610/
-F:     arch/arm/include/asm/imx-common/
+F:     arch/arm/include/asm/mach-imx/
 F:     board/freescale/*mx*/
 
 ARM HISILICON
@@ -132,6 +133,7 @@ F:  arch/arm/mach-rmobile/
 
 ARM ROCKCHIP
 M:     Simon Glass <sjg@chromium.org>
+M:     Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-rockchip.git
 F:     arch/arm/mach-rockchip/
@@ -219,12 +221,6 @@ S: Maintained
 F:     arch/arm/cpu/armv8/zynqmp/
 F:     arch/arm/include/asm/arch-zynqmp/
 
-AVR32
-M:     Andreas Bießmann <andreas@biessmann.org>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-avr32.git
-F:     arch/avr32/
-
 BUILDMAN
 M:     Simon Glass <sjg@chromium.org>
 S:     Maintained
@@ -262,6 +258,7 @@ F:  test/dm/
 EFI PAYLOAD
 M:     Alexander Graf <agraf@suse.de>
 S:     Maintained
+T:     git git://github.com/agraf/u-boot.git
 F:     include/efi_loader.h
 F:     lib/efi_loader/
 F:     cmd/bootefi.c
@@ -321,24 +318,12 @@ M:        Wolfgang Denk <wd@denx.de>
 S:     Maintained
 F:     arch/powerpc/
 
-POWERPC MPC5XXX
-M:     Wolfgang Denk <wd@denx.de>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-mpc5xxx.git
-F:     arch/powerpc/cpu/mpc5*/
-
 POWERPC MPC8XX
-M:     Wolfgang Denk <wd@denx.de>
+M:     Christophe Leroy <christophe.leroy@c-s.fr>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-mpc8xx.git
 F:     arch/powerpc/cpu/mpc8xx/
 
-POWERPC MPC82XX
-M:     Wolfgang Denk <wd@denx.de>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-mpc82xx.git
-F:     arch/powerpc/cpu/mpc82*/
-
 POWERPC MPC83XX
 M:     Mario Six <mario.six@gdsys.cc>
 S:     Maintained
@@ -467,6 +452,7 @@ F:  drivers/video/
 
 X86
 M:     Simon Glass <sjg@chromium.org>
+M:     Bin Meng <bmeng.cn@gmail.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-x86.git
 F:     arch/x86/