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

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index aa4b3bc6501e0dfe9bc2aa2cdcff86e31d1a47af..5891fd08b6a700c967f74dc441089dcfbffb037f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -86,9 +86,11 @@ M:   Albert Aribaud <albert.u.boot@aribaud.net>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-arm.git
 F:     arch/arm/
+F:     cmd/arm/
 
 ARM ALTERA SOCFPGA
 M:     Marek Vasut <marex@denx.de>
+M:     Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
 S:     Maintainted
 T:     git git://git.denx.de/u-boot-socfpga.git
 F:     arch/arm/mach-socfpga/
@@ -100,7 +102,7 @@ L:  u-boot-amlogic@groups.io
 T:     git git://git.denx.de/u-boot-amlogic.git
 F:     arch/arm/mach-meson/
 F:     arch/arm/include/asm/arch-meson/
-F:     drivers/clk/clk_meson*
+F:     drivers/clk/meson/
 F:     drivers/serial/serial_meson.c
 F:     drivers/reset/reset-meson.c
 F:     drivers/i2c/meson_i2c.c
@@ -237,6 +239,7 @@ F:  arch/arm/mach-rmobile/
 ARM ROCKCHIP
 M:     Simon Glass <sjg@chromium.org>
 M:     Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
+M:     Kever Yang <kever.yang@rock-chips.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-rockchip.git
 F:     arch/arm/include/asm/arch-rockchip/
@@ -584,7 +587,7 @@ S:  Maintained
 F:     arch/mips/mach-jz47xx/
 
 MMC
-M:     Jaehoon Chung <jh80.chung@samsung.com>
+M:     Peng Fan <peng.fan@nxp.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-mmc.git
 F:     drivers/mmc/
@@ -677,6 +680,7 @@ M:  Rick Chen <rick@andestech.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-riscv.git
 F:     arch/riscv/
+F:     cmd/riscv/
 F:     tools/prelink-riscv.c
 
 ROCKUSB
@@ -730,6 +734,8 @@ S:  Supported
 F:     arch/arm/mach-omap2/omap5/sec_entry_cpu1.S
 F:     arch/arm/mach-omap2/sec-common.c
 F:     arch/arm/mach-omap2/config_secure.mk
+F:     arch/arm/mach-k3/security.c
+F:     arch/arm/mach-k3/config_secure.mk
 F:     configs/am335x_hs_evm_defconfig
 F:     configs/am335x_hs_evm_uart_defconfig
 F:     configs/am43xx_hs_evm_defconfig
@@ -741,6 +747,8 @@ F:  configs/k2hk_hs_evm_defconfig
 F:     configs/k2e_hs_evm_defconfig
 F:     configs/k2g_hs_evm_defconfig
 F:     configs/k2l_hs_evm_defconfig
+F:     configs/am65x_hs_evm_r5_defconfig
+F:     configs/am65x_hs_evm_a53_defconfig
 
 TQ GROUP
 #M:    Martin Krause <martin.krause@tq-systems.de>
@@ -788,6 +796,7 @@ M:  Bin Meng <bmeng.cn@gmail.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-x86.git
 F:     arch/x86/
+F:     cmd/x86/
 
 XTENSA
 M:     Max Filippov <jcmvbkbc@gmail.com>