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 <[email protected]> --- 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. 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 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 <[email protected]> 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 F: configs/qnap-ts433-rk3568_defconfig F: arch/arm/dts/rk3568-qnap-ts433-u-boot.dtsi diff --git a/board/qnap/ts433_rk3568/Makefile b/board/qnap/tsx33_rk356x/Makefile similarity index 100% rename from board/qnap/ts433_rk3568/Makefile rename to board/qnap/tsx33_rk356x/Makefile diff --git a/board/qnap/ts433_rk3568/board.c b/board/qnap/tsx33_rk356x/board.c similarity index 100% rename from board/qnap/ts433_rk3568/board.c rename to board/qnap/tsx33_rk356x/board.c diff --git a/configs/qnap-ts433-rk3568_defconfig b/configs/qnap-ts433-rk3568_defconfig index dfb240ed70f..475488534cd 100644 --- a/configs/qnap-ts433-rk3568_defconfig +++ b/configs/qnap-ts433-rk3568_defconfig @@ -6,7 +6,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3568-qnap-ts433" CONFIG_ROCKCHIP_RK3568=y CONFIG_SPL_SERIAL=y -CONFIG_TARGET_QNAP_TS433_RK3568=y +CONFIG_TARGET_QNAP_TSX33_RK356X=y CONFIG_SYS_LOAD_ADDR=0xc00800 CONFIG_DEBUG_UART_BASE=0xFE660000 CONFIG_DEBUG_UART_CLOCK=24000000 diff --git a/include/configs/ts433_rk3568.h b/include/configs/tsx33_rk356x.h similarity index 100% rename from include/configs/ts433_rk3568.h rename to include/configs/tsx33_rk356x.h -- 2.47.2
