diff --git a/config/boards/9tripod-x3568-v4.csc b/config/boards/9tripod-x3568-v4.csc
index c0ec3bb44f..b6659d2af4 100644
--- a/config/boards/9tripod-x3568-v4.csc
+++ b/config/boards/9tripod-x3568-v4.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3568 quad core 2GB-8GB RAM SoC 2 x GBE eMMC USB3 WiFi/BT PCIe SATA NVMe
 BOARD_NAME="9Tripod X3568 v4"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="rbqvq"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/aml-c400-plus.conf b/config/boards/aml-c400-plus.conf
index 8008452a4a..c589aa5840 100644
--- a/config/boards/aml-c400-plus.conf
+++ b/config/boards/aml-c400-plus.conf
@@ -1,6 +1,6 @@
 # Amlogic S912 octa core 3Gb RAM SoC eMMC
 BOARD_NAME="Magicsee C400 Plus"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARDFAMILY="meson-gxl"
 BOARD_MAINTAINER="jomadeto"
 BOOTSIZE="512"
diff --git a/config/boards/aml-s805-mxq.tvb b/config/boards/aml-s805-mxq.tvb
index 400dd2d24a..94f2abbac0 100644
--- a/config/boards/aml-s805-mxq.tvb
+++ b/config/boards/aml-s805-mxq.tvb
@@ -1,6 +1,6 @@
 # MXQ TV box based on Amlogic S805 quad core 1GB RAM SoC GBE
 BOARD_NAME="MXQ"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current"
diff --git a/config/boards/aml-s9xx-box.tvb b/config/boards/aml-s9xx-box.tvb
index 10692a1302..abc42d0670 100644
--- a/config/boards/aml-s9xx-box.tvb
+++ b/config/boards/aml-s9xx-box.tvb
@@ -1,7 +1,7 @@
 # Amlogic S9xx based TVBox
 BOARD_NAME="aml-s9xx-box"
 BOARDFAMILY="meson-gxl"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARD_MAINTAINER="SteeManMI"
 BOOTSIZE="512"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/aml-t95z-plus.tvb b/config/boards/aml-t95z-plus.tvb
index 13419c6e6f..5b0615be54 100644
--- a/config/boards/aml-t95z-plus.tvb
+++ b/config/boards/aml-t95z-plus.tvb
@@ -1,6 +1,6 @@
 # Amlogic S912 octa core 3Gb RAM SoC eMMC chinese clone
 BOARD_NAME="T95Z Plus"                          #  (a q201 Chinese clone with internal amlogic ethernet 1gbit, complete with a chunk of metal inside to delay thermal throttling)
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOOT_FDT_FILE="amlogic/meson-gxm-t95z-plus.dtb" # From chewitt's patches
 BOARDFAMILY="meson-gxl"                         # s912's are actually meson-gxm, no harm done.
 BOARD_VENDOR="generic"
diff --git a/config/boards/bestv-r3300-l.csc b/config/boards/bestv-r3300-l.csc
index 2dc66233c7..531b6444c5 100644
--- a/config/boards/bestv-r3300-l.csc
+++ b/config/boards/bestv-r3300-l.csc
@@ -1,6 +1,6 @@
 # Amlogic S905L-B 1GB RAM 8GB eMMC microSD FE USB2 RTL8189FTV WiFi
 BOARD_NAME="BesTV R3300-L"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARDFAMILY="meson-gxl"
 BOARD_MAINTAINER="retro98boy"
 BOOTCONFIG="bestv-r3300-l_defconfig"
diff --git a/config/boards/cainiao-cniot-core.csc b/config/boards/cainiao-cniot-core.csc
index 429009bd23..0ee6a0ef76 100644
--- a/config/boards/cainiao-cniot-core.csc
+++ b/config/boards/cainiao-cniot-core.csc
@@ -1,6 +1,6 @@
 # Amlogic A311D 2GB RAM 16GB eMMC GBE USB3 RTL8822CS WiFi/BT
 BOARD_NAME="CAINIAO CNIoT-CORE"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="retro98boy"
 BOOTCONFIG="cainiao-cniot-core_defconfig"
diff --git a/config/boards/cherryba-m1.csc b/config/boards/cherryba-m1.csc
index 6257a60abf..cc7f614ec6 100644
--- a/config/boards/cherryba-m1.csc
+++ b/config/boards/cherryba-m1.csc
@@ -1,6 +1,6 @@
 # Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
 BOARD_NAME="CherryBa M1"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun50iw9"
 BOOTCONFIG="cherryba-m1_defconfig"
 BOOT_LOGO="desktop"
diff --git a/config/boards/cyber-aib-rk3588.csc b/config/boards/cyber-aib-rk3588.csc
index 4b2f549d62..36e74b11cb 100644
--- a/config/boards/cyber-aib-rk3588.csc
+++ b/config/boards/cyber-aib-rk3588.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3588 octa core 8/16GB RAM SoC 64/128GB eMMC NVMe 1x USB3 1x USB-C 2x 2.5GbE 2x HDMI
 BOARD_NAME="Cyber Aib RK3588"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rk3588-cyber-aib_defconfig"
diff --git a/config/boards/dusun-dsom-010r.csc b/config/boards/dusun-dsom-010r.csc
index 5ed44b52dd..73e15b8df3 100644
--- a/config/boards/dusun-dsom-010r.csc
+++ b/config/boards/dusun-dsom-010r.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3328 quad core 1GB-4GB 1xFE USB3 [WiFi]
 BOARD_NAME="Dusun DSOM 010R SoM"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="paolosabatino"
 BOOTCONFIG="dusun-dsom-010r-rk3328_defconfig"
diff --git a/config/boards/fine3399.csc b/config/boards/fine3399.csc
index 6d3ddcd2b1..d5bc1eed6d 100644
--- a/config/boards/fine3399.csc
+++ b/config/boards/fine3399.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3399 hexa core 4GB SoC eMMC GBE USB3 WiFi
 BOARD_NAME="Fine3399"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="fine3399-rk3399_defconfig"
diff --git a/config/boards/fxblox-rk1.csc b/config/boards/fxblox-rk1.csc
index bc754ad448..10f147081f 100644
--- a/config/boards/fxblox-rk1.csc
+++ b/config/boards/fxblox-rk1.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3588 SoC octa core 8-32GB SoC eMMC USB-C DP NvME SATA M2
 BOARD_NAME="FxBlox RK1"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="mahdichi"
 BOOTCONFIG="fxblox-rk1-rk3588_defconfig"
diff --git a/config/boards/gateway-gz80x.conf b/config/boards/gateway-gz80x.conf
index 9b6f6907b1..82ca284acc 100644
--- a/config/boards/gateway-gz80x.conf
+++ b/config/boards/gateway-gz80x.conf
@@ -1,6 +1,6 @@
 # Amlogic A113X quad core 1Gb RAM SoC, eMMC 8Gb
 BOARD_NAME="Gateway GZ80x"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="alfredsmart"
 BOARDFAMILY="meson-axg"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
diff --git a/config/boards/h96-tvbox-3566.tvb b/config/boards/h96-tvbox-3566.tvb
index 8679c54208..26f119f88f 100644
--- a/config/boards/h96-tvbox-3566.tvb
+++ b/config/boards/h96-tvbox-3566.tvb
@@ -1,6 +1,6 @@
 # Rockchip RK3566 quad core SoC WIFI/BT eMMC USB2/3
 BOARD_NAME="h96-tvbox-3566"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
diff --git a/config/boards/imb3588.conf b/config/boards/imb3588.conf
index 319b2481a5..6d43948227 100644
--- a/config/boards/imb3588.conf
+++ b/config/boards/imb3588.conf
@@ -1,6 +1,6 @@
 # Rockchip RK3588 SoC with 4/8/16GB RAM, 16GBB/32GB/64GB/128GB EMMC, m.2 SATA, USB3, USB2, 2xGbE, WIFI6, BT5.1, LCDS, MIPI, eDP, HDMI
 BOARD_NAME="IMB3588"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="JackHuang021"
 BOOTCONFIG="imb3588_defconfig"
diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc
index 4289e713b8..b93aed9839 100644
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3588S octa core 4/8/16GB RAM SoC eMMC USB3 USB-C GbE
 declare -g BOARD_NAME="Indiedroid Nova"
-declare -g BOARD_VENDOR="generic"
+declare -g BOARD_VENDOR="rockchip"
 declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
diff --git a/config/boards/jp-tvbox-3566.tvb b/config/boards/jp-tvbox-3566.tvb
index 97c3627a60..4a5d936f14 100644
--- a/config/boards/jp-tvbox-3566.tvb
+++ b/config/boards/jp-tvbox-3566.tvb
@@ -1,6 +1,6 @@
 # Rockchip RK3566 quad core 8GB RAM SoC WIFI/BT eMMC USB2/3 SATA
 BOARD_NAME="JP-TVbox-3566"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="tdleiyao"
 #BOOTCONFIG="rock-3c-rk3566_defconfig"
diff --git a/config/boards/kickpik2b.csc b/config/boards/kickpik2b.csc
index aa08c7d313..d76aebb9c3 100644
--- a/config/boards/kickpik2b.csc
+++ b/config/boards/kickpik2b.csc
@@ -1,6 +1,6 @@
 # Allwinner H618 quad core 1/2/4GB RAM SoC WiFi SPI USB-C
 BOARD_NAME="KickPi K2B"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun50iw9-bpi"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="kickpi_k2b_defconfig"
diff --git a/config/boards/lckfb-taishanpi.csc b/config/boards/lckfb-taishanpi.csc
index 8f973e22b2..b215979886 100644
--- a/config/boards/lckfb-taishanpi.csc
+++ b/config/boards/lckfb-taishanpi.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3566 quad core 1GB-2GB GBE eMMC USB3 WiFi
 BOARD_NAME="LCKFB Taishan Pi"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="lckfb-tspi-rk3566_defconfig"
diff --git a/config/boards/leez-p710.csc b/config/boards/leez-p710.csc
index 3a296a2775..9fd665d830 100644
--- a/config/boards/leez-p710.csc
+++ b/config/boards/leez-p710.csc
@@ -1,6 +1,6 @@
 # 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"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="andyshrk"
 BOOTCONFIG="leez-rk3399_defconfig"
diff --git a/config/boards/lubancat2.csc b/config/boards/lubancat2.csc
index a66a78781a..32a38eb0f1 100644
--- a/config/boards/lubancat2.csc
+++ b/config/boards/lubancat2.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3568 quad core SOC with 1-8GB eMMC USB3
 BOARD_NAME="Lubancat2"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rk35xx"
 BOARD_FIRMWARE_INSTALL="-full"
 BOARD_MAINTAINER="andyshrk"
diff --git a/config/boards/melea1000.csc b/config/boards/melea1000.csc
index 8ff2f55a70..1ae510fc09 100644
--- a/config/boards/melea1000.csc
+++ b/config/boards/melea1000.csc
@@ -1,6 +1,6 @@
 # Allwinner A10 single core 1Gb SoC
 BOARD_NAME="Mele A1000"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun4i"
 BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
diff --git a/config/boards/mk808c.csc b/config/boards/mk808c.csc
index 0bf3c68d59..c8e0bdc50d 100644
--- a/config/boards/mk808c.csc
+++ b/config/boards/mk808c.csc
@@ -1,6 +1,6 @@
 # Allwinner A20 dual core 1Gb SoC
 BOARD_NAME="MK808C"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
diff --git a/config/boards/onecloud.csc b/config/boards/onecloud.csc
index 033fa8fc64..880de55797 100644
--- a/config/boards/onecloud.csc
+++ b/config/boards/onecloud.csc
@@ -1,6 +1,6 @@
 # Amlogic S805 quad core 1GB RAM SoC GBE
 BOARD_NAME="OneCloud"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="amlogic"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="hzyitc"
 KERNEL_TARGET="current"
diff --git a/config/boards/pocketchip-sd.csc b/config/boards/pocketchip-sd.csc
index 6903fb9710..a88f04dc61 100644
--- a/config/boards/pocketchip-sd.csc
+++ b/config/boards/pocketchip-sd.csc
@@ -1,6 +1,6 @@
 # Allwinner R8(A13) single core 512Mb (NextThing C.H.I.P.) with MMC2 breakout
 BOARD_NAME="NextThing C.H.I.P."
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun5i"
 BOARD_MAINTAINER="TheSnowfield"
 HAS_VIDEO_OUTPUT="yes"
diff --git a/config/boards/retro-lite-cm5.csc b/config/boards/retro-lite-cm5.csc
index 18812aaec1..21344b54c1 100644
--- a/config/boards/retro-lite-cm5.csc
+++ b/config/boards/retro-lite-cm5.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3588S octa core 4/8/16GB RAM SoC NVMe USB3 USB-C GbE
 BOARD_NAME="Retro Lite CM5"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="retroid"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ginkage"
 BOOT_SOC="rk3588"
diff --git a/config/boards/rk3318-box.tvb b/config/boards/rk3318-box.tvb
index 445179e146..d60820a360 100644
--- a/config/boards/rk3318-box.tvb
+++ b/config/boards/rk3318-box.tvb
@@ -1,6 +1,6 @@
 # Rockchip RK3318 quad core 2/16Gb 1xETH USB3 WiFi
 BOARD_NAME="RK3318 Box"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="paolosabatino"
 BOOTCONFIG="rk3318-box_defconfig"
diff --git a/config/boards/rk3328-heltec.csc b/config/boards/rk3328-heltec.csc
index b6e916d453..c34a3e9dd0 100644
--- a/config/boards/rk3328-heltec.csc
+++ b/config/boards/rk3328-heltec.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3328 quad core 2GB RAM SoC WIFI/BT eMMC
 BOARD_NAME="RK3328-Heltec"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="sicXnull"
 BOOTCONFIG="evb-rk3328_defconfig"
diff --git a/config/boards/rk3566-box-demo.csc b/config/boards/rk3566-box-demo.csc
index df17e5ef53..27b4a57670 100644
--- a/config/boards/rk3566-box-demo.csc
+++ b/config/boards/rk3566-box-demo.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3566 with 4GB DDR HDMI USB3 WIFI GMAC
 BOARD_NAME="RK3566 BOX DEMO"
-BOARD_VENDOR="arm"
+BOARD_VENDOR="rockchip"
 BOOT_SOC="rk3566"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="andyshrk"
diff --git a/config/boards/smart-am40.csc b/config/boards/smart-am40.csc
index 0ba87a138a..27290ddfa5 100644
--- a/config/boards/smart-am40.csc
+++ b/config/boards/smart-am40.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3399 hexa core 4GB SoC eMMC GBE USB3 WiFi/BT
 BOARD_NAME="SMART AM40"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="retro98boy"
 BOOTCONFIG="am40-rk3399_defconfig"
diff --git a/config/boards/sunvell-r69.tvb b/config/boards/sunvell-r69.tvb
index 2adc8313c7..f0a151b6dc 100644
--- a/config/boards/sunvell-r69.tvb
+++ b/config/boards/sunvell-r69.tvb
@@ -1,6 +1,6 @@
 # Allwinner H2+ quad core 1GB SoC WiFi eMMC
 BOARD_NAME="Sunvell R69"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun8i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="sunvell_r69_defconfig"
diff --git a/config/boards/tanix-tx6.tvb b/config/boards/tanix-tx6.tvb
index 1e9bc0c27c..2ca71da096 100644
--- a/config/boards/tanix-tx6.tvb
+++ b/config/boards/tanix-tx6.tvb
@@ -1,6 +1,6 @@
 # Allwinner H6 quad core 2/4GB SoC WiFi eMMC
 BOARD_NAME="Tanix TX6"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="tanix_tx6_defconfig"
diff --git a/config/boards/turing-rk1.csc b/config/boards/turing-rk1.csc
index 9b544bed3a..d777c377e0 100644
--- a/config/boards/turing-rk1.csc
+++ b/config/boards/turing-rk1.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3
 BOARD_NAME="Turing RK1"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="turing-rk1-rk3588_defconfig"
diff --git a/config/boards/udoo.csc b/config/boards/udoo.csc
index 622fa5ca14..a59653616b 100644
--- a/config/boards/udoo.csc
+++ b/config/boards/udoo.csc
@@ -1,6 +1,6 @@
 # Freescale / NXP iMx dual/quad core 1-2GB Gbe Wifi
 BOARD_NAME="Udoo"
-BOARD_VENDOR="udoo"
+BOARD_VENDOR="seco"
 BOARDFAMILY="imx6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="udoo_defconfig"
diff --git a/config/boards/uefi-riscv64.csc b/config/boards/uefi-riscv64.csc
index 87aa0af5c5..f037e54296 100644
--- a/config/boards/uefi-riscv64.csc
+++ b/config/boards/uefi-riscv64.csc
@@ -1,6 +1,6 @@
 # riscv64 via UEFI for all UEFI-enabled boards
 declare -g BOARD_NAME="UEFI riscv64"
-declare -g BOARD_VENDOR="riscv"
+declare -g BOARD_VENDOR="generic"
 declare -g BOARDFAMILY="uefi-riscv64"
 declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="current,edge,legacy"
diff --git a/config/boards/x96-mate.tvb b/config/boards/x96-mate.tvb
index b8e6b18f23..5eda3bedda 100644
--- a/config/boards/x96-mate.tvb
+++ b/config/boards/x96-mate.tvb
@@ -1,6 +1,6 @@
 # Allwinner H616 TVBox with 4GB of RAM and EMMC
 BOARD_NAME="X96 Mate"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun50iw9"
 BOARD_MAINTAINER="Ressetkk"
 BOOTCONFIG="x96_mate_defconfig"
diff --git a/config/boards/x96q.tvb b/config/boards/x96q.tvb
index af6fbcadab..48a5482d9c 100644
--- a/config/boards/x96q.tvb
+++ b/config/boards/x96q.tvb
@@ -1,6 +1,6 @@
 # Allwinner H313 TVBox with 2GB of RAM and EMMC
 BOARD_NAME="X96Q TV Box"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="allwinner"
 BOARDFAMILY="sun50iw9"
 BOARD_MAINTAINER="sicXnull"
 BOOTCONFIG="x96q_lpddr3_defconfig"
diff --git a/config/boards/xiaobao-nas.csc b/config/boards/xiaobao-nas.csc
index 2faa4b7918..b8738a6b7d 100644
--- a/config/boards/xiaobao-nas.csc
+++ b/config/boards/xiaobao-nas.csc
@@ -1,6 +1,6 @@
 # Rockchip RK3399 hexa core 4GB DDR3 SoC TF/PCIE GBE USB3
 BOARD_NAME="xiaobao-nas"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="xiaobao-nas-rk3399_defconfig"
diff --git a/config/boards/xt-q8l-v10.tvb b/config/boards/xt-q8l-v10.tvb
index c803a5d2a3..6ab95ddcea 100644
--- a/config/boards/xt-q8l-v10.tvb
+++ b/config/boards/xt-q8l-v10.tvb
@@ -1,6 +1,6 @@
 # Rockchip RK3288 TVBox quad core 2GB eMMC SoC GBE WiFi
 BOARD_NAME="XT Q8L V10"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip"
 BOARD_MAINTAINER=""
 BOOTCONFIG="xt-q8l-v10-rk3288_defconfig"
diff --git a/config/boards/z28pro.tvb b/config/boards/z28pro.tvb
index 875bb3165b..9f4dea4e36 100644
--- a/config/boards/z28pro.tvb
+++ b/config/boards/z28pro.tvb
@@ -1,6 +1,6 @@
 # Rockchip RK3328 quad core SoC 2GB 16GB eMMC GBE WiFi/BT
 BOARD_NAME="Z28 PRO"
-BOARD_VENDOR="generic"
+BOARD_VENDOR="rockchip"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock64-rk3328_defconfig"