[PATCH 00/11] rockchip: Small cleanups for RK356x and RK3588

[PATCH 00/11] rockchip: Small cleanups for RK356x and RK3588

[Jonas Karlman]

This series add small cleanups for RK356x and RK3588.

These are small changes that was implemented while working on RK3528 [1]
and future RK3506 [2] support. Similar changes has also been recommended
for a v2 of the RK3576 series.

This also add the meminfo and rng commands to the generic-rk3568/rk3588
board targets.

[1] https://source.denx.de/u-boot/contributors/kwiboo/u-boot/-/commits/rk3528
[2] https://source.denx.de/u-boot/contributors/kwiboo/u-boot/-/commits/rk3506

Jonas Karlman (11):
  rockchip: rk3588: Use hptimer reg names in rockchip_stimer_init
  rockchip: Remove partitions env variable for RK356x
  rockchip: Remove partitions env variable for RK3588
  rockchip: Ensure device settings is defined before rk3568_common.h
  rockchip: Ensure device settings is defined before rk3588_common.h
  rockchip: Use rk3568_common.h by default for RK356x boards
  rockchip: Use rk3588_common.h by default for RK3588 boards
  rockchip: rk3568: Drop BOARD_LATE_INIT from target config
  rockchip: rk3588: Drop BOARD_LATE_INIT from target config
  rockchip: Enable meminfo and rng commands for Generic RK3566/RK3568
  rockchip: Enable meminfo and rng commands for Generic RK3588

 arch/arm/mach-rockchip/rk3568/Kconfig   |  4 +++-
 arch/arm/mach-rockchip/rk3588/Kconfig   | 23 +++--------------------
 arch/arm/mach-rockchip/rk3588/rk3588.c  | 19 +++++++++++++------
 configs/generic-rk3568_defconfig        |  3 +++
 configs/generic-rk3588_defconfig        |  3 +++
 include/configs/anbernic-rgxx3-rk3566.h |  4 ++--
 include/configs/evb_rk3568.h            |  4 ++--
 include/configs/evb_rk3588.h            |  4 ++--
 include/configs/khadas-edge2-rk3588s.h  |  4 ++--
 include/configs/powkiddy-x55-rk3566.h   |  4 ++--
 include/configs/rk3568_common.h         |  5 ++++-
 include/configs/rk3588_common.h         |  5 ++++-
 include/configs/toybrick_rk3588.h       |  4 ++--
 13 files changed, 45 insertions(+), 41 deletions(-)

-- 
2.49.0

[PATCH 01/11] rockchip: rk3588: Use hptimer reg names in rockchip_stimer_init

[Jonas Karlman]

Define constants for hptimer reg names and use them instead of magic
numbers in rockchip_stimer_init().

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3588/rk3588.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3588/rk3588.c b/arch/arm/mach-rockchip/rk3588/rk3588.c
index 6395483f14f1..ac35866e2f87 100644
--- a/arch/arm/mach-rockchip/rk3588/rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/rk3588.c
@@ -116,18 +116,25 @@ void board_debug_uart_init(void)
 }
 
 #ifdef CONFIG_XPL_BUILD
+
+#define HP_TIMER_BASE			CONFIG_ROCKCHIP_STIMER_BASE
+#define HP_CTRL_REG			0x04
+#define TIMER_EN			BIT(0)
+#define HP_LOAD_COUNT0_REG		0x14
+#define HP_LOAD_COUNT1_REG		0x18
+
 void rockchip_stimer_init(void)
 {
 	/* If Timer already enabled, don't re-init it */
-	u32 reg = readl(CONFIG_ROCKCHIP_STIMER_BASE + 0x4);
+	u32 reg = readl(HP_TIMER_BASE + HP_CTRL_REG);
 
-	if (reg & 0x1)
+	if (reg & TIMER_EN)
 		return;
 
-	asm volatile("msr CNTFRQ_EL0, %0" : : "r" (CONFIG_COUNTER_FREQUENCY));
-	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 0x14);
-	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 0x18);
-	writel(0x1, CONFIG_ROCKCHIP_STIMER_BASE + 0x4);
+	asm volatile("msr cntfrq_el0, %0" : : "r" (CONFIG_COUNTER_FREQUENCY));
+	writel(0xffffffff, HP_TIMER_BASE + HP_LOAD_COUNT0_REG);
+	writel(0xffffffff, HP_TIMER_BASE + HP_LOAD_COUNT1_REG);
+	writel(TIMER_EN, HP_TIMER_BASE + HP_CTRL_REG);
 }
 #endif
 
-- 
2.49.0

Re: [PATCH 01/11] rockchip: rk3588: Use hptimer reg names in rockchip_stimer_init

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> Define constants for hptimer reg names and use them instead of magic
> numbers in rockchip_stimer_init().
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3588/rk3588.c | 19 +++++++++++++------
>   1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3588/rk3588.c b/arch/arm/mach-rockchip/rk3588/rk3588.c
> index 6395483f14f1..ac35866e2f87 100644
> --- a/arch/arm/mach-rockchip/rk3588/rk3588.c
> +++ b/arch/arm/mach-rockchip/rk3588/rk3588.c
> @@ -116,18 +116,25 @@ void board_debug_uart_init(void)
>   }
>   
>   #ifdef CONFIG_XPL_BUILD
> +
> +#define HP_TIMER_BASE			CONFIG_ROCKCHIP_STIMER_BASE
> +#define HP_CTRL_REG			0x04
> +#define TIMER_EN			BIT(0)
> +#define HP_LOAD_COUNT0_REG		0x14
> +#define HP_LOAD_COUNT1_REG		0x18
> +
>   void rockchip_stimer_init(void)
>   {
>   	/* If Timer already enabled, don't re-init it */
> -	u32 reg = readl(CONFIG_ROCKCHIP_STIMER_BASE + 0x4);
> +	u32 reg = readl(HP_TIMER_BASE + HP_CTRL_REG);
>   
> -	if (reg & 0x1)
> +	if (reg & TIMER_EN)
>   		return;
>   
> -	asm volatile("msr CNTFRQ_EL0, %0" : : "r" (CONFIG_COUNTER_FREQUENCY));
> -	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 0x14);
> -	writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 0x18);
> -	writel(0x1, CONFIG_ROCKCHIP_STIMER_BASE + 0x4);
> +	asm volatile("msr cntfrq_el0, %0" : : "r" (CONFIG_COUNTER_FREQUENCY));
> +	writel(0xffffffff, HP_TIMER_BASE + HP_LOAD_COUNT0_REG);
> +	writel(0xffffffff, HP_TIMER_BASE + HP_LOAD_COUNT1_REG);
> +	writel(TIMER_EN, HP_TIMER_BASE + HP_CTRL_REG);
>   }
>   #endif
>   

[PATCH 02/11] rockchip: Remove partitions env variable for RK356x

[Jonas Karlman]

The partitions env variable is using an outdated partition layout that
is typically expected to be used with older vendor miniloader blobs.

Rockchip devices will run fine using any partition layout if the first
16 MiB of MMC storage is ignored/skipped.

Remove the partitions env variable to stop encourage users a continued
use of this outdated partition layout on RK356x devices.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 include/configs/rk3568_common.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 09b7b71c6afd..a68ca381db57 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -29,7 +29,6 @@
 
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"	\
-	"partitions=" PARTS_DEFAULT	\
 	ENV_MEM_LAYOUT_SETTINGS		\
 	ROCKCHIP_DEVICE_SETTINGS	\
 	"boot_targets=" BOOT_TARGETS "\0"
-- 
2.49.0

Re: [PATCH 02/11] rockchip: Remove partitions env variable for RK356x

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> The partitions env variable is using an outdated partition layout that
> is typically expected to be used with older vendor miniloader blobs.
>
> Rockchip devices will run fine using any partition layout if the first
> 16 MiB of MMC storage is ignored/skipped.
>
> Remove the partitions env variable to stop encourage users a continued
> use of this outdated partition layout on RK356x devices.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   include/configs/rk3568_common.h | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
> index 09b7b71c6afd..a68ca381db57 100644
> --- a/include/configs/rk3568_common.h
> +++ b/include/configs/rk3568_common.h
> @@ -29,7 +29,6 @@
>   
>   #define CFG_EXTRA_ENV_SETTINGS		\
>   	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"	\
> -	"partitions=" PARTS_DEFAULT	\
>   	ENV_MEM_LAYOUT_SETTINGS		\
>   	ROCKCHIP_DEVICE_SETTINGS	\
>   	"boot_targets=" BOOT_TARGETS "\0"

[PATCH 03/11] rockchip: Remove partitions env variable for RK3588

[Jonas Karlman]

The partitions env variable is using an outdated partition layout that
is typically expected to be used with older vendor miniloader blobs.

Rockchip devices will run fine using any partition layout if the first
16 MiB of MMC storage is ignored/skipped.

Remove the partitions env variable to stop encourage users a continued
use of this outdated partition layout on RK3588 devices.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 include/configs/rk3588_common.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
index e6654c275ac5..7b02560971ad 100644
--- a/include/configs/rk3588_common.h
+++ b/include/configs/rk3588_common.h
@@ -28,7 +28,6 @@
 
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"	\
-	"partitions=" PARTS_DEFAULT	\
 	ENV_MEM_LAYOUT_SETTINGS		\
 	ROCKCHIP_DEVICE_SETTINGS	\
 	"boot_targets=" BOOT_TARGETS "\0"
-- 
2.49.0

Re: [PATCH 03/11] rockchip: Remove partitions env variable for RK3588

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> The partitions env variable is using an outdated partition layout that
> is typically expected to be used with older vendor miniloader blobs.
>
> Rockchip devices will run fine using any partition layout if the first
> 16 MiB of MMC storage is ignored/skipped.
>
> Remove the partitions env variable to stop encourage users a continued
> use of this outdated partition layout on RK3588 devices.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   include/configs/rk3588_common.h | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
> index e6654c275ac5..7b02560971ad 100644
> --- a/include/configs/rk3588_common.h
> +++ b/include/configs/rk3588_common.h
> @@ -28,7 +28,6 @@
>   
>   #define CFG_EXTRA_ENV_SETTINGS		\
>   	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"	\
> -	"partitions=" PARTS_DEFAULT	\
>   	ENV_MEM_LAYOUT_SETTINGS		\
>   	ROCKCHIP_DEVICE_SETTINGS	\
>   	"boot_targets=" BOOT_TARGETS "\0"

[PATCH 04/11] rockchip: Ensure device settings is defined before rk3568_common.h

[Jonas Karlman]

Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
rk3568_common.h in board include/configs files.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 include/configs/anbernic-rgxx3-rk3566.h | 4 ++--
 include/configs/evb_rk3568.h            | 4 ++--
 include/configs/powkiddy-x55-rk3566.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/anbernic-rgxx3-rk3566.h b/include/configs/anbernic-rgxx3-rk3566.h
index 3c4ea4e7d843..3d9e05a976a5 100644
--- a/include/configs/anbernic-rgxx3-rk3566.h
+++ b/include/configs/anbernic-rgxx3-rk3566.h
@@ -3,10 +3,10 @@
 #ifndef __ANBERNIC_RGXX3_RK3566_H
 #define __ANBERNIC_RGXX3_RK3566_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif
diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h
index a0f2383bf2f2..9070160cf58d 100644
--- a/include/configs/evb_rk3568.h
+++ b/include/configs/evb_rk3568.h
@@ -6,10 +6,10 @@
 #ifndef __EVB_RK3568_H
 #define __EVB_RK3568_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif
diff --git a/include/configs/powkiddy-x55-rk3566.h b/include/configs/powkiddy-x55-rk3566.h
index 4b25c6a87740..8ace435434fc 100644
--- a/include/configs/powkiddy-x55-rk3566.h
+++ b/include/configs/powkiddy-x55-rk3566.h
@@ -3,10 +3,10 @@
 #ifndef __POWKIDDY_X55_RK3566_H
 #define __POWKIDDY_X55_RK3566_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif
-- 
2.49.0

Re: [PATCH 04/11] rockchip: Ensure device settings is defined before rk3568_common.h

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
> rk3568_common.h in board include/configs files.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   include/configs/anbernic-rgxx3-rk3566.h | 4 ++--
>   include/configs/evb_rk3568.h            | 4 ++--
>   include/configs/powkiddy-x55-rk3566.h   | 4 ++--
>   3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/configs/anbernic-rgxx3-rk3566.h b/include/configs/anbernic-rgxx3-rk3566.h
> index 3c4ea4e7d843..3d9e05a976a5 100644
> --- a/include/configs/anbernic-rgxx3-rk3566.h
> +++ b/include/configs/anbernic-rgxx3-rk3566.h
> @@ -3,10 +3,10 @@
>   #ifndef __ANBERNIC_RGXX3_RK3566_H
>   #define __ANBERNIC_RGXX3_RK3566_H
>   
> -#include <configs/rk3568_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   			"stdout=serial,vidconsole\0" \
>   			"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3568_common.h>
> +
>   #endif
> diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h
> index a0f2383bf2f2..9070160cf58d 100644
> --- a/include/configs/evb_rk3568.h
> +++ b/include/configs/evb_rk3568.h
> @@ -6,10 +6,10 @@
>   #ifndef __EVB_RK3568_H
>   #define __EVB_RK3568_H
>   
> -#include <configs/rk3568_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   			"stdout=serial,vidconsole\0" \
>   			"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3568_common.h>
> +
>   #endif
> diff --git a/include/configs/powkiddy-x55-rk3566.h b/include/configs/powkiddy-x55-rk3566.h
> index 4b25c6a87740..8ace435434fc 100644
> --- a/include/configs/powkiddy-x55-rk3566.h
> +++ b/include/configs/powkiddy-x55-rk3566.h
> @@ -3,10 +3,10 @@
>   #ifndef __POWKIDDY_X55_RK3566_H
>   #define __POWKIDDY_X55_RK3566_H
>   
> -#include <configs/rk3568_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   			"stdout=serial,vidconsole\0" \
>   			"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3568_common.h>
> +
>   #endif

[PATCH 05/11] rockchip: Ensure device settings is defined before rk3588_common.h

[Jonas Karlman]

Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
rk3588_common.h in board include/configs files.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 include/configs/evb_rk3588.h           | 4 ++--
 include/configs/khadas-edge2-rk3588s.h | 4 ++--
 include/configs/toybrick_rk3588.h      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/evb_rk3588.h b/include/configs/evb_rk3588.h
index 4568e2cace66..5ff1ddbfcbec 100644
--- a/include/configs/evb_rk3588.h
+++ b/include/configs/evb_rk3588.h
@@ -6,10 +6,10 @@
 #ifndef __EVB_RK3588_H
 #define __EVB_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif
diff --git a/include/configs/khadas-edge2-rk3588s.h b/include/configs/khadas-edge2-rk3588s.h
index d279cf3826a9..fe8461d63626 100644
--- a/include/configs/khadas-edge2-rk3588s.h
+++ b/include/configs/khadas-edge2-rk3588s.h
@@ -6,10 +6,10 @@
 #ifndef __KHADAS_EDGE2_RK3588_H
 #define __KHADAS_EDGE2_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif /* __KHADAS_EDGE2_RK3588_H */
diff --git a/include/configs/toybrick_rk3588.h b/include/configs/toybrick_rk3588.h
index faa2e6c19c3e..005650896760 100644
--- a/include/configs/toybrick_rk3588.h
+++ b/include/configs/toybrick_rk3588.h
@@ -6,10 +6,10 @@
 #ifndef __TOYBRICK_RK3588_H
 #define __TOYBRICK_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif
-- 
2.49.0

Re: [PATCH 05/11] rockchip: Ensure device settings is defined before rk3588_common.h

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
> rk3588_common.h in board include/configs files.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   include/configs/evb_rk3588.h           | 4 ++--
>   include/configs/khadas-edge2-rk3588s.h | 4 ++--
>   include/configs/toybrick_rk3588.h      | 4 ++--
>   3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/configs/evb_rk3588.h b/include/configs/evb_rk3588.h
> index 4568e2cace66..5ff1ddbfcbec 100644
> --- a/include/configs/evb_rk3588.h
> +++ b/include/configs/evb_rk3588.h
> @@ -6,10 +6,10 @@
>   #ifndef __EVB_RK3588_H
>   #define __EVB_RK3588_H
>   
> -#include <configs/rk3588_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   		"stdout=serial,vidconsole\0" \
>   		"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3588_common.h>
> +
>   #endif
> diff --git a/include/configs/khadas-edge2-rk3588s.h b/include/configs/khadas-edge2-rk3588s.h
> index d279cf3826a9..fe8461d63626 100644
> --- a/include/configs/khadas-edge2-rk3588s.h
> +++ b/include/configs/khadas-edge2-rk3588s.h
> @@ -6,10 +6,10 @@
>   #ifndef __KHADAS_EDGE2_RK3588_H
>   #define __KHADAS_EDGE2_RK3588_H
>   
> -#include <configs/rk3588_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   		"stdout=serial,vidconsole\0" \
>   		"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3588_common.h>
> +
>   #endif /* __KHADAS_EDGE2_RK3588_H */
> diff --git a/include/configs/toybrick_rk3588.h b/include/configs/toybrick_rk3588.h
> index faa2e6c19c3e..005650896760 100644
> --- a/include/configs/toybrick_rk3588.h
> +++ b/include/configs/toybrick_rk3588.h
> @@ -6,10 +6,10 @@
>   #ifndef __TOYBRICK_RK3588_H
>   #define __TOYBRICK_RK3588_H
>   
> -#include <configs/rk3588_common.h>
> -
>   #define ROCKCHIP_DEVICE_SETTINGS \
>   		"stdout=serial,vidconsole\0" \
>   		"stderr=serial,vidconsole\0"
>   
> +#include <configs/rk3588_common.h>
> +
>   #endif

[PATCH 06/11] rockchip: Use rk3568_common.h by default for RK356x boards

[Jonas Karlman]

Ensure rk3568_common.h can be used by boards directly by defining a
blank ROCKCHIP_DEVICE_SETTINGS unless it already is defined.

Add a default SYS_CONFIG_NAME to include rk3568_common.h unless a board
target overrides it in its board Kconfig.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3568/Kconfig | 3 +++
 include/configs/rk3568_common.h       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
index a271782fac5c..8cad77890f13 100644
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -81,4 +81,7 @@ source "board/qnap/ts433/Kconfig"
 source "board/radxa/zero3-rk3566/Kconfig"
 source "board/xunlong/orangepi-3b-rk3566/Kconfig"
 
+config SYS_CONFIG_NAME
+	default "rk3568_common"
+
 endif
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index a68ca381db57..b2a35db0b949 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -15,6 +15,10 @@
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xf0000000
 
+#ifndef ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS
+#endif
+
 #define ENV_MEM_LAYOUT_SETTINGS		\
 	"scriptaddr=0x00c00000\0"	\
 	"script_offset_f=0xffe000\0"	\
-- 
2.49.0

Re: [PATCH 06/11] rockchip: Use rk3568_common.h by default for RK356x boards

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> Ensure rk3568_common.h can be used by boards directly by defining a
> blank ROCKCHIP_DEVICE_SETTINGS unless it already is defined.
>
> Add a default SYS_CONFIG_NAME to include rk3568_common.h unless a board
> target overrides it in its board Kconfig.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3568/Kconfig | 3 +++
>   include/configs/rk3568_common.h       | 4 ++++
>   2 files changed, 7 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index a271782fac5c..8cad77890f13 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -81,4 +81,7 @@ source "board/qnap/ts433/Kconfig"
>   source "board/radxa/zero3-rk3566/Kconfig"
>   source "board/xunlong/orangepi-3b-rk3566/Kconfig"
>   
> +config SYS_CONFIG_NAME
> +	default "rk3568_common"
> +
>   endif
> diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
> index a68ca381db57..b2a35db0b949 100644
> --- a/include/configs/rk3568_common.h
> +++ b/include/configs/rk3568_common.h
> @@ -15,6 +15,10 @@
>   #define CFG_SYS_SDRAM_BASE		0
>   #define SDRAM_MAX_SIZE			0xf0000000
>   
> +#ifndef ROCKCHIP_DEVICE_SETTINGS
> +#define ROCKCHIP_DEVICE_SETTINGS
> +#endif
> +
>   #define ENV_MEM_LAYOUT_SETTINGS		\
>   	"scriptaddr=0x00c00000\0"	\
>   	"script_offset_f=0xffe000\0"	\

[PATCH 07/11] rockchip: Use rk3588_common.h by default for RK3588 boards

[Jonas Karlman]

Ensure rk3588_common.h can be used by boards directly by defining a
blank ROCKCHIP_DEVICE_SETTINGS unless it already is defined.

Add a default SYS_CONFIG_NAME to include rk3588_common.h unless a board
target overrides it in its board Kconfig.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3588/Kconfig | 3 +++
 include/configs/rk3588_common.h       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
index 1c6a85d07394..8acb6618718f 100644
--- a/arch/arm/mach-rockchip/rk3588/Kconfig
+++ b/arch/arm/mach-rockchip/rk3588/Kconfig
@@ -441,4 +441,7 @@ source "board/rockchip/toybrick_rk3588/Kconfig"
 source "board/theobroma-systems/jaguar_rk3588/Kconfig"
 source "board/theobroma-systems/tiger_rk3588/Kconfig"
 
+config SYS_CONFIG_NAME
+	default "rk3588_common"
+
 endif
diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
index 7b02560971ad..2f0d40deb640 100644
--- a/include/configs/rk3588_common.h
+++ b/include/configs/rk3588_common.h
@@ -14,6 +14,10 @@
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xf0000000
 
+#ifndef ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS
+#endif
+
 #define ENV_MEM_LAYOUT_SETTINGS		\
 	"scriptaddr=0x00c00000\0"	\
 	"script_offset_f=0xffe000\0"	\
-- 
2.49.0

Re: [PATCH 07/11] rockchip: Use rk3588_common.h by default for RK3588 boards

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> Ensure rk3588_common.h can be used by boards directly by defining a
> blank ROCKCHIP_DEVICE_SETTINGS unless it already is defined.
>
> Add a default SYS_CONFIG_NAME to include rk3588_common.h unless a board
> target overrides it in its board Kconfig.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3588/Kconfig | 3 +++
>   include/configs/rk3588_common.h       | 4 ++++
>   2 files changed, 7 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> index 1c6a85d07394..8acb6618718f 100644
> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> @@ -441,4 +441,7 @@ source "board/rockchip/toybrick_rk3588/Kconfig"
>   source "board/theobroma-systems/jaguar_rk3588/Kconfig"
>   source "board/theobroma-systems/tiger_rk3588/Kconfig"
>   
> +config SYS_CONFIG_NAME
> +	default "rk3588_common"
> +
>   endif
> diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
> index 7b02560971ad..2f0d40deb640 100644
> --- a/include/configs/rk3588_common.h
> +++ b/include/configs/rk3588_common.h
> @@ -14,6 +14,10 @@
>   #define CFG_SYS_SDRAM_BASE		0
>   #define SDRAM_MAX_SIZE			0xf0000000
>   
> +#ifndef ROCKCHIP_DEVICE_SETTINGS
> +#define ROCKCHIP_DEVICE_SETTINGS
> +#endif
> +
>   #define ENV_MEM_LAYOUT_SETTINGS		\
>   	"scriptaddr=0x00c00000\0"	\
>   	"script_offset_f=0xffe000\0"	\

[PATCH 08/11] rockchip: rk3568: Drop BOARD_LATE_INIT from target config

[Jonas Karlman]

BOARD_LATE_INIT is already selected by ROCKCHIP_RK3568 so there is no
need to select it under any board target config.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3568/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
index 8cad77890f13..2730220a18e8 100644
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -5,7 +5,6 @@ choice
 
 config TARGET_EVB_RK3568
 	bool "RK3568 evaluation board"
-	select BOARD_LATE_INIT
 	help
 	  RK3568 EVB is a evaluation board for Rockchp RK3568.
 
-- 
2.49.0

Re: [PATCH 08/11] rockchip: rk3568: Drop BOARD_LATE_INIT from target config

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> BOARD_LATE_INIT is already selected by ROCKCHIP_RK3568 so there is no
> need to select it under any board target config.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3568/Kconfig | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index 8cad77890f13..2730220a18e8 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -5,7 +5,6 @@ choice
>   
>   config TARGET_EVB_RK3568
>   	bool "RK3568 evaluation board"
> -	select BOARD_LATE_INIT
>   	help
>   	  RK3568 EVB is a evaluation board for Rockchp RK3568.
>   

[PATCH 09/11] rockchip: rk3588: Drop BOARD_LATE_INIT from target config

[Jonas Karlman]

BOARD_LATE_INIT is already selected by ROCKCHIP_RK3588 so there is no
need to select it under any board target config.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3588/Kconfig | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
index 8acb6618718f..dfc19c4fc8fa 100644
--- a/arch/arm/mach-rockchip/rk3588/Kconfig
+++ b/arch/arm/mach-rockchip/rk3588/Kconfig
@@ -2,13 +2,11 @@ if ROCKCHIP_RK3588
 
 config TARGET_EVB_RK3588
 	bool "Rockchip EVB1 v10"
-	select BOARD_LATE_INIT
 	help
 	  RK3588 EVB is a evaluation board for Rockchp RK3588.
 
 config TARGET_CM3588_NAS_RK3588
 	bool "FriendlyElec CM3588 NAS"
-	select BOARD_LATE_INIT
 	help
 	  The CM3588 NAS by FriendlyElec pairs the CM3588 compute module, based
 	  on the Rockchip RK3588 SoC, with the CM3588 NAS Kit carrier board.
@@ -31,7 +29,6 @@ config TARGET_CM3588_NAS_RK3588
 
 config TARGET_GENBOOK_CM5_RK3588
 	bool "Cool Pi CM5 GenBook"
-	select BOARD_LATE_INIT
 	help
 	  GeenBook is a notebook based on Rockchip RK3588, and works as a carrier
 	  board connect with CM5 SOM.
@@ -49,7 +46,6 @@ config TARGET_GENBOOK_CM5_RK3588
 
 config TARGET_JAGUAR_RK3588
 	bool "Theobroma Systems SBC-RK3588-AMR (Jaguar)"
-	select BOARD_LATE_INIT
 	help
 	  The SBC-RK3588-AMR is a Single Board Computer designed by
 	  Theobroma Systems for autonomous mobile robots.
@@ -76,7 +72,6 @@ config TARGET_JAGUAR_RK3588
 
 config TARGET_KHADAS_EDGE2_RK3588
 	bool "Khadas Edge2 RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  Khadas Edge2 is a Rockchip RK3588S based SBC (Single Board Computer)
 	  by Khadas.
@@ -98,7 +93,6 @@ config TARGET_KHADAS_EDGE2_RK3588
 
 config TARGET_NANOPCT6_RK3588
 	bool "FriendlyElec NanoPC-T6 RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  The NanoPC-T6 is a Rockchip RK3588 based SBC by FriendlyElec.
 
@@ -143,7 +137,6 @@ config TARGET_NANOPCT6_RK3588
 
 config TARGET_NANOPI_R6C_RK3588S
 	bool "FriendlyElec NanoPi R6C"
-	select BOARD_LATE_INIT
 	help
 	  The NanoPi R6C is a SBC by FriendlyElec based on the Rockchip
 	  RK3588s.
@@ -155,7 +148,6 @@ config TARGET_NANOPI_R6C_RK3588S
 
 config TARGET_NANOPI_R6S_RK3588S
 	bool "FriendlyElec NanoPi R6S"
-	select BOARD_LATE_INIT
 	help
 	  The NanoPi R6S is a SBC by FriendlyElec based on the Rockchip
 	  RK3588s.
@@ -167,7 +159,6 @@ config TARGET_NANOPI_R6S_RK3588S
 
 config TARGET_NOVA_RK3588
 	bool "Indiedroid Nova RK3588"
-	select BOARD_LATE_INIT
 	help
 	  Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid.
 	  It comes in configurations from 4GB of RAM to 16GB of RAM,
@@ -176,13 +167,11 @@ config TARGET_NOVA_RK3588
 
 config TARGET_ODROID_M2_RK3588S
 	bool "Hardkernel ODROID-M2"
-	select BOARD_LATE_INIT
 	help
 	  Hardkernel ODROID-M2 single board computer with a RK3588S2 SoC.
 
 config TARGET_RK3588_NEU6
 	bool "Edgeble Neural Compute Module 6(Neu6) SoM"
-	select BOARD_LATE_INIT
 	help
 	  Neu6A:
 	  Neural Compute Module 6A(Neu6A) is a 96boards SoM-CB compute module
@@ -204,7 +193,6 @@ config TARGET_RK3588_NEU6
 
 config TARGET_ROCK5A_RK3588
 	bool "Radxa ROCK5A RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  Radxa ROCK5A is a Rockchip RK3588S based SBC (Single Board Computer)
 	  by Radxa.
@@ -231,7 +219,6 @@ config TARGET_ROCK5A_RK3588
 
 config TARGET_ROCK5B_RK3588
 	bool "Radxa ROCK5B RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  Radxa ROCK5B is a Rockchip RK3588 based SBC (Single Board Computer)
 	  by Radxa.
@@ -256,7 +243,6 @@ config TARGET_ROCK5B_RK3588
 
 config TARGET_ROCK_5_ITX_RK3588
 	bool "Radxa ROCK-5-ITX RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  Radxa ROCK-5-ITX is a Rockchip RK3588 based SBC (Single Board
 	  Computer) by Radxa in the ITX formfactor.
@@ -284,7 +270,6 @@ config TARGET_ROCK_5_ITX_RK3588
 
 config TARGET_ROCK_5C_RK3588S
 	bool "Radxa ROCK 5C RK3588S2 board"
-	select BOARD_LATE_INIT
 	help
 	  Radxa ROCK 5C is a Rockchip RK3588S2 based single board computer.
 
@@ -304,7 +289,6 @@ config TARGET_ROCK_5C_RK3588S
 
 config TARGET_SIGE7_RK3588
 	bool "ArmSoM Sige7 RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  ArmSoM Sige7 is a Rockchip RK3588 based SBC (Single Board Computer)
 	  by ArmSoM.
@@ -329,14 +313,12 @@ config TARGET_SIGE7_RK3588
 
 config TARGET_QUARTZPRO64_RK3588
 	bool "Pine64 QuartzPro64 RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  Pine64 QuartzPro64 is a Rockchip RK3588 based SBC (Single Board
 	  Computer) by Pine64.
 
 config TARGET_TIGER_RK3588
 	bool "Theobroma Systems SOM-RK3588-Q7 (Tiger)"
-	select BOARD_LATE_INIT
 	help
 	  The RK3588-Q7 SoM is a Qseven-compatible (70mm x 70mm, MXM-230
 	  connector) system-on-module from Theobroma Systems, featuring the
@@ -366,7 +348,6 @@ config TARGET_TIGER_RK3588
 
 config TARGET_TURINGRK1_RK3588
 	bool "Turing Machines RK1 RK3588 board"
-	select BOARD_LATE_INIT
 	help
 	  The Turing RK1 is a Rockchip RK3588 based SoM from Turing Machines.
 
@@ -389,7 +370,6 @@ config TARGET_TURINGRK1_RK3588
 
 config TARGET_TOYBRICK_RK3588
 	bool "Toybrick TB-RK3588X board"
-	select BOARD_LATE_INIT
 	help
 	  Rockchip Toybrick TB-RK3588X is a Rockchip RK3588 based development board.
 	  TB-RK3588X adopts core board and mainboard design. The core board is connected
-- 
2.49.0

Re: [PATCH 09/11] rockchip: rk3588: Drop BOARD_LATE_INIT from target config

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> BOARD_LATE_INIT is already selected by ROCKCHIP_RK3588 so there is no
> need to select it under any board target config.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3588/Kconfig | 20 --------------------
>   1 file changed, 20 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> index 8acb6618718f..dfc19c4fc8fa 100644
> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> @@ -2,13 +2,11 @@ if ROCKCHIP_RK3588
>   
>   config TARGET_EVB_RK3588
>   	bool "Rockchip EVB1 v10"
> -	select BOARD_LATE_INIT
>   	help
>   	  RK3588 EVB is a evaluation board for Rockchp RK3588.
>   
>   config TARGET_CM3588_NAS_RK3588
>   	bool "FriendlyElec CM3588 NAS"
> -	select BOARD_LATE_INIT
>   	help
>   	  The CM3588 NAS by FriendlyElec pairs the CM3588 compute module, based
>   	  on the Rockchip RK3588 SoC, with the CM3588 NAS Kit carrier board.
> @@ -31,7 +29,6 @@ config TARGET_CM3588_NAS_RK3588
>   
>   config TARGET_GENBOOK_CM5_RK3588
>   	bool "Cool Pi CM5 GenBook"
> -	select BOARD_LATE_INIT
>   	help
>   	  GeenBook is a notebook based on Rockchip RK3588, and works as a carrier
>   	  board connect with CM5 SOM.
> @@ -49,7 +46,6 @@ config TARGET_GENBOOK_CM5_RK3588
>   
>   config TARGET_JAGUAR_RK3588
>   	bool "Theobroma Systems SBC-RK3588-AMR (Jaguar)"
> -	select BOARD_LATE_INIT
>   	help
>   	  The SBC-RK3588-AMR is a Single Board Computer designed by
>   	  Theobroma Systems for autonomous mobile robots.
> @@ -76,7 +72,6 @@ config TARGET_JAGUAR_RK3588
>   
>   config TARGET_KHADAS_EDGE2_RK3588
>   	bool "Khadas Edge2 RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Khadas Edge2 is a Rockchip RK3588S based SBC (Single Board Computer)
>   	  by Khadas.
> @@ -98,7 +93,6 @@ config TARGET_KHADAS_EDGE2_RK3588
>   
>   config TARGET_NANOPCT6_RK3588
>   	bool "FriendlyElec NanoPC-T6 RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  The NanoPC-T6 is a Rockchip RK3588 based SBC by FriendlyElec.
>   
> @@ -143,7 +137,6 @@ config TARGET_NANOPCT6_RK3588
>   
>   config TARGET_NANOPI_R6C_RK3588S
>   	bool "FriendlyElec NanoPi R6C"
> -	select BOARD_LATE_INIT
>   	help
>   	  The NanoPi R6C is a SBC by FriendlyElec based on the Rockchip
>   	  RK3588s.
> @@ -155,7 +148,6 @@ config TARGET_NANOPI_R6C_RK3588S
>   
>   config TARGET_NANOPI_R6S_RK3588S
>   	bool "FriendlyElec NanoPi R6S"
> -	select BOARD_LATE_INIT
>   	help
>   	  The NanoPi R6S is a SBC by FriendlyElec based on the Rockchip
>   	  RK3588s.
> @@ -167,7 +159,6 @@ config TARGET_NANOPI_R6S_RK3588S
>   
>   config TARGET_NOVA_RK3588
>   	bool "Indiedroid Nova RK3588"
> -	select BOARD_LATE_INIT
>   	help
>   	  Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid.
>   	  It comes in configurations from 4GB of RAM to 16GB of RAM,
> @@ -176,13 +167,11 @@ config TARGET_NOVA_RK3588
>   
>   config TARGET_ODROID_M2_RK3588S
>   	bool "Hardkernel ODROID-M2"
> -	select BOARD_LATE_INIT
>   	help
>   	  Hardkernel ODROID-M2 single board computer with a RK3588S2 SoC.
>   
>   config TARGET_RK3588_NEU6
>   	bool "Edgeble Neural Compute Module 6(Neu6) SoM"
> -	select BOARD_LATE_INIT
>   	help
>   	  Neu6A:
>   	  Neural Compute Module 6A(Neu6A) is a 96boards SoM-CB compute module
> @@ -204,7 +193,6 @@ config TARGET_RK3588_NEU6
>   
>   config TARGET_ROCK5A_RK3588
>   	bool "Radxa ROCK5A RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Radxa ROCK5A is a Rockchip RK3588S based SBC (Single Board Computer)
>   	  by Radxa.
> @@ -231,7 +219,6 @@ config TARGET_ROCK5A_RK3588
>   
>   config TARGET_ROCK5B_RK3588
>   	bool "Radxa ROCK5B RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Radxa ROCK5B is a Rockchip RK3588 based SBC (Single Board Computer)
>   	  by Radxa.
> @@ -256,7 +243,6 @@ config TARGET_ROCK5B_RK3588
>   
>   config TARGET_ROCK_5_ITX_RK3588
>   	bool "Radxa ROCK-5-ITX RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Radxa ROCK-5-ITX is a Rockchip RK3588 based SBC (Single Board
>   	  Computer) by Radxa in the ITX formfactor.
> @@ -284,7 +270,6 @@ config TARGET_ROCK_5_ITX_RK3588
>   
>   config TARGET_ROCK_5C_RK3588S
>   	bool "Radxa ROCK 5C RK3588S2 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Radxa ROCK 5C is a Rockchip RK3588S2 based single board computer.
>   
> @@ -304,7 +289,6 @@ config TARGET_ROCK_5C_RK3588S
>   
>   config TARGET_SIGE7_RK3588
>   	bool "ArmSoM Sige7 RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  ArmSoM Sige7 is a Rockchip RK3588 based SBC (Single Board Computer)
>   	  by ArmSoM.
> @@ -329,14 +313,12 @@ config TARGET_SIGE7_RK3588
>   
>   config TARGET_QUARTZPRO64_RK3588
>   	bool "Pine64 QuartzPro64 RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Pine64 QuartzPro64 is a Rockchip RK3588 based SBC (Single Board
>   	  Computer) by Pine64.
>   
>   config TARGET_TIGER_RK3588
>   	bool "Theobroma Systems SOM-RK3588-Q7 (Tiger)"
> -	select BOARD_LATE_INIT
>   	help
>   	  The RK3588-Q7 SoM is a Qseven-compatible (70mm x 70mm, MXM-230
>   	  connector) system-on-module from Theobroma Systems, featuring the
> @@ -366,7 +348,6 @@ config TARGET_TIGER_RK3588
>   
>   config TARGET_TURINGRK1_RK3588
>   	bool "Turing Machines RK1 RK3588 board"
> -	select BOARD_LATE_INIT
>   	help
>   	  The Turing RK1 is a Rockchip RK3588 based SoM from Turing Machines.
>   
> @@ -389,7 +370,6 @@ config TARGET_TURINGRK1_RK3588
>   
>   config TARGET_TOYBRICK_RK3588
>   	bool "Toybrick TB-RK3588X board"
> -	select BOARD_LATE_INIT
>   	help
>   	  Rockchip Toybrick TB-RK3588X is a Rockchip RK3588 based development board.
>   	  TB-RK3588X adopts core board and mainboard design. The core board is connected

[PATCH 10/11] rockchip: Enable meminfo and rng commands for Generic RK3566/RK3568

[Jonas Karlman]

The meminfo and rng commands are helpful for testing, enable them.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 configs/generic-rk3568_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/generic-rk3568_defconfig b/configs/generic-rk3568_defconfig
index f79f0e84400b..76418ba7032c 100644
--- a/configs/generic-rk3568_defconfig
+++ b/configs/generic-rk3568_defconfig
@@ -28,6 +28,8 @@ CONFIG_SPL_PAD_TO=0x7f8000
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
 CONFIG_SPL_ATF=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMINFO_MAP=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MISC=y
@@ -35,6 +37,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_ROCKUSB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_RNG=y
 # CONFIG_SPL_DOS_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-- 
2.49.0

Re: [PATCH 10/11] rockchip: Enable meminfo and rng commands for Generic RK3566/RK3568

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> The meminfo and rng commands are helpful for testing, enable them.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   configs/generic-rk3568_defconfig | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/configs/generic-rk3568_defconfig b/configs/generic-rk3568_defconfig
> index f79f0e84400b..76418ba7032c 100644
> --- a/configs/generic-rk3568_defconfig
> +++ b/configs/generic-rk3568_defconfig
> @@ -28,6 +28,8 @@ CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_SPL_SPI_LOAD=y
>   CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
>   CONFIG_SPL_ATF=y
> +CONFIG_CMD_MEMINFO=y
> +CONFIG_CMD_MEMINFO_MAP=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_MISC=y
> @@ -35,6 +37,7 @@ CONFIG_CMD_MMC=y
>   CONFIG_CMD_ROCKUSB=y
>   CONFIG_CMD_USB_MASS_STORAGE=y
>   # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_RNG=y
>   # CONFIG_SPL_DOS_PARTITION is not set
>   CONFIG_SPL_OF_CONTROL=y
>   CONFIG_OF_LIVE=y

[PATCH 11/11] rockchip: Enable meminfo and rng commands for Generic RK3588

[Jonas Karlman]

The meminfo and rng commands are helpful for testing, enable them.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 configs/generic-rk3588_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
index 51e31dce3a96..2075584cf564 100644
--- a/configs/generic-rk3588_defconfig
+++ b/configs/generic-rk3588_defconfig
@@ -22,6 +22,8 @@ CONFIG_SPL_MAX_SIZE=0x40000
 CONFIG_SPL_PAD_TO=0x7f8000
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_ATF=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMINFO_MAP=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MISC=y
@@ -29,6 +31,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_ROCKUSB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_RNG=y
 # CONFIG_SPL_DOS_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-- 
2.49.0

Re: [PATCH 11/11] rockchip: Enable meminfo and rng commands for Generic RK3588

[Kever Yang]

On 2025/4/6 08:24, Jonas Karlman wrote:
> The meminfo and rng commands are helpful for testing, enable them.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   configs/generic-rk3588_defconfig | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
> index 51e31dce3a96..2075584cf564 100644
> --- a/configs/generic-rk3588_defconfig
> +++ b/configs/generic-rk3588_defconfig
> @@ -22,6 +22,8 @@ CONFIG_SPL_MAX_SIZE=0x40000
>   CONFIG_SPL_PAD_TO=0x7f8000
>   # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>   CONFIG_SPL_ATF=y
> +CONFIG_CMD_MEMINFO=y
> +CONFIG_CMD_MEMINFO_MAP=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_MISC=y
> @@ -29,6 +31,7 @@ CONFIG_CMD_MMC=y
>   CONFIG_CMD_ROCKUSB=y
>   CONFIG_CMD_USB_MASS_STORAGE=y
>   # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_RNG=y
>   # CONFIG_SPL_DOS_PARTITION is not set
>   CONFIG_SPL_OF_CONTROL=y
>   CONFIG_OF_LIVE=y