[PATCH v2 03/12] rockchip: board: qnap-ts433: Fix dir naming to allow build-system to find it

[Quentin Schulz]

Hi Heiko,

On 1/14/26 9:28 AM, Heiko Stuebner wrote:
> Right now the board directory for the TS433 only contains its Kconfig
> which is linked to directly from the main RK3568 Kconfig.
> 
> But as the namings are currently set, the build system will never find
> the board directory to check if it contains something to build.
> 
> So adapt the board naming to a pattern similar to all the other boards
> (boardname_rkSoC).
> 
> Fixes: d3cacb79e706 ("board: rockchip: add support for Qnap TS433 devices")
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
> ---
>   arch/arm/mach-rockchip/rk3568/Kconfig            | 2 +-
>   board/qnap/{ts433 => ts433_rk3568}/Kconfig       | 4 ++--
>   board/qnap/{ts433 => ts433_rk3568}/MAINTAINERS   | 2 +-
>   include/configs/{qnap_ts433.h => ts433_rk3568.h} | 0
>   4 files changed, 4 insertions(+), 4 deletions(-)
>   rename board/qnap/{ts433 => ts433_rk3568}/Kconfig (70%)
>   rename board/qnap/{ts433 => ts433_rk3568}/MAINTAINERS (87%)
>   rename include/configs/{qnap_ts433.h => ts433_rk3568.h} (100%)
> 
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index 2730220a18e..16e14ee4fa7 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -76,7 +76,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/Kconfig"
> +source "board/qnap/ts433_rk3568/Kconfig"
>   source "board/radxa/zero3-rk3566/Kconfig"
>   source "board/xunlong/orangepi-3b-rk3566/Kconfig"
>   
> diff --git a/board/qnap/ts433/Kconfig b/board/qnap/ts433_rk3568/Kconfig
> similarity index 70%
> rename from board/qnap/ts433/Kconfig
> rename to board/qnap/ts433_rk3568/Kconfig
> index b00e1f9f2ef..c5f9db849f2 100644
> --- a/board/qnap/ts433/Kconfig
> +++ b/board/qnap/ts433_rk3568/Kconfig
> @@ -1,12 +1,12 @@
>   if TARGET_QNAP_TS433_RK3568
>   
>   config SYS_BOARD
> -	default "qnap_ts433"
> +	default "ts433_rk3568"

SYS_BOARD is used in the default environment so this would change it and 
not be backward compatible... Is this something we're ok with? I'm not 
sure it is worth it?

I also see you're modifying it again in a later patch in this series.

Another option is to make use of HAVE_VENDOR_COMMON_LIB mechanism such 
that you have board/qnap/common/ where you can put files in common 
without having to modify the existing layout?

You can also have a symlink if you reaaaally want board/qnap/qnap_ts433 
to be board/qnap/ts433_rk3568? Hopefully that works.

In essence, I'm conflicted about this change but hopefully nobody 
actually uses the "board" environment variable?

>   
>   config SYS_VENDOR
>   	default "qnap"
>   
>   config SYS_CONFIG_NAME
> -	default "qnap_ts433"
> +	default "ts433_rk3568"
>   
>   endif
> diff --git a/board/qnap/ts433/MAINTAINERS b/board/qnap/ts433_rk3568/MAINTAINERS
> similarity index 87%
> rename from board/qnap/ts433/MAINTAINERS
> rename to board/qnap/ts433_rk3568/MAINTAINERS
> index c2b31ad9794..02ce7ff383c 100644
> --- a/board/qnap/ts433/MAINTAINERS
> +++ b/board/qnap/ts433_rk3568/MAINTAINERS
> @@ -1,7 +1,7 @@
>   QNAP-TS433
>   M:	Heiko Stuebner <heiko at sntech.de>
>   S:	Maintained
> -F:	board/qnap/ts433/
> +F:	board/qnap/ts433_rk3568/
>   F:	doc/board/qnap/
>   F:	include/configs/qnap_ts433.h

Missing rename here...

>   F:	configs/qnap-ts433-rk3568_defconfig
> diff --git a/include/configs/qnap_ts433.h b/include/configs/ts433_rk3568.h
> similarity index 100%
> rename from include/configs/qnap_ts433.h
> rename to include/configs/ts433_rk3568.h

... since you rename it here.

Cheers,
Quentin