Skip to contentSkip to conversation

board: turris: Fix MAINTAINERS and add Pali

PATCH In review Marek Behún 2 participants 6 messages Jun 1, 2022 – Jul 21, 2022

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board: turris: Fix MAINTAINERS and add Pali

From: Marek Behún <[email protected]>

Fix MAINTAINERS files for Turris devices, add missing files and add Pali as maintainer.

---
 MAINTAINERS                           | 8 --------
 board/CZ.NIC/turris_mox/MAINTAINERS   | 4 +++-
 board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
 3 files changed, 7 insertions(+), 10 deletions(-)
MAINTAINERS +0 -8
index 72bf94c3d1..1c7baf9412 100644
@@ -235,14 +235,6 @@ F:	drivers/net/cortina_ni.h
 F:	drivers/net/phy/ca_phy.c
 F:	configs/cortina_presidio-asic-pnand_defconfig
 
-ARM/CZ.NIC TURRIS MOX SUPPORT
-M:	Marek Behun <[email protected]>
-S:	Maintained
-F:	arch/arm/dts/armada-3720-turris-mox.dts
-F:	board/CZ.NIC/
-F:	configs/turris_*_defconfig
-F:	include/configs/turris_*.h
-
 ARM FREESCALE IMX
 M:	Stefano Babic <[email protected]>
 M:	Fabio Estevam <[email protected]>
board/CZ.NIC/turris_mox/MAINTAINERS +3 -1
index 2b9c1132f5..3c3e477f30 100644
@@ -1,6 +1,8 @@
-TURRIS OMNIA BOARD
+TURRIS MOX BOARD
 M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
 S:	Maintained
+F:	arch/arm/dts/armada-3720-turris-mox*.dts*
 F:	board/CZ.NIC/turris_mox/
 F:	include/configs/turris_mox.h
 F:	configs/turris_mox_defconfig
board/CZ.NIC/turris_omnia/MAINTAINERS +4 -1
index ed15e11d3e..f653c4af86 100644
@@ -1,6 +1,9 @@
 TURRIS OMNIA BOARD
 M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
 S:	Maintained
+F:	arch/arm/dts/armada-385-turris-omnia*.dts*
+F:	board/CZ.NIC/turris_atsha_otp.*
 F:	board/CZ.NIC/turris_omnia/
-F:	include/configs/turris_omnia.h
 F:	configs/turris_omnia_defconfig
+F:	include/configs/turris_omnia.h
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/2 treewide: Fix Marek's name and change my e-mail address

Fix diacritics in some instances of my name and change my e-mail address to [email protected].

Add corresponding .mailmap entries.

---
 .mailmap                                         | 2 ++
 MAINTAINERS                                      | 4 ++--
 arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
 arch/arm/mach-mvebu/armada3700/cpu.c             | 2 +-
 arch/arm/mach-mvebu/armada3700/mbox.c            | 2 +-
 arch/arm/mach-mvebu/include/mach/mbox.h          | 2 +-
 board/CZ.NIC/turris_atsha_otp.c                  | 2 +-
 board/CZ.NIC/turris_mox/MAINTAINERS              | 2 +-
 board/CZ.NIC/turris_mox/Makefile                 | 2 +-
 board/CZ.NIC/turris_mox/mox_sp.c                 | 2 +-
 board/CZ.NIC/turris_mox/mox_sp.h                 | 2 +-
 board/CZ.NIC/turris_mox/turris_mox.c             | 2 +-
 board/CZ.NIC/turris_omnia/MAINTAINERS            | 2 +-
 board/CZ.NIC/turris_omnia/Makefile               | 2 +-
 board/CZ.NIC/turris_omnia/turris_omnia.c         | 2 +-
 cmd/btrfs.c                                      | 2 +-
 doc/kwboot.1                                     | 2 +-
 drivers/clk/mvebu/armada-37xx-periph.c           | 2 +-
 drivers/clk/mvebu/armada-37xx-tbg.c              | 2 +-
 drivers/misc/atsha204a-i2c.c                     | 2 +-
 drivers/rtc/armada38x.c                          | 2 +-
 drivers/watchdog/armada-37xx-wdt.c               | 2 +-
 drivers/watchdog/orion_wdt.c                     | 2 +-
 fs/btrfs/Makefile                                | 2 +-
 fs/btrfs/btrfs.c                                 | 2 +-
 fs/btrfs/btrfs.h                                 | 2 +-
 fs/btrfs/compression.c                           | 2 +-
 fs/btrfs/conv-funcs.h                            | 2 +-
 fs/btrfs/ctree.c                                 | 2 +-
 fs/btrfs/ctree.h                                 | 2 +-
 fs/btrfs/dev.c                                   | 2 +-
 fs/btrfs/dir-item.c                              | 2 +-
 fs/btrfs/extent-io.c                             | 2 +-
 fs/btrfs/inode.c                                 | 2 +-
 fs/btrfs/subvolume.c                             | 2 +-
 fs/fs_internal.c                                 | 2 +-
 include/atsha204a-i2c.h                          | 2 +-
 include/btrfs.h                                  | 2 +-
 include/configs/turris_mox.h                     | 2 +-
 include/configs/turris_omnia.h                   | 2 +-
 include/fs_internal.h                            | 2 +-
 include/u-boot/variadic-macro.h                  | 2 +-
 scripts/gen_ll_addressable_symbols.sh            | 2 +-
 tools/kwboot.c                                   | 2 +-
 tools/termios_linux.h                            | 2 +-
 45 files changed, 47 insertions(+), 45 deletions(-)
.mailmap +2 -0
index 3910e056f0..f27f366bcb 100644
@@ -37,6 +37,8 @@ Jagan Teki <[email protected]>
 Jernej Skrabec <[email protected]> <[email protected]>
 Igor Opaniuk <[email protected]> <[email protected]>
 Igor Opaniuk <[email protected]> <[email protected]>
+Marek Behún <[email protected]> <[email protected]>
+Marek Behún <[email protected]> Marek Behun <[email protected]>
 Marek Vasut <[email protected]> <[email protected]>
 Marek Vasut <[email protected]> <[email protected]>
 Marek Vasut <[email protected]> <marex at denx.de>
MAINTAINERS +2 -2
index 1c7baf9412..2dae092a87 100644
@@ -727,7 +727,7 @@ F:	net/eth_bootdevice.c
 F:	test/boot/
 
 BTRFS
-M:	Marek Behun <[email protected]>
+M:	Marek Behún <[email protected]>
 R:	Qu Wenruo <[email protected]>
 L:	[email protected]
 S:	Maintained
@@ -930,7 +930,7 @@ F:	drivers/i2c/
 
 KWBIMAGE / KWBOOT TOOLS
 M:	Pali Rohár <[email protected]>
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
 M:	Stefan Roese <[email protected]>
 S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1 -1
index 64ebe2c6d4..5a22cc64a1 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
  */
 
 / {
arch/arm/mach-mvebu/armada3700/cpu.c +1 -1
index 52b5109b73..ab72b304e5 100644
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Stefan Roese <[email protected]>
- * Copyright (C) 2020 Marek Behun <[email protected]>
+ * Copyright (C) 2020 Marek Behún <[email protected]>
  */
 
 #include <common.h>
arch/arm/mach-mvebu/armada3700/mbox.c +1 -1
index eb1f82845f..6555b8673c 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  * Copyright (C) 2021 Pali Rohár <[email protected]>
  */
 
arch/arm/mach-mvebu/include/mach/mbox.h +1 -1
index f1cb55f2bf..fcc7a46c1d 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  * Copyright (C) 2021 Pali Rohár <[email protected]>
  */
 
board/CZ.NIC/turris_atsha_otp.c +1 -1
index e62b7ee2a4..aa4e29b156 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
  * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
  */
 
board/CZ.NIC/turris_mox/MAINTAINERS +1 -1
index 3c3e477f30..b29ce92ccd 100644
@@ -1,5 +1,5 @@
 TURRIS MOX BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
 M:	Pali Rohár <[email protected]>
 S:	Maintained
 F:	arch/arm/dts/armada-3720-turris-mox*.dts*
board/CZ.NIC/turris_mox/Makefile +1 -1
index 33a52b63d7..2196821b81 100644
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2018 Marek Behun <[email protected]>
+# Copyright (C) 2018 Marek Behún <[email protected]>
 
 obj-y	:= turris_mox.o mox_sp.o
board/CZ.NIC/turris_mox/mox_sp.c +1 -1
index 93e96b014f..87f67512fb 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  */
 
 #include <common.h>
board/CZ.NIC/turris_mox/mox_sp.h +1 -1
index 49a4ed80ea..83b6037458 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  */
 
 #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
board/CZ.NIC/turris_mox/turris_mox.c +1 -1
index 68bc315a9c..28259e7140 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  */
 
 #include <common.h>
board/CZ.NIC/turris_omnia/MAINTAINERS +1 -1
index f653c4af86..8258f4fc5b 100644
@@ -1,5 +1,5 @@
 TURRIS OMNIA BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
 M:	Pali Rohár <[email protected]>
 S:	Maintained
 F:	arch/arm/dts/armada-385-turris-omnia*.dts*
board/CZ.NIC/turris_omnia/Makefile +1 -1
index b79555ab46..dc39b44ae1 100644
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2017 Marek Behun <[email protected]>
+# Copyright (C) 2017 Marek Behún <[email protected]>
 
 obj-y	:= turris_omnia.o ../turris_atsha_otp.o
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
index b169abca09..5921769f1e 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
  * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
  *
  * Derived from the code for
cmd/btrfs.c +1 -1
index 7e3cbe12ce..98daea99e9 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
  */
 
 #include <common.h>
doc/kwboot.1 +1 -1
index d663bf1f77..0863d197fd 100644
@@ -194,4 +194,4 @@ David Purdy <[email protected]>
 .br
 Pali Rohár <[email protected]>
 .br
-Marek Behún <[email protected]>
+Marek Behún <[email protected]>
drivers/clk/mvebu/armada-37xx-periph.c +1 -1
index 3b767d7060..e75052f383 100644
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Peripheral clocks
  *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
  *
  * Based on Linux driver by:
  *   Gregory CLEMENT <[email protected]>
drivers/clk/mvebu/armada-37xx-tbg.c +1 -1
index 054aff5e6a..846a73cd6b 100644
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Time Base Generator clocks
  *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
  *
  * Based on Linux driver by:
  *   Gregory CLEMENT <[email protected]>
drivers/misc/atsha204a-i2c.c +1 -1
index aa6acf0f9a..294b42a5fc 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
  *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as
drivers/rtc/armada38x.c +1 -1
index 2af64e3912..d0fe5dd7a8 100644
@@ -2,7 +2,7 @@
 /*
  * RTC driver for the Armada 38x Marvell SoCs
  *
- * Copyright (C) 2021 Marek Behun <[email protected]>
+ * Copyright (C) 2021 Marek Behún <[email protected]>
  *
  * Based on Linux' driver by Gregory Clement and Marvell
  */
drivers/watchdog/armada-37xx-wdt.c +1 -1
index bacebbc792..e09f5ac9e3 100644
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Watchdog Driver
  *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
  */
 
 #include <common.h>
drivers/watchdog/orion_wdt.c +1 -1
index c30ed82217..127766df58 100644
@@ -5,7 +5,7 @@
  *
  * Authors:	Tomas Hlavacek <[email protected]>
  *		Sylver Bruneau <[email protected]>
- *		Marek Behun <[email protected]>
+ *		Marek Behún <[email protected]>
  *
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
fs/btrfs/Makefile +1 -1
index fc074c84d2..31b426d572 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# 2017 Marek Behun, CZ.NIC, [email protected]
+# 2017 Marek Behún, CZ.NIC, [email protected]
 
 obj-y := btrfs.o compression.o ctree.o dev.o dir-item.o \
 	extent-io.o inode.o subvolume.o crypto/hash.o disk-io.o \
fs/btrfs/btrfs.c +1 -1
index 741c6e20f5..4cdbbbe3d0 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <config.h>
fs/btrfs/btrfs.h +1 -1
index a52587e063..2bc2f0fd6d 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #ifndef __BTRFS_BTRFS_H__
fs/btrfs/compression.c +1 -1
index 7adfbb04a7..c69524d38e 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include "btrfs.h"
fs/btrfs/conv-funcs.h +1 -1
index 30791cd628..0a7af9dc87 100644
@@ -2,7 +2,7 @@
 /*
  * Functions to convert BTRFS structures from disk to CPU endianness and back.
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #ifndef __BTRFS_CONV_FUNCS_H__
fs/btrfs/ctree.c +1 -1
index 5ffced9160..8e932adc42 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <linux/kernel.h>
fs/btrfs/ctree.h +1 -1
index 55112318a3..ffd095ffdd 100644
@@ -3,7 +3,7 @@
  * From linux/fs/btrfs/ctree.h
  *   Copyright (C) 2007,2008 Oracle.  All rights reserved.
  *
- * Modified in 2017 by Marek Behun, CZ.NIC, [email protected]
+ * Modified in 2017 by Marek Behún, CZ.NIC, [email protected]
  */
 
 #ifndef __BTRFS_CTREE_H__
fs/btrfs/dev.c +1 -1
index 1e5b83235a..cb3b9713a5 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <common.h>
fs/btrfs/dir-item.c +1 -1
index aab197a6d5..5f81d6414f 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include "btrfs.h"
fs/btrfs/extent-io.c +1 -1
index 774e29eb60..f4d56a084b 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <linux/kernel.h>
fs/btrfs/inode.c +1 -1
index d00b515333..a34edc43ed 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <linux/kernel.h>
fs/btrfs/subvolume.c +1 -1
index 2815673bcd..d446e7a2c4 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #include <malloc.h>
fs/fs_internal.c +1 -1
index bfc35c996c..ae1cb8584c 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
  *
  * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
  */
include/atsha204a-i2c.h +1 -1
index 39fc0e9ca7..c35f5992e2 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
  *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as
include/btrfs.h +1 -1
index a7605e1589..2d73add18e 100644
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #ifndef __U_BOOT_BTRFS_H__
include/configs/turris_mox.h +1 -1
index 6640ee495d..cedd8105ae 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  *
  * Based on mvebu_armada-37xx.h by Stefan Roese <[email protected]>
  */
include/configs/turris_omnia.h +1 -1
index 8119340b11..62cc608a8f 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
  * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
  */
 
include/fs_internal.h +1 -1
index 3d4d25da96..07f6bc5ea4 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
  *
  * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
  */
include/u-boot/variadic-macro.h +1 -1
index cb815d0fee..c5fa1b80e3 100644
@@ -2,7 +2,7 @@
 /*
  * Helper for work with variadic macros
  *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
 #ifndef __VARIADIC_MACRO_H__
scripts/gen_ll_addressable_symbols.sh +1 -1
index b8840dd011..d0864804aa 100755
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0+
-# Copyright (C) 2020 Marek Behún <[email protected]>
+# Copyright (C) 2020 Marek Behún <[email protected]>
 
 # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO
 # does not optimize these symbols away
tools/kwboot.c +1 -1
index b697d3b60e..16bcd4d9a7 100644
@@ -5,7 +5,7 @@
  *
  * (c) 2012 Daniel Stodden <[email protected]>
  * (c) 2021 Pali Rohár <[email protected]>
- * (c) 2021 Marek Behún <[email protected]>
+ * (c) 2021 Marek Behún <[email protected]>
  *
  * References:
  * - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional
tools/termios_linux.h +1 -1
index e100c8e4eb..45f5c1233c 100644
@@ -3,7 +3,7 @@
  * termios fuctions to support arbitrary baudrates (on Linux)
  *
  * Copyright (c) 2021 Pali Rohár <[email protected]>
- * Copyright (c) 2021 Marek Behún <[email protected]>
+ * Copyright (c) 2021 Marek Behún <[email protected]>
  */
 
 #ifndef _TERMIOS_LINUX_H_
Signature · 1 line
2.35.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address

Quoted 6 lines · Marek Behún

Fix diacritics in some instances of my name and change my e-mail address to [email protected].

Add corresponding .mailmap entries.

Thanks,
Stefan

Quoted 608 lines
---
  .mailmap                                         | 2 ++
  MAINTAINERS                                      | 4 ++--
  arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
  arch/arm/mach-mvebu/armada3700/cpu.c             | 2 +-
  arch/arm/mach-mvebu/armada3700/mbox.c            | 2 +-
  arch/arm/mach-mvebu/include/mach/mbox.h          | 2 +-
  board/CZ.NIC/turris_atsha_otp.c                  | 2 +-
  board/CZ.NIC/turris_mox/MAINTAINERS              | 2 +-
  board/CZ.NIC/turris_mox/Makefile                 | 2 +-
  board/CZ.NIC/turris_mox/mox_sp.c                 | 2 +-
  board/CZ.NIC/turris_mox/mox_sp.h                 | 2 +-
  board/CZ.NIC/turris_mox/turris_mox.c             | 2 +-
  board/CZ.NIC/turris_omnia/MAINTAINERS            | 2 +-
  board/CZ.NIC/turris_omnia/Makefile               | 2 +-
  board/CZ.NIC/turris_omnia/turris_omnia.c         | 2 +-
  cmd/btrfs.c                                      | 2 +-
  doc/kwboot.1                                     | 2 +-
  drivers/clk/mvebu/armada-37xx-periph.c           | 2 +-
  drivers/clk/mvebu/armada-37xx-tbg.c              | 2 +-
  drivers/misc/atsha204a-i2c.c                     | 2 +-
  drivers/rtc/armada38x.c                          | 2 +-
  drivers/watchdog/armada-37xx-wdt.c               | 2 +-
  drivers/watchdog/orion_wdt.c                     | 2 +-
  fs/btrfs/Makefile                                | 2 +-
  fs/btrfs/btrfs.c                                 | 2 +-
  fs/btrfs/btrfs.h                                 | 2 +-
  fs/btrfs/compression.c                           | 2 +-
  fs/btrfs/conv-funcs.h                            | 2 +-
  fs/btrfs/ctree.c                                 | 2 +-
  fs/btrfs/ctree.h                                 | 2 +-
  fs/btrfs/dev.c                                   | 2 +-
  fs/btrfs/dir-item.c                              | 2 +-
  fs/btrfs/extent-io.c                             | 2 +-
  fs/btrfs/inode.c                                 | 2 +-
  fs/btrfs/subvolume.c                             | 2 +-
  fs/fs_internal.c                                 | 2 +-
  include/atsha204a-i2c.h                          | 2 +-
  include/btrfs.h                                  | 2 +-
  include/configs/turris_mox.h                     | 2 +-
  include/configs/turris_omnia.h                   | 2 +-
  include/fs_internal.h                            | 2 +-
  include/u-boot/variadic-macro.h                  | 2 +-
  scripts/gen_ll_addressable_symbols.sh            | 2 +-
  tools/kwboot.c                                   | 2 +-
  tools/termios_linux.h                            | 2 +-
  45 files changed, 47 insertions(+), 45 deletions(-)
.mailmap +2 -0
index 3910e056f0..f27f366bcb 100644
@@ -37,6 +37,8 @@ Jagan Teki <[email protected]>
  Jernej Skrabec <[email protected]> <[email protected]>
  Igor Opaniuk <[email protected]> <[email protected]>
  Igor Opaniuk <[email protected]> <[email protected]>
+Marek Behún <[email protected]> <[email protected]>
+Marek Behún <[email protected]> Marek Behun <[email protected]>
  Marek Vasut <[email protected]> <[email protected]>
  Marek Vasut <[email protected]> <[email protected]>
  Marek Vasut <[email protected]> <marex at denx.de>
MAINTAINERS +2 -2
index 1c7baf9412..2dae092a87 100644
@@ -727,7 +727,7 @@ F:	net/eth_bootdevice.c
  F:	test/boot/
 
  BTRFS
-M:	Marek Behun <[email protected]>
+M:	Marek Behún <[email protected]>
  R:	Qu Wenruo <[email protected]>
  L:	[email protected]
  S:	Maintained
@@ -930,7 +930,7 @@ F:	drivers/i2c/
 
  KWBIMAGE / KWBOOT TOOLS
  M:	Pali Rohár <[email protected]>
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Stefan Roese <[email protected]>
  S:	Maintained
  T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1 -1
index 64ebe2c6d4..5a22cc64a1 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   */
 
  / {
arch/arm/mach-mvebu/armada3700/cpu.c +1 -1
index 52b5109b73..ab72b304e5 100644
@@ -1,7 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
   * Copyright (C) 2016 Stefan Roese <[email protected]>
- * Copyright (C) 2020 Marek Behun <[email protected]>
+ * Copyright (C) 2020 Marek Behún <[email protected]>
   */
 
  #include <common.h>
arch/arm/mach-mvebu/armada3700/mbox.c +1 -1
index eb1f82845f..6555b8673c 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   * Copyright (C) 2021 Pali Rohár <[email protected]>
   */
 
arch/arm/mach-mvebu/include/mach/mbox.h +1 -1
index f1cb55f2bf..fcc7a46c1d 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   * Copyright (C) 2021 Pali Rohár <[email protected]>
   */
 
board/CZ.NIC/turris_atsha_otp.c +1 -1
index e62b7ee2a4..aa4e29b156 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   */
 
board/CZ.NIC/turris_mox/MAINTAINERS +1 -1
index 3c3e477f30..b29ce92ccd 100644
@@ -1,5 +1,5 @@
  TURRIS MOX BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Pali Rohár <[email protected]>
  S:	Maintained
  F:	arch/arm/dts/armada-3720-turris-mox*.dts*
board/CZ.NIC/turris_mox/Makefile +1 -1
index 33a52b63d7..2196821b81 100644
@@ -1,5 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# Copyright (C) 2018 Marek Behun <[email protected]>
+# Copyright (C) 2018 Marek Behún <[email protected]>
 
  obj-y	:= turris_mox.o mox_sp.o
board/CZ.NIC/turris_mox/mox_sp.c +1 -1
index 93e96b014f..87f67512fb 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #include <common.h>
board/CZ.NIC/turris_mox/mox_sp.h +1 -1
index 49a4ed80ea..83b6037458 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
board/CZ.NIC/turris_mox/turris_mox.c +1 -1
index 68bc315a9c..28259e7140 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #include <common.h>
board/CZ.NIC/turris_omnia/MAINTAINERS +1 -1
index f653c4af86..8258f4fc5b 100644
@@ -1,5 +1,5 @@
  TURRIS OMNIA BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Pali Rohár <[email protected]>
  S:	Maintained
  F:	arch/arm/dts/armada-385-turris-omnia*.dts*
board/CZ.NIC/turris_omnia/Makefile +1 -1
index b79555ab46..dc39b44ae1 100644
@@ -1,5 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# Copyright (C) 2017 Marek Behun <[email protected]>
+# Copyright (C) 2017 Marek Behún <[email protected]>
 
  obj-y	:= turris_omnia.o ../turris_atsha_otp.o
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
index b169abca09..5921769f1e 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   *
   * Derived from the code for
cmd/btrfs.c +1 -1
index 7e3cbe12ce..98daea99e9 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   */
 
  #include <common.h>
doc/kwboot.1 +1 -1
index d663bf1f77..0863d197fd 100644
@@ -194,4 +194,4 @@ David Purdy <[email protected]>
  .br
  Pali Rohár <[email protected]>
  .br
-Marek Behún <[email protected]>
+Marek Behún <[email protected]>
drivers/clk/mvebu/armada-37xx-periph.c +1 -1
index 3b767d7060..e75052f383 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Peripheral clocks
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   *
   * Based on Linux driver by:
   *   Gregory CLEMENT <[email protected]>
drivers/clk/mvebu/armada-37xx-tbg.c +1 -1
index 054aff5e6a..846a73cd6b 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Time Base Generator clocks
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   *
   * Based on Linux driver by:
   *   Gregory CLEMENT <[email protected]>
drivers/misc/atsha204a-i2c.c +1 -1
index aa6acf0f9a..294b42a5fc 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
   *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
   *
   * This program is free software; you can redistribute  it and/or modify it
   * under the terms of the GNU General Public License version 2 as
drivers/rtc/armada38x.c +1 -1
index 2af64e3912..d0fe5dd7a8 100644
@@ -2,7 +2,7 @@
  /*
   * RTC driver for the Armada 38x Marvell SoCs
   *
- * Copyright (C) 2021 Marek Behun <[email protected]>
+ * Copyright (C) 2021 Marek Behún <[email protected]>
   *
   * Based on Linux' driver by Gregory Clement and Marvell
   */
drivers/watchdog/armada-37xx-wdt.c +1 -1
index bacebbc792..e09f5ac9e3 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Watchdog Driver
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   */
 
  #include <common.h>
drivers/watchdog/orion_wdt.c +1 -1
index c30ed82217..127766df58 100644
@@ -5,7 +5,7 @@
   *
   * Authors:	Tomas Hlavacek <[email protected]>
   *		Sylver Bruneau <[email protected]>
- *		Marek Behun <[email protected]>
+ *		Marek Behún <[email protected]>
   *
   * This file is licensed under  the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any
fs/btrfs/Makefile +1 -1
index fc074c84d2..31b426d572 100644
@@ -1,6 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# 2017 Marek Behun, CZ.NIC, [email protected]
+# 2017 Marek Behún, CZ.NIC, [email protected]
 
  obj-y := btrfs.o compression.o ctree.o dev.o dir-item.o \
  	extent-io.o inode.o subvolume.o crypto/hash.o disk-io.o \
fs/btrfs/btrfs.c +1 -1
index 741c6e20f5..4cdbbbe3d0 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <config.h>
fs/btrfs/btrfs.h +1 -1
index a52587e063..2bc2f0fd6d 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_BTRFS_H__
fs/btrfs/compression.c +1 -1
index 7adfbb04a7..c69524d38e 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include "btrfs.h"
fs/btrfs/conv-funcs.h +1 -1
index 30791cd628..0a7af9dc87 100644
@@ -2,7 +2,7 @@
  /*
   * Functions to convert BTRFS structures from disk to CPU endianness and back.
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_CONV_FUNCS_H__
fs/btrfs/ctree.c +1 -1
index 5ffced9160..8e932adc42 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/ctree.h +1 -1
index 55112318a3..ffd095ffdd 100644
@@ -3,7 +3,7 @@
   * From linux/fs/btrfs/ctree.h
   *   Copyright (C) 2007,2008 Oracle.  All rights reserved.
   *
- * Modified in 2017 by Marek Behun, CZ.NIC, [email protected]
+ * Modified in 2017 by Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_CTREE_H__
fs/btrfs/dev.c +1 -1
index 1e5b83235a..cb3b9713a5 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <common.h>
fs/btrfs/dir-item.c +1 -1
index aab197a6d5..5f81d6414f 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include "btrfs.h"
fs/btrfs/extent-io.c +1 -1
index 774e29eb60..f4d56a084b 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/inode.c +1 -1
index d00b515333..a34edc43ed 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/subvolume.c +1 -1
index 2815673bcd..d446e7a2c4 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <malloc.h>
fs/fs_internal.c +1 -1
index bfc35c996c..ae1cb8584c 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   *
   * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
   */
include/atsha204a-i2c.h +1 -1
index 39fc0e9ca7..c35f5992e2 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
   *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
   *
   * This program is free software; you can redistribute  it and/or modify it
   * under the terms of the GNU General Public License version 2 as
include/btrfs.h +1 -1
index a7605e1589..2d73add18e 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __U_BOOT_BTRFS_H__
include/configs/turris_mox.h +1 -1
index 6640ee495d..cedd8105ae 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   *
   * Based on mvebu_armada-37xx.h by Stefan Roese <[email protected]>
   */
include/configs/turris_omnia.h +1 -1
index 8119340b11..62cc608a8f 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   */
 
include/fs_internal.h +1 -1
index 3d4d25da96..07f6bc5ea4 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   *
   * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
   */
include/u-boot/variadic-macro.h +1 -1
index cb815d0fee..c5fa1b80e3 100644
@@ -2,7 +2,7 @@
  /*
   * Helper for work with variadic macros
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __VARIADIC_MACRO_H__
scripts/gen_ll_addressable_symbols.sh +1 -1
index b8840dd011..d0864804aa 100755
@@ -1,6 +1,6 @@
  #!/bin/bash
  # SPDX-License-Identifier: GPL-2.0+
-# Copyright (C) 2020 Marek Behún <[email protected]>
+# Copyright (C) 2020 Marek Behún <[email protected]>
 
  # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO
  # does not optimize these symbols away
tools/kwboot.c +1 -1
index b697d3b60e..16bcd4d9a7 100644
@@ -5,7 +5,7 @@
   *
   * (c) 2012 Daniel Stodden <[email protected]>
   * (c) 2021 Pali Rohár <[email protected]>
- * (c) 2021 Marek Behún <[email protected]>
+ * (c) 2021 Marek Behún <[email protected]>
   *
   * References:
   * - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional
tools/termios_linux.h +0 -0
index e100c8e4eb..45f5c1233c 100644

tools/termios_linux.h line 9

Quoted 8 lines
tools/termios_linux.h +1 -1
@@ -3,7 +3,7 @@
   * termios fuctions to support arbitrary baudrates (on Linux)
   *
   * Copyright (c) 2021 Pali Rohár <[email protected]>
- * Copyright (c) 2021 Marek Behún <[email protected]>
+ * Copyright (c) 2021 Marek Behún <[email protected]>
   */
 
  #ifndef _TERMIOS_LINUX_H_

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#3 lore raw

Re: [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address

In reply to Marek Behún
Quoted 6 lines · Marek Behún

Fix diacritics in some instances of my name and change my e-mail address to [email protected].

Add corresponding .mailmap entries.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 608 lines
---
  .mailmap                                         | 2 ++
  MAINTAINERS                                      | 4 ++--
  arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
  arch/arm/mach-mvebu/armada3700/cpu.c             | 2 +-
  arch/arm/mach-mvebu/armada3700/mbox.c            | 2 +-
  arch/arm/mach-mvebu/include/mach/mbox.h          | 2 +-
  board/CZ.NIC/turris_atsha_otp.c                  | 2 +-
  board/CZ.NIC/turris_mox/MAINTAINERS              | 2 +-
  board/CZ.NIC/turris_mox/Makefile                 | 2 +-
  board/CZ.NIC/turris_mox/mox_sp.c                 | 2 +-
  board/CZ.NIC/turris_mox/mox_sp.h                 | 2 +-
  board/CZ.NIC/turris_mox/turris_mox.c             | 2 +-
  board/CZ.NIC/turris_omnia/MAINTAINERS            | 2 +-
  board/CZ.NIC/turris_omnia/Makefile               | 2 +-
  board/CZ.NIC/turris_omnia/turris_omnia.c         | 2 +-
  cmd/btrfs.c                                      | 2 +-
  doc/kwboot.1                                     | 2 +-
  drivers/clk/mvebu/armada-37xx-periph.c           | 2 +-
  drivers/clk/mvebu/armada-37xx-tbg.c              | 2 +-
  drivers/misc/atsha204a-i2c.c                     | 2 +-
  drivers/rtc/armada38x.c                          | 2 +-
  drivers/watchdog/armada-37xx-wdt.c               | 2 +-
  drivers/watchdog/orion_wdt.c                     | 2 +-
  fs/btrfs/Makefile                                | 2 +-
  fs/btrfs/btrfs.c                                 | 2 +-
  fs/btrfs/btrfs.h                                 | 2 +-
  fs/btrfs/compression.c                           | 2 +-
  fs/btrfs/conv-funcs.h                            | 2 +-
  fs/btrfs/ctree.c                                 | 2 +-
  fs/btrfs/ctree.h                                 | 2 +-
  fs/btrfs/dev.c                                   | 2 +-
  fs/btrfs/dir-item.c                              | 2 +-
  fs/btrfs/extent-io.c                             | 2 +-
  fs/btrfs/inode.c                                 | 2 +-
  fs/btrfs/subvolume.c                             | 2 +-
  fs/fs_internal.c                                 | 2 +-
  include/atsha204a-i2c.h                          | 2 +-
  include/btrfs.h                                  | 2 +-
  include/configs/turris_mox.h                     | 2 +-
  include/configs/turris_omnia.h                   | 2 +-
  include/fs_internal.h                            | 2 +-
  include/u-boot/variadic-macro.h                  | 2 +-
  scripts/gen_ll_addressable_symbols.sh            | 2 +-
  tools/kwboot.c                                   | 2 +-
  tools/termios_linux.h                            | 2 +-
  45 files changed, 47 insertions(+), 45 deletions(-)
.mailmap +2 -0
index 3910e056f0..f27f366bcb 100644
@@ -37,6 +37,8 @@ Jagan Teki <[email protected]>
  Jernej Skrabec <[email protected]> <[email protected]>
  Igor Opaniuk <[email protected]> <[email protected]>
  Igor Opaniuk <[email protected]> <[email protected]>
+Marek Behún <[email protected]> <[email protected]>
+Marek Behún <[email protected]> Marek Behun <[email protected]>
  Marek Vasut <[email protected]> <[email protected]>
  Marek Vasut <[email protected]> <[email protected]>
  Marek Vasut <[email protected]> <marex at denx.de>
MAINTAINERS +2 -2
index 1c7baf9412..2dae092a87 100644
@@ -727,7 +727,7 @@ F:	net/eth_bootdevice.c
  F:	test/boot/
 
  BTRFS
-M:	Marek Behun <[email protected]>
+M:	Marek Behún <[email protected]>
  R:	Qu Wenruo <[email protected]>
  L:	[email protected]
  S:	Maintained
@@ -930,7 +930,7 @@ F:	drivers/i2c/
 
  KWBIMAGE / KWBOOT TOOLS
  M:	Pali Rohár <[email protected]>
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Stefan Roese <[email protected]>
  S:	Maintained
  T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1 -1
index 64ebe2c6d4..5a22cc64a1 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   */
 
  / {
arch/arm/mach-mvebu/armada3700/cpu.c +1 -1
index 52b5109b73..ab72b304e5 100644
@@ -1,7 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
   * Copyright (C) 2016 Stefan Roese <[email protected]>
- * Copyright (C) 2020 Marek Behun <[email protected]>
+ * Copyright (C) 2020 Marek Behún <[email protected]>
   */
 
  #include <common.h>
arch/arm/mach-mvebu/armada3700/mbox.c +1 -1
index eb1f82845f..6555b8673c 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   * Copyright (C) 2021 Pali Rohár <[email protected]>
   */
 
arch/arm/mach-mvebu/include/mach/mbox.h +1 -1
index f1cb55f2bf..fcc7a46c1d 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   * Copyright (C) 2021 Pali Rohár <[email protected]>
   */
 
board/CZ.NIC/turris_atsha_otp.c +1 -1
index e62b7ee2a4..aa4e29b156 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   */
 
board/CZ.NIC/turris_mox/MAINTAINERS +1 -1
index 3c3e477f30..b29ce92ccd 100644
@@ -1,5 +1,5 @@
  TURRIS MOX BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Pali Rohár <[email protected]>
  S:	Maintained
  F:	arch/arm/dts/armada-3720-turris-mox*.dts*
board/CZ.NIC/turris_mox/Makefile +1 -1
index 33a52b63d7..2196821b81 100644
@@ -1,5 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# Copyright (C) 2018 Marek Behun <[email protected]>
+# Copyright (C) 2018 Marek Behún <[email protected]>
 
  obj-y	:= turris_mox.o mox_sp.o
board/CZ.NIC/turris_mox/mox_sp.c +1 -1
index 93e96b014f..87f67512fb 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #include <common.h>
board/CZ.NIC/turris_mox/mox_sp.h +1 -1
index 49a4ed80ea..83b6037458 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
board/CZ.NIC/turris_mox/turris_mox.c +1 -1
index 68bc315a9c..28259e7140 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   */
 
  #include <common.h>
board/CZ.NIC/turris_omnia/MAINTAINERS +1 -1
index f653c4af86..8258f4fc5b 100644
@@ -1,5 +1,5 @@
  TURRIS OMNIA BOARD
-M:	Marek Behún <[email protected]>
+M:	Marek Behún <[email protected]>
  M:	Pali Rohár <[email protected]>
  S:	Maintained
  F:	arch/arm/dts/armada-385-turris-omnia*.dts*
board/CZ.NIC/turris_omnia/Makefile +1 -1
index b79555ab46..dc39b44ae1 100644
@@ -1,5 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# Copyright (C) 2017 Marek Behun <[email protected]>
+# Copyright (C) 2017 Marek Behún <[email protected]>
 
  obj-y	:= turris_omnia.o ../turris_atsha_otp.o
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
index b169abca09..5921769f1e 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   *
   * Derived from the code for
cmd/btrfs.c +1 -1
index 7e3cbe12ce..98daea99e9 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   */
 
  #include <common.h>
doc/kwboot.1 +1 -1
index d663bf1f77..0863d197fd 100644
@@ -194,4 +194,4 @@ David Purdy <[email protected]>
  .br
  Pali Rohár <[email protected]>
  .br
-Marek Behún <[email protected]>
+Marek Behún <[email protected]>
drivers/clk/mvebu/armada-37xx-periph.c +1 -1
index 3b767d7060..e75052f383 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Peripheral clocks
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   *
   * Based on Linux driver by:
   *   Gregory CLEMENT <[email protected]>
drivers/clk/mvebu/armada-37xx-tbg.c +1 -1
index 054aff5e6a..846a73cd6b 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Time Base Generator clocks
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   *
   * Based on Linux driver by:
   *   Gregory CLEMENT <[email protected]>
drivers/misc/atsha204a-i2c.c +1 -1
index aa6acf0f9a..294b42a5fc 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
   *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
   *
   * This program is free software; you can redistribute  it and/or modify it
   * under the terms of the GNU General Public License version 2 as
drivers/rtc/armada38x.c +1 -1
index 2af64e3912..d0fe5dd7a8 100644
@@ -2,7 +2,7 @@
  /*
   * RTC driver for the Armada 38x Marvell SoCs
   *
- * Copyright (C) 2021 Marek Behun <[email protected]>
+ * Copyright (C) 2021 Marek Behún <[email protected]>
   *
   * Based on Linux' driver by Gregory Clement and Marvell
   */
drivers/watchdog/armada-37xx-wdt.c +1 -1
index bacebbc792..e09f5ac9e3 100644
@@ -2,7 +2,7 @@
  /*
   * Marvell Armada 37xx SoC Watchdog Driver
   *
- * Marek Behun <[email protected]>
+ * Marek Behún <[email protected]>
   */
 
  #include <common.h>
drivers/watchdog/orion_wdt.c +1 -1
index c30ed82217..127766df58 100644
@@ -5,7 +5,7 @@
   *
   * Authors:	Tomas Hlavacek <[email protected]>
   *		Sylver Bruneau <[email protected]>
- *		Marek Behun <[email protected]>
+ *		Marek Behún <[email protected]>
   *
   * This file is licensed under  the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any
fs/btrfs/Makefile +1 -1
index fc074c84d2..31b426d572 100644
@@ -1,6 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0+
  #
-# 2017 Marek Behun, CZ.NIC, [email protected]
+# 2017 Marek Behún, CZ.NIC, [email protected]
 
  obj-y := btrfs.o compression.o ctree.o dev.o dir-item.o \
  	extent-io.o inode.o subvolume.o crypto/hash.o disk-io.o \
fs/btrfs/btrfs.c +1 -1
index 741c6e20f5..4cdbbbe3d0 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <config.h>
fs/btrfs/btrfs.h +1 -1
index a52587e063..2bc2f0fd6d 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_BTRFS_H__
fs/btrfs/compression.c +1 -1
index 7adfbb04a7..c69524d38e 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include "btrfs.h"
fs/btrfs/conv-funcs.h +1 -1
index 30791cd628..0a7af9dc87 100644
@@ -2,7 +2,7 @@
  /*
   * Functions to convert BTRFS structures from disk to CPU endianness and back.
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_CONV_FUNCS_H__
fs/btrfs/ctree.c +1 -1
index 5ffced9160..8e932adc42 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/ctree.h +1 -1
index 55112318a3..ffd095ffdd 100644
@@ -3,7 +3,7 @@
   * From linux/fs/btrfs/ctree.h
   *   Copyright (C) 2007,2008 Oracle.  All rights reserved.
   *
- * Modified in 2017 by Marek Behun, CZ.NIC, [email protected]
+ * Modified in 2017 by Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __BTRFS_CTREE_H__
fs/btrfs/dev.c +1 -1
index 1e5b83235a..cb3b9713a5 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <common.h>
fs/btrfs/dir-item.c +1 -1
index aab197a6d5..5f81d6414f 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include "btrfs.h"
fs/btrfs/extent-io.c +1 -1
index 774e29eb60..f4d56a084b 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/inode.c +1 -1
index d00b515333..a34edc43ed 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <linux/kernel.h>
fs/btrfs/subvolume.c +1 -1
index 2815673bcd..d446e7a2c4 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #include <malloc.h>
fs/fs_internal.c +1 -1
index bfc35c996c..ae1cb8584c 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   *
   * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
   */
include/atsha204a-i2c.h +1 -1
index 39fc0e9ca7..c35f5992e2 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
   *		 2016 Tomas Hlavacek, CZ.NIC, [email protected]
- *		 2017 Marek Behun, CZ.NIC, [email protected]
+ *		 2017 Marek Behún, CZ.NIC, [email protected]
   *
   * This program is free software; you can redistribute  it and/or modify it
   * under the terms of the GNU General Public License version 2 as
include/btrfs.h +1 -1
index a7605e1589..2d73add18e 100644
@@ -2,7 +2,7 @@
  /*
   * BTRFS filesystem implementation for U-Boot
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __U_BOOT_BTRFS_H__
include/configs/turris_mox.h +1 -1
index 6640ee495d..cedd8105ae 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2018 Marek Behun <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
   *
   * Based on mvebu_armada-37xx.h by Stefan Roese <[email protected]>
   */
include/configs/turris_omnia.h +1 -1
index 8119340b11..62cc608a8f 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2017 Marek Behun <[email protected]>
+ * Copyright (C) 2017 Marek Behún <[email protected]>
   * Copyright (C) 2016 Tomas Hlavacek <[email protected]>
   */
 
include/fs_internal.h +1 -1
index 3d4d25da96..07f6bc5ea4 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  /*
- * 2017 by Marek Behun <[email protected]>
+ * 2017 by Marek Behún <[email protected]>
   *
   * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
   */
include/u-boot/variadic-macro.h +1 -1
index cb815d0fee..c5fa1b80e3 100644
@@ -2,7 +2,7 @@
  /*
   * Helper for work with variadic macros
   *
- * 2017 Marek Behun, CZ.NIC, [email protected]
+ * 2017 Marek Behún, CZ.NIC, [email protected]
   */
 
  #ifndef __VARIADIC_MACRO_H__
scripts/gen_ll_addressable_symbols.sh +1 -1
index b8840dd011..d0864804aa 100755
@@ -1,6 +1,6 @@
  #!/bin/bash
  # SPDX-License-Identifier: GPL-2.0+
-# Copyright (C) 2020 Marek Behún <[email protected]>
+# Copyright (C) 2020 Marek Behún <[email protected]>
 
  # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO
  # does not optimize these symbols away
tools/kwboot.c +1 -1
index b697d3b60e..16bcd4d9a7 100644
@@ -5,7 +5,7 @@
   *
   * (c) 2012 Daniel Stodden <[email protected]>
   * (c) 2021 Pali Rohár <[email protected]>
- * (c) 2021 Marek Behún <[email protected]>
+ * (c) 2021 Marek Behún <[email protected]>
   *
   * References:
   * - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional
tools/termios_linux.h +0 -0
index e100c8e4eb..45f5c1233c 100644

tools/termios_linux.h line 9

Quoted 8 lines
tools/termios_linux.h +1 -1
@@ -3,7 +3,7 @@
   * termios fuctions to support arbitrary baudrates (on Linux)
   *
   * Copyright (c) 2021 Pali Rohár <[email protected]>
- * Copyright (c) 2021 Marek Behún <[email protected]>
+ * Copyright (c) 2021 Marek Behún <[email protected]>
   */
 
  #ifndef _TERMIOS_LINUX_H_

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Reviewed-by on v1 1/2
#4 lore raw
In reply to Marek Behún
Quoted 6 lines · Marek Behún

From: Marek Behún <[email protected]>

Fix MAINTAINERS files for Turris devices, add missing files and add Pali as maintainer.

Thanks,
Stefan

Quoted 44 lines
---
  MAINTAINERS                           | 8 --------
  board/CZ.NIC/turris_mox/MAINTAINERS   | 4 +++-
  board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
  3 files changed, 7 insertions(+), 10 deletions(-)
MAINTAINERS +0 -8
index 72bf94c3d1..1c7baf9412 100644
@@ -235,14 +235,6 @@ F:	drivers/net/cortina_ni.h
  F:	drivers/net/phy/ca_phy.c
  F:	configs/cortina_presidio-asic-pnand_defconfig
 
-ARM/CZ.NIC TURRIS MOX SUPPORT
-M:	Marek Behun <[email protected]>
-S:	Maintained
-F:	arch/arm/dts/armada-3720-turris-mox.dts
-F:	board/CZ.NIC/
-F:	configs/turris_*_defconfig
-F:	include/configs/turris_*.h
-
  ARM FREESCALE IMX
  M:	Stefano Babic <[email protected]>
  M:	Fabio Estevam <[email protected]>
board/CZ.NIC/turris_mox/MAINTAINERS +3 -1
index 2b9c1132f5..3c3e477f30 100644
@@ -1,6 +1,8 @@
-TURRIS OMNIA BOARD
+TURRIS MOX BOARD
  M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/armada-3720-turris-mox*.dts*
  F:	board/CZ.NIC/turris_mox/
  F:	include/configs/turris_mox.h
  F:	configs/turris_mox_defconfig
board/CZ.NIC/turris_omnia/MAINTAINERS +0 -0
index ed15e11d3e..f653c4af86 100644

board/CZ.NIC/turris_omnia/MAINTAINERS line 9

Quoted 10 lines
board/CZ.NIC/turris_omnia/MAINTAINERS +4 -1
@@ -1,6 +1,9 @@
  TURRIS OMNIA BOARD
  M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/armada-385-turris-omnia*.dts*
+F:	board/CZ.NIC/turris_atsha_otp.*
  F:	board/CZ.NIC/turris_omnia/
-F:	include/configs/turris_omnia.h
  F:	configs/turris_omnia_defconfig
+F:	include/configs/turris_omnia.h

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#5 lore raw
In reply to Marek Behún
Quoted 6 lines · Marek Behún

From: Marek Behún <[email protected]>

Fix MAINTAINERS files for Turris devices, add missing files and add Pali as maintainer.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 44 lines
---
  MAINTAINERS                           | 8 --------
  board/CZ.NIC/turris_mox/MAINTAINERS   | 4 +++-
  board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
  3 files changed, 7 insertions(+), 10 deletions(-)
MAINTAINERS +0 -8
index 72bf94c3d1..1c7baf9412 100644
@@ -235,14 +235,6 @@ F:	drivers/net/cortina_ni.h
  F:	drivers/net/phy/ca_phy.c
  F:	configs/cortina_presidio-asic-pnand_defconfig
 
-ARM/CZ.NIC TURRIS MOX SUPPORT
-M:	Marek Behun <[email protected]>
-S:	Maintained
-F:	arch/arm/dts/armada-3720-turris-mox.dts
-F:	board/CZ.NIC/
-F:	configs/turris_*_defconfig
-F:	include/configs/turris_*.h
-
  ARM FREESCALE IMX
  M:	Stefano Babic <[email protected]>
  M:	Fabio Estevam <[email protected]>
board/CZ.NIC/turris_mox/MAINTAINERS +3 -1
index 2b9c1132f5..3c3e477f30 100644
@@ -1,6 +1,8 @@
-TURRIS OMNIA BOARD
+TURRIS MOX BOARD
  M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/armada-3720-turris-mox*.dts*
  F:	board/CZ.NIC/turris_mox/
  F:	include/configs/turris_mox.h
  F:	configs/turris_mox_defconfig
board/CZ.NIC/turris_omnia/MAINTAINERS +0 -0
index ed15e11d3e..f653c4af86 100644

board/CZ.NIC/turris_omnia/MAINTAINERS line 9

Quoted 10 lines
board/CZ.NIC/turris_omnia/MAINTAINERS +4 -1
@@ -1,6 +1,9 @@
  TURRIS OMNIA BOARD
  M:	Marek Behún <[email protected]>
+M:	Pali Rohár <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/armada-385-turris-omnia*.dts*
+F:	board/CZ.NIC/turris_atsha_otp.*
  F:	board/CZ.NIC/turris_omnia/
-F:	include/configs/turris_omnia.h
  F:	configs/turris_omnia_defconfig
+F:	include/configs/turris_omnia.h

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]