Merge with latest upstream armbian build

Ryzer58 · Sep 13, 2024 · b1c14ed · b1c14ed
2 parents 317b939 + ee0702f
commit b1c14ed
Show file tree

Hide file tree

Showing 266 changed files with 42,686 additions and 16,764 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/workflows/update-tools.yml b/.github/workflows/update-tools.yml
@@ -96,7 +96,7 @@ jobs:
           sed -i "s/${{ matrix.tool.VERSION_VAR}}=\${${{ matrix.tool.VERSION_VAR}}:-[0-9.]*}/${{ matrix.tool.VERSION_VAR}}=\${${{ matrix.tool.VERSION_VAR}}:-$version_latest}/g" ${{ matrix.tool.VAR_FILE }}
 
       - name: Create Pull Request to update ${{ matrix.tool.VERSION_VAR}} for ${{ matrix.tool.PROJECT_NAME }}
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "tools: Bump `${{ matrix.tool.VERSION_VAR}}` from ${{ steps.get-version-current.outputs.version_current }} to ${{ steps.get-version-latest.outputs.version_latest }}"

diff --git a/config/boards/armsom-cm5-io.csc b/config/boards/armsom-cm5-io.csc
@@ -0,0 +1,33 @@
+# Rockchip RK3576 SoC octa core 8-64GB SoC GBe eMMC USB3 NvME WIFI
+BOARD_NAME="ArmSoM CM5 IO"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="armsom-cm5-io-rk3576_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+SRC_EXTLINUX="yes"
+MODULES_BLACKLIST="panfrost"
+BOARD_MAINTAINER=""
+
+function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
+        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
+	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
+	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
+}
+
+function post_family_tweaks__armsom-cm5-io_naming_audios() {
+	display_alert "$BOARD" "Renaming armsom-cm5 audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
diff --git a/config/boards/armsom-sige5.csc b/config/boards/armsom-sige5.csc
@@ -16,10 +16,10 @@ function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
         display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576"
+	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
 	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-        declare -g BOOTDIR="u-boot-${BOARD}"
-        declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
 }
 
 function post_family_tweaks__armsom-sige7_naming_audios() {

diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 8-64GB SoC 2*2.5GBe eMMC USB3 NvME WIFI
 BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="Z-Keven"
+BOARD_MAINTAINER=""
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
 KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"

diff --git a/config/boards/avaota-a1.conf b/config/boards/avaota-a1.conf
@@ -1,7 +1,7 @@
 # Allwinner Cortex-A55 octa core 2/4GB RAM SoC USB3 USB-C 2x GbE LCD
 BOARD_NAME="Avaota A1"
 BOARDFAMILY="sun55iw3-syterkit"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="chainsx"
 KERNEL_TARGET="legacy"
 BOOT_FDT_FILE="allwinner/sun55i-t527-avaota-a1.dtb"
 SRC_EXTLINUX="yes"

diff --git a/config/boards/bananapi.conf b/config/boards/bananapi.conf
@@ -1,7 +1,7 @@
 # Allwinner A20 dual core 1Gb RAM SoC 1xSATA GBE
 BOARD_NAME="Banana Pi"
 BOARDFAMILY="sun7i"
-BOARD_MAINTAINER="janprunk"
+BOARD_MAINTAINER="DylanHP janprunk"
 BOOTCONFIG="Bananapi_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/bananapif3.wip → config/boards/bananapif3.csc b/config/boards/bananapif3.wip → config/boards/bananapif3.csc
diff --git a/config/boards/bananapim2s.conf b/config/boards/bananapim2s.conf
@@ -1,7 +1,7 @@
 # Amlogic A311D 4GB RAM eMMC 2xGBE USB3
 BOARD_NAME="Banana Pi M2S"
 BOARDFAMILY="meson-g12b"
-BOARD_MAINTAINER="pyavitz jeanrhum"
+BOARD_MAINTAINER="jeanrhum pyavitz"
 BOOTCONFIG="bananapi-m2s_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/bananapim7.conf b/config/boards/bananapim7.conf
@@ -1,6 +1,6 @@
 source "${SRC}/config/boards/armsom-sige7.csc"
 BOARD_NAME="Banana Pi M7"
-BOARD_MAINTAINER="amazingfate,Z-Keven"
+BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
 KERNEL_TARGET="edge,current,vendor"

diff --git a/config/boards/coolpi-cm5.csc b/config/boards/coolpi-cm5.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe PoE eMMC USB3 NVME
 BOARD_NAME="CoolPi CM5"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="Andy Yan"
+BOARD_MAINTAINER="andyshrk"
 BOARD_FIRMWARE_INSTALL="-full"
 BOOT_SOC="rk3588"
 BOOTCONFIG="coolpi-cm5-evb-rk3588_defconfig"

diff --git a/config/boards/espressobin.eos b/config/boards/espressobin.eos
@@ -1,7 +1,7 @@
 # Marvell Armada 37x 512MB-2GB RAM SoC 1xmPCIe 1xSATA 3xGBE USB3.0 eMMC SPI
 BOARD_NAME="Espressobin"
 BOARDFAMILY="mvebu64"
-BOARD_MAINTAINER="ManoftheSea"
+BOARD_MAINTAINER=""
 BOOTCONFIG="mvebu_espressobin-88f3720_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/firefly-itx-3588j.csc b/config/boards/firefly-itx-3588j.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="Firefly ITX-3588J"
 BOARDFAMILY="rockchip-rk3588"
 BOOT_SOC="rk3588"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="SeeleVolleri"
 KERNEL_TARGET="vendor"
 BOOTCONFIG="rk3588_defconfig"
 BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"

diff --git a/config/boards/jetson-nano.csc b/config/boards/jetson-nano.csc
@@ -1,7 +1,7 @@
 # Nvidia Jetson Nano quad core 2G/4GB SoC 4 x USB3 HDMI & DP
 declare -g BOARD_NAME="Jetson Nano"
 declare -g BOARDFAMILY="uefi-arm64"
-declare -g BOARD_MAINTAINER="150balbes"
+declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="current,edge"
 declare -g KERNEL_TEST_TARGET="current"
 

diff --git a/config/boards/khadas-vim1s.conf b/config/boards/khadas-vim1s.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="Khadas VIM1S" # don't confuse with VIM1 (S905X)
 BOARDFAMILY="meson-s4t7"
 KERNEL_TARGET="legacy"
-BOARD_MAINTAINER="viraniac rpardini"
+BOARD_MAINTAINER="rpardini viraniac"
 SERIALCON="ttyS0" # for vendor kernel
 # BOOT_FDT_FILE="amlogic/kvim1s.dtb" # unset on purpose: uboot auto-determines the DTB to use
 

diff --git a/config/boards/khadas-vim3.conf b/config/boards/khadas-vim3.conf
@@ -1,7 +1,7 @@
 # Amlogic A311D 2/4GB RAM eMMC GBE USB3 M.2
 BOARD_NAME="Khadas VIM3"
 BOARDFAMILY="meson-g12b"
-BOARD_MAINTAINER="rpardini NicoD-SBC"
+BOARD_MAINTAINER="NicoD-SBC rpardini"
 BOOTCONFIG="khadas-vim3_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/khadas-vim4.conf b/config/boards/khadas-vim4.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="Khadas VIM4"
 BOARDFAMILY="meson-s4t7"
 KERNEL_TARGET="legacy"
-BOARD_MAINTAINER="viraniac rpardini echatzip"
+BOARD_MAINTAINER="adeepn rpardini viraniac"
 SERIALCON="ttyS0" # for vendor kernel
 # BOOT_FDT_FILE="amlogic/kvim4.dtb" # not set on purpose; u-boot auto-selects kvim4.dtb or kvim4n.dtb for "new VIM4"
 

diff --git a/config/boards/leez-p710.csc b/config/boards/leez-p710.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3399 hexa core 4GB RAM SOC 16GB eMMC 2x USB2 1x USB3 1x USB-C HDMI 1x GbE WiFi/BT
 BOARD_NAME="Lenovo Leez P710"
 BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="Andyshrk"
+BOARD_MAINTAINER="andyshrk"
 BOOTCONFIG="leez-rk3399_defconfig"
 BOOT_FDT_FILE="rockchip/rk3399-leez-p710.dtb"
 BOOT_LOGO="desktop"

diff --git a/config/boards/licheepi-4a.csc → config/boards/licheepi-4a.eos b/config/boards/licheepi-4a.csc → config/boards/licheepi-4a.eos
diff --git a/config/boards/lubancat2.csc b/config/boards/lubancat2.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="Lubancat2"
 BOARDFAMILY="rk35xx"
 BOARD_FIRMWARE_INSTALL="-full"
-BOARD_MAINTAINER="Andyshrk"
+BOARD_MAINTAINER="andyshrk"
 BOOTCONFIG="lubancat-2-rk3568_defconfig"
 KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"

diff --git a/config/boards/mba8mpxl-ras314.wip b/config/boards/mba8mpxl-ras314.wip
@@ -1,7 +1,7 @@
 # MBa8MPxL-RAS314 with TQMa8MPxL
 BOARD_NAME="TQ8MP-RAS314"
 BOARDFAMILY="imx8m"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="schmiedelm"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"
 BOOTCONFIG="tqma8mpxl_multi_mba8mp_ras314_defconfig"

diff --git a/config/boards/mba8mpxl.wip b/config/boards/mba8mpxl.wip
@@ -1,7 +1,7 @@
 # MBa8MPxL with TQMa8MPxL
 BOARD_NAME="MBa8MPxL"
 BOARDFAMILY="imx8m"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="schmiedelm"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"
 BOOTCONFIG="tqma8mpxl_multi_mba8mpxl_defconfig"

diff --git a/config/boards/nanopc-cm3588-nas.csc b/config/boards/nanopc-cm3588-nas.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3588 octa core 16GB RAM SoC eMMC 4x NVMe 2x USB3 USB2 USB-C 2.5GbE
 BOARD_NAME="FriendlyElec CM3588 NAS"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"

diff --git a/config/boards/nanopineocore2.csc b/config/boards/nanopineocore2.csc
@@ -1,7 +1,7 @@
 # Allwinner H5 quad core 1GB RAM SoC headless GBE eMMC
 BOARD_NAME="NanoPi Neo Core 2"
 BOARDFAMILY="sun50iw2"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="AGM1968"
 BOOTCONFIG="nanopi_neo_core2_defconfig"
 MODULES="g_serial"
 MODULES_BLACKLIST="lima"

diff --git a/config/boards/odroidc4.conf b/config/boards/odroidc4.conf
@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 4GB RAM SoC eMMC GBE USB3 SPI
 BOARD_NAME="Odroid C4"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="odroid-c4_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/odroidhc4.conf b/config/boards/odroidhc4.conf
@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 4GB RAM SoC GBE USB3 SPI 2 x SATA
 BOARD_NAME="Odroid HC4"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="odroid-c4_defconfig" # for the SD card; but also 'odroid-hc4_defconfig', see below at pre_config_uboot_target
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/orangepi3b.csc b/config/boards/orangepi3b.csc
@@ -19,9 +19,9 @@ MODULES_BLACKLIST_LEGACY="bcmdhd"
 function post_family_config__orangepi3b_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"
 
-	BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
-	BOOTBRANCH="branch:rk3xxx-2024.04" # specific commit tested is commit:ccef7dfc453bc03c5b5c61fa67d2745b96fa7da6
-	BOOTPATCHDIR="v2024.04-orangepi3b" # empty, patches are already in Kwiboo's branch:rk3xxx-2024.04
+	BOOTSOURCE='https://github.com/u-boot/u-boot'
+	BOOTBRANCH="tag:v2024.10-rc3"
+	BOOTPATCHDIR="v2024.10-orangepi3b"
 
 	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 

diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 1x USB-C 2x 2.5GbE 3x HDMI
 BOARD_NAME="Orange Pi 5 Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="efectn"
+BOARD_MAINTAINER="alexl83 efectn"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"

diff --git a/config/boards/orangepi5pro.wip → config/boards/orangepi5pro.csc b/config/boards/orangepi5pro.wip → config/boards/orangepi5pro.csc
diff --git a/config/boards/orangepipcplus.csc b/config/boards/orangepipcplus.csc
@@ -1,7 +1,7 @@
 # Allwinner H3 quad core 1GB RAM WiFi eMMC
 BOARD_NAME="Orange Pi PC +"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER="Rikolius"
+BOARD_MAINTAINER="Janmcha"
 BOOTCONFIG="orangepi_pc_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
diff --git a/config/boards/orangepizero2.wip b/config/boards/orangepizero2.wip
@@ -1,7 +1,7 @@
 # Allwinner H616 quad core 512MB/1GB RAM SoC WiFi SPI USB-C
 BOARD_NAME="Orange Pi Zero2"
 BOARDFAMILY="sun50iw9"
-BOARD_MAINTAINER="krachlatte AGM1968"
+BOARD_MAINTAINER="AGM1968 krachlatte"
 BOOTCONFIG="orangepi_zero2_defconfig"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"

diff --git a/config/boards/orangepizero3.csc b/config/boards/orangepizero3.csc
@@ -1,7 +1,7 @@
 # Allwinner H618 quad core 1/2/4GB RAM SoC WiFi SPI USB-C
 BOARD_NAME="Orange Pi Zero3"
 BOARDFAMILY="sun50iw9"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="alexl83 chraac"
 BOOTCONFIG="orangepi_zero3_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_LOGO="desktop"

diff --git a/config/boards/phytiumpi.conf b/config/boards/phytiumpi.conf
@@ -3,7 +3,7 @@ BOARD_NAME="Phytium Pi"
 BOARDFAMILY="phytium-embedded"
 BOARD_MAINTAINER="chainsx"
 KERNEL_TARGET="legacy,current"
-KERNEL_TEST_TARGET="legacy"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="phytium/phytiumpi_firefly.dtb"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

diff --git a/config/boards/pine64so.csc b/config/boards/pine64so.csc
@@ -1,7 +1,7 @@
 # Allwinner A64 quad core 2GB RAM SoC GBE
 BOARD_NAME="SoPine A64"
 BOARDFAMILY="sun50iw1"
-BOARD_MAINTAINER="joshaspinall"
+BOARD_MAINTAINER=""
 BOOTCONFIG="sopine_baseboard_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/radxa-zero.conf b/config/boards/radxa-zero.conf
@@ -1,7 +1,7 @@
 # Amlogic S905Y2 512MB/1GB/2GB/4GB RAM eMMC USB3 WiFi BT
 BOARD_NAME="Radxa Zero"
 BOARDFAMILY="meson-g12a"
-BOARD_MAINTAINER="engineer-80 clee"
+BOARD_MAINTAINER="clee engineer-80"
 BOOTCONFIG="radxa-zero_config"
 CPUMIN=6660000
 CPUMAX=1800000

diff --git a/config/boards/radxa-zero3.conf → config/boards/radxa-zero3.csc b/config/boards/radxa-zero3.conf → config/boards/radxa-zero3.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3566 quad core
 BOARD_NAME="Radxa ZERO 3"
 BOARDFAMILY="rk35xx"
-BOARD_MAINTAINER="Radxa"
+BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-zero3-rk3566_defconfig"
 KERNEL_TARGET="vendor,edge"
 KERNEL_TEST_TARGET="vendor"

diff --git a/config/boards/recore.csc b/config/boards/recore.csc
@@ -6,7 +6,7 @@ KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
 MODULES="g_serial"
 BOOT_LOGO="yes"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="eliasbakken"
 
 function post_family_config__shrink_atf() {
 	display_alert "Choose ATF branch 🍰" "recore"

diff --git a/config/boards/rk3318-box.tvb b/config/boards/rk3318-box.tvb
@@ -1,7 +1,7 @@
 # Rockchip RK3318 quad core 2/16Gb 1xETH USB3 WiFi
 BOARD_NAME="RK3318 Box"
 BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="jock"
+BOARD_MAINTAINER="paolosabatino"
 BOOTCONFIG="rk3318-box_defconfig"
 BOOT_FDT_FILE="rockchip/rk3318-box.dtb"
 KERNEL_TARGET="current,edge"

diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3568 quad core 1-8GB SoC GBe eMMC USB3
 BOARD_NAME="Rock 3A"
 BOARDFAMILY="rk35xx"
-BOARD_MAINTAINER="amazingfate ZazaBR vamzii catalinii"
+BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
 KERNEL_TARGET="edge,current,vendor"
 KERNEL_TEST_TARGET="current"

diff --git a/config/boards/rock-5-itx.conf b/config/boards/rock-5-itx.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
 BOARD_NAME="Rock 5 ITX"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="amazingfate prahal"
 BOOTCONFIG="rock-5-itx-rk3588_defconfig"
 KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"