Merge branch '2020-03-16-kbuild-etc-resync-v4.18' into next

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b0634b2..2c43573 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -56,7 +56,7 @@ R:    Sam Protsenko <joe.skb7@gmail.com>
 S:     Maintained
 F:     cmd/ab_select.c
 F:     common/android_ab.c
-F:     doc/android/ab.txt
+F:     doc/android/ab.rst
 F:     include/android_ab.h
 F:     test/py/tests/test_android/test_ab.py
 
@@ -65,7 +65,7 @@ M:    Igor Opaniuk <igor.opaniuk@gmail.com>
 S:     Maintained
 F:     cmd/avb.c
 F:     common/avb_verify.c
-F:     doc/android/avb2.txt
+F:     doc/android/avb2.rst
 F:     include/avb_verify.h
 F:     lib/libavb/
 F:     test/py/tests/test_android/test_avb.py
@@ -173,6 +173,15 @@ F: doc/README.bcm7xxx
 F:     drivers/mmc/bcmstb_sdhci.c
 F:     drivers/spi/bcmstb_spi.c
 
+ARM CORTINA ACCESS CAxxxx
+M:     Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
+S:     Supported
+F:     board/cortina/common/
+F:     drivers/gpio/cortina_gpio.c
+F:     drivers/watchdog/cortina_wdt.c
+F:     drivers/serial/serial_cortina.c
+F:     drivers/mmc/ca_dw_mmc.c
+
 ARM/CZ.NIC TURRIS MOX SUPPORT
 M:     Marek Behun <marek.behun@nic.cz>
 S:     Maintained
@@ -337,6 +346,7 @@ L:  uboot-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git
 S:     Maintained
 F:     arch/arm/mach-stm32mp/
+F:     doc/board/st/
 F:     drivers/adc/stm32-adc*
 F:     drivers/clk/clk_stm32mp1.c
 F:     drivers/gpio/stm32_gpio.c
@@ -555,6 +565,7 @@ M:  Heinrich Schuchardt <xypron.glpk@gmx.de>
 R:     Alexander Graf <agraf@csgraf.de>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git
+F:     doc/api/efi.rst
 F:     doc/uefi/*
 F:     include/capitalization.h
 F:     include/charset.h
@@ -655,6 +666,15 @@ S: Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-mips.git
 F:     arch/mips/
 
+MIPS CORTINA ACCESS CAxxxx
+M:     Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
+S:     Supported
+F:     board/cortina/common/
+F:     drivers/gpio/cortina_gpio.c
+F:     drivers/watchdog/cortina_wdt.c
+F:     drivers/serial/serial_cortina.c
+F:     drivers/mmc/ca_dw_mmc.c
+
 MIPS MSCC
 M:     Gregory CLEMENT <gregory.clement@bootlin.com>
 M:     Lars Povlsen <lars.povlsen@microchip.com>