summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2022-04-14 15:50:46 +0200
committerTom Rini <trini@konsulko.com>2022-04-19 14:51:11 -0400
commitfcbdd7a070687d68e589cdaa752e2043d45ef9db (patch)
treeeaa24e7b38453d5b2b145985f23d48db1cfd3fe5
parent5f2d5915f8ea4785bc2b8a26955e176a7898c15b (diff)
.mailmap: Start to use new amd.com email address
Xilinx has been acquired by AMD that's why emails should be also updated. The patch is updating .mailmap file and also MAINTAINERS files as was done by commit 5cd1ecb99490 ("ppc: qemu: Update MAINTAINERS for correct email address"). The rest of my emails are not going to change. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Michal Simek <michal.simek@amd.com>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS8
-rw-r--r--board/xilinx/versal/MAINTAINERS2
-rw-r--r--board/xilinx/zynqmp/MAINTAINERS2
-rw-r--r--board/xilinx/zynqmp_r5/MAINTAINERS2
5 files changed, 8 insertions, 7 deletions
diff --git a/.mailmap b/.mailmap
index 1f88ea953ce..3910e056f0d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,7 @@ Marek Vasut <marex@denx.de> <marex at denx.de>
Markus Klotzbuecher <mk@denx.de>
Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
+Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>
diff --git a/MAINTAINERS b/MAINTAINERS
index 34446127d4c..f7665fccf7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -594,7 +594,7 @@ F: configs/uniphier_*_defconfig
N: uniphier
ARM VERSAL
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-versal/
@@ -639,7 +639,7 @@ F: tools/zynqimage.c
N: zynq
ARM ZYNQMP
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-zynqmp/
@@ -676,7 +676,7 @@ N: ultra96
N: zynqmp
ARM ZYNQMP R5
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-zynqmp-r5/
@@ -852,7 +852,7 @@ F: net/fastboot.c
F: test/dm/fastboot.c
FPGA
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: drivers/fpga/
diff --git a/board/xilinx/versal/MAINTAINERS b/board/xilinx/versal/MAINTAINERS
index bbab0513666..a13b6566164 100644
--- a/board/xilinx/versal/MAINTAINERS
+++ b/board/xilinx/versal/MAINTAINERS
@@ -1,5 +1,5 @@
XILINX_VERSAL BOARDS
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/dts/versal*
diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS
index 56c637943f6..17a2766413c 100644
--- a/board/xilinx/zynqmp/MAINTAINERS
+++ b/board/xilinx/zynqmp/MAINTAINERS
@@ -1,5 +1,5 @@
XILINX_ZYNQMP BOARDS
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/dts/zynqmp-*
diff --git a/board/xilinx/zynqmp_r5/MAINTAINERS b/board/xilinx/zynqmp_r5/MAINTAINERS
index ac267649781..aa50e6dae5f 100644
--- a/board/xilinx/zynqmp_r5/MAINTAINERS
+++ b/board/xilinx/zynqmp_r5/MAINTAINERS
@@ -1,5 +1,5 @@
XILINX_ZYNQMP_R5 BOARDS
-M: Michal Simek <michal.simek@xilinx.com>
+M: Michal Simek <michal.simek@amd.com>
S: Maintained
F: arch/arm/dts/zynqmp-r5*
F: board/xilinx/zynqmp_r5/