Merge patch series "env: mmc: fix use of two separate partitions with proper type...

[J-u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6b32a6d946443aa48d837c89d0bbdd23053f71ae..7ab39d91a5531d8de711d886084584883ed86427 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -334,17 +334,16 @@ F:        drivers/spi/gxp_spi.c
 
 ARM IPQ40XX
 M:     Robert Marko <[email protected]>
-M:     Luka Kovacic <[email protected]>
 M:     Luka Perkov <[email protected]>
 S:     Maintained
 F:     arch/arm/mach-ipq40xx/
-F:     include/dt-bindings/clock/qcom,ipq4019-gcc.h
-F:     include/dt-bindings/reset/qcom,ipq4019-reset.h
-F:     drivers/reset/reset-ipq4019.c
+F:     include/dt-bindings/clock/qcom,gcc-ipq4019.h
+F:     drivers/clk/qcom/clock-ipq4019.c
 F:     drivers/phy/phy-qcom-ipq4019-usb.c
 F:     drivers/spi/spi-qup.c
 F:     drivers/net/mdio-ipq4019.c
 F:     drivers/rng/msm_rng.c
+F:     drivers/pinctrl/qcom/pinctrl-ipq4019.c
 
 ARM LAYERSCAPE SFP
 M:     Sean Anderson <[email protected]>
@@ -618,6 +617,7 @@ R:  Sumit Garg <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-snapdragon.git
+F:     configs/qcm6490_defconfig
 F:     drivers/*/*/pm8???-*
 F:     drivers/gpio/msm_gpio.c
 F:     drivers/mmc/msm_sdhci.c
@@ -733,6 +733,7 @@ F:  arch/arm/mach-omap2/
 F:     arch/arm/include/asm/arch-omap*/
 F:     arch/arm/include/asm/ti-common/
 F:     board/ti/
+F:     doc/board/ti/
 F:     drivers/dma/ti*
 F:     drivers/dma/ti*/
 F:     drivers/firmware/ti_sci.*
@@ -919,7 +920,7 @@ F:  drivers/block/blkmap.c
 F:     include/blkmap.h
 F:     test/dm/blkmap.c
 
-BOOTDEVICE
+BOOTSTD
 M:     Simon Glass <[email protected]>
 S:     Maintained
 F:     boot/bootdev*.c
@@ -928,7 +929,7 @@ F:  boot/bootmeth*.c
 F:     boot/bootstd.c
 F:     cmd/bootdev.c
 F:     cmd/bootflow.c
-F:     doc/develop/bootstd.rst
+F:     doc/develop/bootstd/
 F:     doc/usage/bootdev.rst
 F:     doc/usage/bootflow.rst
 F:     doc/usage/bootmeth.rst
@@ -940,6 +941,14 @@ F: include/bootstd.h
 F:     net/eth_bootdevice.c
 F:     test/boot/
 
+BOOTMETH_ANDROID
+M:     Mattijs Korpershoek <[email protected]>
+S:     Maintained
+T:     git https://source.denx.de/u-boot/custodians/u-boot-dfu.git
+F:     boot/bootmeth_android.c
+F:     boot/bootmeth_android.h
+F:     doc/develop/bootstd/android.rst
+
 BTRFS
 M:     Marek Behún <[email protected]>
 R:     Qu Wenruo <[email protected]>
@@ -990,6 +999,13 @@ F: arch/m68k/
 F:     doc/arch/m68k.rst
 F:     drivers/watchdog/mcf_wdt.c
 
+CPU
+M:     Simon Glass <[email protected]>
+M:     Hou Zhiqiang <[email protected]>
+S:     Maintained
+F:     cmd/cpu.c
+F:     doc/usage/cpu.rst
+
 CYCLIC
 M:     Stefan Roese <[email protected]>
 S:     Maintained
@@ -1634,6 +1650,7 @@ F:        arch/arm/mach-omap2/sec-common.c
 F:     arch/arm/mach-omap2/config_secure.mk
 F:     arch/arm/mach-k3/security.c
 F:     configs/am335x_hs_evm_defconfig
+F:     configs/am335x_hs_evm_spi_defconfig
 F:     configs/am335x_hs_evm_uart_defconfig
 F:     configs/am43xx_hs_evm_defconfig
 F:     configs/am43xx_hs_evm_qspi_defconfig
@@ -1695,6 +1712,19 @@ M:       Neha Malcom Francis <[email protected]>
 S:     Maintained
 F:     drivers/ufs/
 
+UPL
+M:     Simon Glass <[email protected]>
+S:     Maintained
+T:     git https://source.denx.de/u-boot/custodians/u-boot-dm.git
+F:     boot/upl*
+F:     cmd/upl.c
+F:     common/spl/spl_upl.c
+F:     doc/usage/upl.rst
+F:     doc/usage/cmd/upl.rst
+F:     include/upl.h
+F:     test/boot/upl.c
+F:     test/py/tests/test_upl.py
+
 USB
 M:     Marek Vasut <[email protected]>
 S:     Maintained