Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / board / sunxi / MAINTAINERS

diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index ab3d891d8f9866daa0d72736ddc40df62a172641..db51f48ab60225c9bdb3a4633661cbc00cdbd672 100644 (file)
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -116,6 +116,12 @@ M: Paul Kocialkowski <contact@paulk.fr>
 S:     Maintained
 F:     configs/Ainol_AW1_defconfig
 
+AMARULA A64-RELIC
+M:     Jagan Teki <jagan@amarulasolutions.com>
+S:     Maintained
+F:     configs/amarula_a64_relic_defconfig
+F:     arch/arm/dts/sun50i-a64-amarula-relic.dts
+
 AMPE A76 BOARD
 M:     Paul Kocialkowski <contact@paulk.fr>
 S:     Maintained
@@ -126,6 +132,11 @@ M: Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
 F:     configs/bananapi_m1_plus_defconfig
 
+BANANAPI M2 BERRY
+M:     Jagan Teki <jagan@amarulasolutions.com>
+S:     Maintained
+F:     configs/bananapi_m2_berry_defconfig
+
 BANANAPI M2 ULTRA BOARD
 M:     Chen-Yu Tsai <wens@csie.org>
 S:     Maintained
@@ -133,7 +144,7 @@ F:  configs/Bananapi_M2_Ultra_defconfig
 F:     arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
 
 BANANAPI M2 MAGIC BOARD
-M:     Maxime Ripard <maxime.ripard@free-electrons.com>
+M:     Maxime Ripard <maxime.ripard@bootlin.com>
 S:     Maintained
 F:     configs/Bananapi_m2m_defconfig
 F:     arch/arm/dts/sun8i-r16-bananapi-m2m.dts
@@ -144,7 +155,7 @@ S:  Maintained
 F:     configs/bananapi_m64_defconfig
 
 COLOMBUS BOARD
-M:     Maxime Ripard <maxime.ripard@free-electrons.com>
+M:     Maxime Ripard <maxime.ripard@bootlin.com>
 S:     Maintained
 F:     configs/Colombus_defconfig
 
@@ -266,10 +277,12 @@ M:        Siarhei Siamashka <siarhei.siamashka@gmail.com>
 S:     Maintained
 F:     configs/MSI_Primo81_defconfig
 
-LIBRETECH ALL-H3-CC H3 BOARD
+LIBRETECH ALL-H3-CC BOARDS
 M:     Chen-Yu Tsai <wens@csie.org>
 S:     Maintained
+F:     configs/libretech_all_h3_cc_h2_plus_defconfig
 F:     configs/libretech_all_h3_cc_h3_defconfig
+F:     configs/libretech_all_h3_cc_h5_defconfig
 
 NANOPI-M1 BOARD
 M:     Mylène Josserand <mylene.josserand@free-electrons.com>
@@ -311,6 +324,12 @@ M: FUKAUMI Naoki <naobsd@gmail.com>
 S:     Maintained
 F:     configs/Nintendo_NES_Classic_Edition_defconfig
 
+OLIMEX A20-SOM204 BOARD
+M:     Stefan Mavrodiev <stefan@olimex.com>
+S:     Maintained
+F:     configs/A20-Olimex-SOM204-EVB_defconfig
+F:     configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
+
 ORANGEPI WIN/WIN PLUS BOARD
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
@@ -321,6 +340,11 @@ M: Icenowy Zheng <icenowy@aosc.xyz>
 S:     Maintained
 F:     configs/orangepi_zero_defconfig
 
+ORANGEPI ZERO PLUS BOARD
+M:     Hauke Mehrtens <hauke@hauke-m.de>
+S:     Maintained
+F:     configs/orangepi_zero_plus_defconfig
+
 ORANGEPI ZERO PLUS 2 BOARD
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
@@ -336,6 +360,11 @@ M: Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
 F:     configs/orangepi_prime_defconfig
 
+ORANGEPI R1 BOARD
+M:     Hauke Mehrtens <hauke@hauke-m.de>
+S:     Maintained
+F:     configs/orangepi_r1_defconfig
+
 PINE64 BOARDS
 M:     Andre Przywara <andre.przywara@arm.com>
 S:     Maintained
@@ -379,6 +408,11 @@ S: Maintained
 F:     configs/Sunchip_CX-A99_defconfig
 W:     https://linux-sunxi.org/Sunchip_CX-A99
 
+TBS A711 BOARD
+M:     Maxime Ripard <maxime.ripard@bootlin.com>
+S:     Maintained
+F:     configs/tbs_a711_defconfig
+
 WEXLER-TAB7200 BOARD
 M:     Aleksei Mamlin <mamlinav@gmail.com>
 S:     Maintained