Skip to contentSkip to conversation

MAINTAINERS: Clean up AMD/Xilinx fragments

PATCH Applied Michal Simek 2 participants 5 messages Aug 13 – Aug 24

lore
Share & tools
lore
#0 lore raw

cover MAINTAINERS: Clean up AMD/Xilinx fragments

Hi,

based on my discussion with Marek I have looked at my fragments and put together ARM SOC to have only one entry instead of more. Also found that move to u-boot-amd is not covered that's why also created one patch to fix it.

Thanks,
Michal

Michal Simek (2):
MAINTAINERS: Move u-boot-microblaze to u-boot-amd
MAINTAINERS: Put together AMD/XILINX platforms to one fragment

 MAINTAINERS | 74 +++++++++++++++--------------------------------------
 1 file changed, 21 insertions(+), 53 deletions(-)

---
base-commit: 0b581a9612e46310ee52bf8359165950d38b2a2b

Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 MAINTAINERS: Move u-boot-microblaze to u-boot-amd

By moving to u-boot-project.org custodian tree has been also renamed to reflect current situation around AMD/XILINX SOCs but links to repo haven't been updated.

---

 MAINTAINERS | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
MAINTAINERS +7 -7
index eb48eea55c5a..5b07ab6656a9 100644
@@ -805,7 +805,7 @@ N:	uniphier
 ARM VERSAL NET
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	arch/arm/mach-versal-net/
 F:	drivers/soc/soc_xilinx_versal_net.c
 N:	(?<!uni)versal-net
@@ -813,7 +813,7 @@ N:	(?<!uni)versal-net
 ARM VERSAL
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	arch/arm/mach-versal/
 F:	drivers/net/xilinx_axi_mrmac.*
 F:	drivers/soc/soc_xilinx_versal.c
@@ -824,7 +824,7 @@ N:	(?<!uni)versal
 ARM VERSAL GEN 2
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	arch/arm/mach-versal2/
 
 ARM VERSATILE EXPRESS DRIVERS
@@ -838,7 +838,7 @@ ARM ZYNQ and ZYNQMP
 M:	Michal Simek <[email protected]>
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	doc/board/xilinx/
 F:	doc/device-tree-bindings/video/syncoam,seps525.txt
 F:	drivers/gpio/gpio_slg7xl45106.c
@@ -856,7 +856,7 @@ N:	zynq
 ARM ZYNQMP R5
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	arch/arm/mach-zynqmp-r5/
 
 ARM PHYTIUM
@@ -1125,7 +1125,7 @@ F:	test/dm/fastboot.c
 FPGA
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	drivers/fpga/
 F:	cmd/fpga.c
 F:	include/fpga.h
@@ -1274,7 +1274,7 @@ F:	lib/membuf.c
 MICROBLAZE
 M:	Michal Simek <[email protected]>
 S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-microblaze.git
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
 F:	arch/microblaze/
 F:	cmd/mfsl.c
 F:	drivers/gpio/xilinx_gpio.c
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 MAINTAINERS: Put together AMD/XILINX platforms to one fragment

In reply to Michal Simek

Put together multiple SOCs fragment under the same umbrella to cover all ARM based AMD/Xilinx platforms. Also use this oportunity to simplify description and remove files are already covered by N:.
Also move N: xilinx from Microblaze because multiple files have been added over years which belong to ARM SOCs instead of Microblaze.

---

 MAINTAINERS | 70 +++++++++++++++--------------------------------------
 1 file changed, 19 insertions(+), 51 deletions(-)
MAINTAINERS +19 -51
index 5b07ab6656a9..e1171f4d01b4 100644
@@ -181,6 +181,25 @@ F:	drivers/ddr/altera/
 F:	drivers/power/domain/altr-pmgr-agilex5.c
 F:	drivers/sysreset/sysreset_socfpga*
 
+ARM AMD/XILINX
+M:	Michal Simek <[email protected]>
+M:	Michal Simek <[email protected]>
+S:	Maintained
+T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
+F:	doc/device-tree-bindings/video/syncoam,seps525.txt
+F:	drivers/gpio/gpio_slg7xl45106.c
+F:	drivers/i2c/i2c-cdns.c
+F:	drivers/i2c/muxes/pca954x.c
+F:	drivers/net/phy/ethernet_id.c
+F:	drivers/pwm/pwm-cadence-ttc.c
+F:	drivers/timer/cadence-ttc.c
+F:	drivers/video/seps525.c
+F:	drivers/watchdog/cdns_wdt.c
+N:	(?<!uni)versal
+N:	ultra96
+N:	zynq
+N:	xilinx
+
 ARM AMLOGIC SOC SUPPORT
 M:	Neil Armstrong <[email protected]>
 S:	Maintained
@@ -802,31 +821,6 @@ F:	arch/arm/mach-uniphier/
 F:	configs/uniphier_*_defconfig
 N:	uniphier
 
-ARM VERSAL NET
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal-net/
-F:	drivers/soc/soc_xilinx_versal_net.c
-N:	(?<!uni)versal-net
-
-ARM VERSAL
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal/
-F:	drivers/net/xilinx_axi_mrmac.*
-F:	drivers/soc/soc_xilinx_versal.c
-F:	drivers/spi/cadence_ospi_versal.c
-F:	drivers/watchdog/xilinx_wwdt.c
-N:	(?<!uni)versal
-
-ARM VERSAL GEN 2
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-versal2/
-
 ARM VERSATILE EXPRESS DRIVERS
 M:	Liviu Dudau <[email protected]>
 S:	Maintained
@@ -834,31 +828,6 @@ T:	git git://github.com/ARM-software/u-boot.git
 F:	drivers/misc/vexpress_config.c
 N:	vexpress
 
-ARM ZYNQ and ZYNQMP
-M:	Michal Simek <[email protected]>
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	doc/board/xilinx/
-F:	doc/device-tree-bindings/video/syncoam,seps525.txt
-F:	drivers/gpio/gpio_slg7xl45106.c
-F:	drivers/i2c/i2c-cdns.c
-F:	drivers/i2c/muxes/pca954x.c
-F:	drivers/net/phy/ethernet_id.c
-F:	drivers/net/phy/xilinx_phy.c
-F:	drivers/pwm/pwm-cadence-ttc.c
-F:	drivers/timer/cadence-ttc.c
-F:	drivers/video/seps525.c
-F:	drivers/watchdog/cdns_wdt.c
-N:	ultra96
-N:	zynq
-
-ARM ZYNQMP R5
-M:	Michal Simek <[email protected]>
-S:	Maintained
-T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F:	arch/arm/mach-zynqmp-r5/
-
 ARM PHYTIUM
 M:	liuhao <[email protected]>
 M:	shuyiqi <[email protected]>
@@ -1285,7 +1254,6 @@ F:	drivers/spi/xilinx_spi.c
 F:	drivers/sysreset/sysreset_gpio.c
 F:	drivers/timer/xilinx-timer.c
 F:	drivers/watchdog/xilinx_tb_wdt.c
-N:	xilinx
 
 MIPS
 M:	Daniel Schwierzeck <[email protected]>
Signature · 1 line
2.43.0
Reviewed-by Marek Vasut on v1 2/2
#3 lore raw

Re: [PATCH 2/2] MAINTAINERS: Put together AMD/XILINX platforms to one fragment

Quoted 11 lines · Michal Simek

Put together multiple SOCs fragment under the same umbrella to cover all ARM based AMD/Xilinx platforms. Also use this oportunity to simplify description and remove files are already covered by N:.
Also move N: xilinx from Microblaze because multiple files have been added over years which belong to ARM SOCs instead of Microblaze.

---

  MAINTAINERS | 70 +++++++++++++++--------------------------------------
  1 file changed, 19 insertions(+), 51 deletions(-)

This is nice ^^ ^^

author Applied
#4 lore raw
In reply to Michal Simek
Quoted 15 lines · Michal Simek

Hi,

based on my discussion with Marek I have looked at my fragments and put together ARM SOC to have only one entry instead of more. Also found that move to u-boot-amd is not covered that's why also created one patch to fix it.

Thanks,
Michal

Michal Simek (2):
MAINTAINERS: Move u-boot-microblaze to u-boot-amd
MAINTAINERS: Put together AMD/XILINX platforms to one fragment

Quoted 6 lines
  MAINTAINERS | 74 +++++++++++++++--------------------------------------
  1 file changed, 21 insertions(+), 53 deletions(-)

---
base-commit: 0b581a9612e46310ee52bf8359165950d38b2a2b

Applied.
M