summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-04-23 11:34:53 -0600
committerTom Rini <[email protected]>2025-04-23 11:34:53 -0600
commit6e325df4891cb9be954f1e62f16cd3096b267bdb (patch)
tree1ddf3ed2807a48df09912561867a26b18ac30f0b /board
parent873bca77a3dd4f6ba69c244bb1aaecb82679271f (diff)
parent1f07d257305c168551370fbaddbc2b2d83aedde4 (diff)
Merge tag 'u-boot-rockchip-20250423' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/25909 Please pull the updates for rockchip platform: - New SoC support: RK3528, RK3576 - New Board support: rk3528 Radxa E20C, rk3576 Firefly ROC-RK3576-PC; - Add generic board for rk3288 and rk3399; - rng driver binding update; - misc updates on board level or header files;
Diffstat (limited to 'board')
-rw-r--r--board/firefly/roc-pc-rk3576/Kconfig12
-rw-r--r--board/firefly/roc-pc-rk3576/MAINTAINERS7
-rw-r--r--board/rockchip/evb_rk3328/MAINTAINERS6
-rw-r--r--board/rockchip/evb_rk3399/MAINTAINERS6
-rw-r--r--board/theobroma-systems/common/Makefile9
-rw-r--r--board/theobroma-systems/jaguar_rk3588/Makefile3
-rw-r--r--board/theobroma-systems/puma_rk3399/Makefile3
-rw-r--r--board/theobroma-systems/ringneck_px30/Makefile3
-rw-r--r--board/theobroma-systems/tiger_rk3588/Makefile3
9 files changed, 40 insertions, 12 deletions
diff --git a/board/firefly/roc-pc-rk3576/Kconfig b/board/firefly/roc-pc-rk3576/Kconfig
new file mode 100644
index 00000000000..2fc0f913c37
--- /dev/null
+++ b/board/firefly/roc-pc-rk3576/Kconfig
@@ -0,0 +1,12 @@
+if TARGET_ROC_PC_RK3576
+
+config SYS_BOARD
+ default "roc-pc-rk3576"
+
+config SYS_VENDOR
+ default "firefly"
+
+config SYS_CONFIG_NAME
+ default "roc-pc-rk3576"
+
+endif
diff --git a/board/firefly/roc-pc-rk3576/MAINTAINERS b/board/firefly/roc-pc-rk3576/MAINTAINERS
new file mode 100644
index 00000000000..aa8897c16fc
--- /dev/null
+++ b/board/firefly/roc-pc-rk3576/MAINTAINERS
@@ -0,0 +1,7 @@
+ROC-RK3576-PC
+M: Heiko Stuebner <[email protected]>
+S: Maintained
+F: board/firefly/roc-pc-rk3576
+F: include/configs/roc-pc-rk3576.h
+F: configs/roc-pc-rk3576_defconfig
+F: arch/arm/dts/rk3576-roc-pc*
diff --git a/board/rockchip/evb_rk3328/MAINTAINERS b/board/rockchip/evb_rk3328/MAINTAINERS
index 5f81be55b8e..8c9b42fe2bb 100644
--- a/board/rockchip/evb_rk3328/MAINTAINERS
+++ b/board/rockchip/evb_rk3328/MAINTAINERS
@@ -7,6 +7,12 @@ F: configs/evb-rk3328_defconfig
F: arch/arm/dts/rk3328-evb.dts
F: arch/arm/dts/rk3328-evb-u-boot.dtsi
+GENERIC-RK3328
+M: Jonas Karlman <[email protected]>
+S: Maintained
+F: configs/generic-rk3328_defconfig
+F: arch/arm/dts/rk3328-generic*
+
NANOPI-R2C-RK3328
M: Tianling Shen <[email protected]>
S: Maintained
diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
index 8dab3fa70f5..8319db2e976 100644
--- a/board/rockchip/evb_rk3399/MAINTAINERS
+++ b/board/rockchip/evb_rk3399/MAINTAINERS
@@ -14,6 +14,12 @@ S: Maintained
F: configs/eaidk-610-rk3399_defconfig
F: arch/arm/dts/rk3399-eaidk-610*
+GENERIC-RK3399
+M: Jonas Karlman <[email protected]>
+S: Maintained
+F: configs/generic-rk3399_defconfig
+F: arch/arm/dts/rk3399-generic*
+
KHADAS-EDGE
M: Nick Xie <[email protected]>
S: Maintained
diff --git a/board/theobroma-systems/common/Makefile b/board/theobroma-systems/common/Makefile
new file mode 100644
index 00000000000..c1cadb4b913
--- /dev/null
+++ b/board/theobroma-systems/common/Makefile
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025 Cherry Embedded Solutions GmbH
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+ifneq ($(CONFIG_XPL_BUILD),y)
+obj-y += common.o
+endif
diff --git a/board/theobroma-systems/jaguar_rk3588/Makefile b/board/theobroma-systems/jaguar_rk3588/Makefile
index d43bf194b68..38b73d2846c 100644
--- a/board/theobroma-systems/jaguar_rk3588/Makefile
+++ b/board/theobroma-systems/jaguar_rk3588/Makefile
@@ -5,6 +5,3 @@
#
obj-y += jaguar_rk3588.o
-ifneq ($(CONFIG_XPL_BUILD),y)
-obj-y += ../common/common.o
-endif
diff --git a/board/theobroma-systems/puma_rk3399/Makefile b/board/theobroma-systems/puma_rk3399/Makefile
index 2256e72cda1..d962b56f111 100644
--- a/board/theobroma-systems/puma_rk3399/Makefile
+++ b/board/theobroma-systems/puma_rk3399/Makefile
@@ -5,6 +5,3 @@
#
obj-y += puma-rk3399.o
-ifneq ($(CONFIG_XPL_BUILD),y)
-obj-y += ../common/common.o
-endif
diff --git a/board/theobroma-systems/ringneck_px30/Makefile b/board/theobroma-systems/ringneck_px30/Makefile
index 4d108f2d011..31ada1a6942 100644
--- a/board/theobroma-systems/ringneck_px30/Makefile
+++ b/board/theobroma-systems/ringneck_px30/Makefile
@@ -5,6 +5,3 @@
#
obj-y += ringneck-px30.o
-ifneq ($(CONFIG_XPL_BUILD),y)
-obj-y += ../common/common.o
-endif
diff --git a/board/theobroma-systems/tiger_rk3588/Makefile b/board/theobroma-systems/tiger_rk3588/Makefile
index 94b0859eb35..900647735fb 100644
--- a/board/theobroma-systems/tiger_rk3588/Makefile
+++ b/board/theobroma-systems/tiger_rk3588/Makefile
@@ -5,6 +5,3 @@
#
obj-y += tiger_rk3588.o
-ifneq ($(CONFIG_XPL_BUILD),y)
-obj-y += ../common/common.o
-endif