[PATCH v2 11/12] rockchip: board: qnap-ts433: Rename the board code to not be TS433 specific

[Quentin Schulz]

Hi Heiko,

On 1/14/26 9:28 AM, Heiko Stuebner wrote:
> We can do support at least 2 devices now, so rename the code-side to a
> TSx33 form to not read as specific to the TS433 anymore.
> 
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
> ---
>   arch/arm/mach-rockchip/rk3568/Kconfig           | 17 +++++++++--------
>   .../qnap/{ts433_rk3568 => tsx33_rk356x}/Kconfig |  6 +++---
>   .../{ts433_rk3568 => tsx33_rk356x}/MAINTAINERS  |  6 +++---
>   .../{ts433_rk3568 => tsx33_rk356x}/Makefile     |  0
>   .../qnap/{ts433_rk3568 => tsx33_rk356x}/board.c |  0
>   configs/qnap-ts433-rk3568_defconfig             |  2 +-
>   .../configs/{ts433_rk3568.h => tsx33_rk356x.h}  |  0
>   7 files changed, 16 insertions(+), 15 deletions(-)
>   rename board/qnap/{ts433_rk3568 => tsx33_rk356x}/Kconfig (52%)
>   rename board/qnap/{ts433_rk3568 => tsx33_rk356x}/MAINTAINERS (68%)
>   rename board/qnap/{ts433_rk3568 => tsx33_rk356x}/Makefile (100%)
>   rename board/qnap/{ts433_rk3568 => tsx33_rk356x}/board.c (100%)
>   rename include/configs/{ts433_rk3568.h => tsx33_rk356x.h} (100%)
> 
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index 16e14ee4fa7..725c008795d 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -31,18 +31,19 @@ config TARGET_POWKIDDY_X55_RK3566
>   	help
>   	  Powkiddy X55 handheld gaming console with an RK3566 SoC.
>   
> -config TARGET_QNAP_TS433_RK3568
> -	bool "QNAP-TS433"
> +config TARGET_QNAP_TSX33_RK356X
> +	bool "QNAP-TSx33"
>   	help
> -	  Qnap TS433 4-bay NAS with a RK3568 SoC.
> +	  Qnap TSx33 1-to-4-bay NAS with a RK3566/RK3568 SoC.
>   

But TS233 is 2-bay?

Maybe do something like

Qnap TS233/TS433 2/4-bay NAS with a RK3566/RK3568.

Such that we know the former is for TS233 and the latter for TS433 when 
reading below as well?

>   	  It provides the following featureset:
> -	   * 4GB LPDDR4
> +	   * 2-4GB LPDDR4
>   	   * 4GB eMMC
> -	   * 2 SATA ports connected to two RK3568's SATA controllers
> -	   * 2 SATA ports connected to a JMicron JMB58x AHCI SATA controller
> +	   * 1-2 SATA ports connected to two RK3568's SATA controllers
> +	   * On TS433 2 SATA ports connected to a JMicron JMB58x AHCI SATA
> +	     controller
>   	   * 1 1G network controller
> -	   * 1 2.5G Realtek RTL8125 network controller
> +	   * On TS433 1 2.5G Realtek RTL8125 network controller

e.g.
0/1 2.5G Realtek...

I also see QNAP has a TS-216G, so even this TSX33 won't match (if we can 
support it with the same code).

I see the TS233 is still an RK3568 (according to the device tree). I 
also know that the RK3566 and RK3568 have a different DRAM init blob... 
So can we reuse the RK3568 DRAM init blob with RK3566 and it'll work? 
Otherwise, how do you plan on supporting multiple SoC variants? I think 
it'd be quite confusing to have everything the same except the DRAM init 
blob for devices that don't seem to be binary compatible (from the DRAM 
PoV at the very least).


>   
>   config TARGET_QUARTZ64_RK3566
>   	bool "Pine64 Quartz64"
> @@ -76,7 +77,7 @@ source "board/hardkernel/odroid_m1/Kconfig"
>   source "board/hardkernel/odroid_m1s/Kconfig"
>   source "board/pine64/quartz64_rk3566/Kconfig"
>   source "board/powkiddy/x55/Kconfig"
> -source "board/qnap/ts433_rk3568/Kconfig"
> +source "board/qnap/tsx33_rk356x/Kconfig"
>   source "board/radxa/zero3-rk3566/Kconfig"
>   source "board/xunlong/orangepi-3b-rk3566/Kconfig"
>   
> diff --git a/board/qnap/ts433_rk3568/Kconfig b/board/qnap/tsx33_rk356x/Kconfig
> similarity index 52%
> rename from board/qnap/ts433_rk3568/Kconfig
> rename to board/qnap/tsx33_rk356x/Kconfig
> index c5f9db849f2..2f64b9be062 100644
> --- a/board/qnap/ts433_rk3568/Kconfig
> +++ b/board/qnap/tsx33_rk356x/Kconfig
> @@ -1,12 +1,12 @@
> -if TARGET_QNAP_TS433_RK3568
> +if TARGET_QNAP_TSX33_RK356X
>   
>   config SYS_BOARD
> -	default "ts433_rk3568"
> +	default "tsx33_rk356x"
>   
>   config SYS_VENDOR
>   	default "qnap"
>   
>   config SYS_CONFIG_NAME
> -	default "ts433_rk3568"
> +	default "tsx33_rk356x"
>   
>   endif
> diff --git a/board/qnap/ts433_rk3568/MAINTAINERS b/board/qnap/tsx33_rk356x/MAINTAINERS
> similarity index 68%
> rename from board/qnap/ts433_rk3568/MAINTAINERS
> rename to board/qnap/tsx33_rk356x/MAINTAINERS
> index 02ce7ff383c..b91274c7b43 100644
> --- a/board/qnap/ts433_rk3568/MAINTAINERS
> +++ b/board/qnap/tsx33_rk356x/MAINTAINERS
> @@ -1,8 +1,8 @@
> -QNAP-TS433
> +QNAP-TSX33
>   M:	Heiko Stuebner <heiko at sntech.de>
>   S:	Maintained
> -F:	board/qnap/ts433_rk3568/
> +F:	board/qnap/tsx33_rk356x/
>   F:	doc/board/qnap/
> -F:	include/configs/qnap_ts433.h
> +F:	include/configs/qnap_tsx33.h

Doesn't match SYS_CONFIG_NAME.

>   F:	configs/qnap-ts433-rk3568_defconfig

And you don't rename the defconfig? Odd choice :)

Cheers,
Quentin