diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 033b7a6935..60b29113fe 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -422,12 +422,12 @@ config TPL_STACK endif -config ROCKCHIP_RV1109 - bool "Support Rockchip RV1109" +config ROCKCHIP_RV1126 + bool "Support Rockchip RV1126" select CPU_V7 select BOARD_LATE_INIT help - The Rockchip RV1109 is a ARM-based SoC with a dual-core Cortex-A7 + The Rockchip RV1126 is a ARM-based SoC with a quad-core Cortex-A7 and a risc-v core. config SPL_ROCKCHIP_BACK_TO_BROM @@ -471,7 +471,7 @@ config ROCKCHIP_BOOT_MODE_REG default 0xff320300 if ROCKCHIP_RK3399 default 0xfe020200 if ROCKCHIP_RK1808 default 0x10300580 if ROCKCHIP_RV1108 - default 0xfe020200 if ROCKCHIP_RV1109 + default 0xfe020200 if ROCKCHIP_RV1126 default 0 help The Soc will enter to different boot mode(defined in asm/arch/boot_mode.h) @@ -491,7 +491,7 @@ config ROCKCHIP_STIMER_BASE default 0xff830020 if ROCKCHIP_RK3368 default 0xff8680a0 if ROCKCHIP_RK3399 default 0x10350020 if ROCKCHIP_RV1108 - default 0xff670020 if ROCKCHIP_RV1109 + default 0xff670020 if ROCKCHIP_RV1126 default 0 help The secure timer inited in SPL/TPL in secure word, ARM generic timer @@ -510,7 +510,7 @@ config ROCKCHIP_IRAM_START_ADDR default 0xff8c0000 if ROCKCHIP_RK3368 default 0xff8c0000 if ROCKCHIP_RK3399 default 0x10080000 if ROCKCHIP_RV1108 - default 0xff700000 if ROCKCHIP_RV1109 + default 0xff700000 if ROCKCHIP_RV1126 default 0 help The IRAM start addr is to locate variant of the boot device from @@ -701,6 +701,6 @@ source "arch/arm/mach-rockchip/rk3368/Kconfig" source "arch/arm/mach-rockchip/rk3399/Kconfig" source "arch/arm/mach-rockchip/rk1808/Kconfig" source "arch/arm/mach-rockchip/rv1108/Kconfig" -source "arch/arm/mach-rockchip/rv1109/Kconfig" +source "arch/arm/mach-rockchip/rv1126/Kconfig" endif diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index ce493d6f06..a729e83d62 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -52,7 +52,7 @@ obj-$(CONFIG_ROCKCHIP_RK3368) += rk3368/ obj-$(CONFIG_ROCKCHIP_RK3399) += rk3399/ obj-$(CONFIG_ROCKCHIP_RK1808) += rk1808/ obj-$(CONFIG_ROCKCHIP_RV1108) += rv1108/ -obj-$(CONFIG_ROCKCHIP_RV1109) += rv1109/ +obj-$(CONFIG_ROCKCHIP_RV1126) += rv1126/ # Clear out SPL objects, in case this is a TPL build obj-spl-$(CONFIG_TPL_BUILD) = diff --git a/arch/arm/mach-rockchip/rv1109/Kconfig b/arch/arm/mach-rockchip/rv1109/Kconfig deleted file mode 100644 index 71042c5c1e..0000000000 --- a/arch/arm/mach-rockchip/rv1109/Kconfig +++ /dev/null @@ -1,16 +0,0 @@ -if ROCKCHIP_RV1109 - -config TARGET_EVB_RV1109 - bool "EVB_RV1109" - help - RV1109 EVB is a evaluation board for Rockchp RV1109. - -config SYS_SOC - default "rockchip" - -config SYS_MALLOC_F_LEN - default 0x400 - -source board/rockchip/evb_rv1109/Kconfig - -endif diff --git a/arch/arm/mach-rockchip/rv1126/Kconfig b/arch/arm/mach-rockchip/rv1126/Kconfig new file mode 100644 index 0000000000..067e23ff12 --- /dev/null +++ b/arch/arm/mach-rockchip/rv1126/Kconfig @@ -0,0 +1,16 @@ +if ROCKCHIP_RV1126 + +config TARGET_EVB_RV1126 + bool "EVB_RV1126" + help + RV1126 EVB is a evaluation board for Rockchp RV1126. + +config SYS_SOC + default "rockchip" + +config SYS_MALLOC_F_LEN + default 0x400 + +source board/rockchip/evb_rv1126/Kconfig + +endif diff --git a/arch/arm/mach-rockchip/rv1109/Makefile b/arch/arm/mach-rockchip/rv1126/Makefile similarity index 69% rename from arch/arm/mach-rockchip/rv1109/Makefile rename to arch/arm/mach-rockchip/rv1126/Makefile index 0189801109..41cacf1c24 100644 --- a/arch/arm/mach-rockchip/rv1109/Makefile +++ b/arch/arm/mach-rockchip/rv1126/Makefile @@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += syscon_rv1109.o -obj-y += rv1109.o +obj-y += syscon_rv1126.o +obj-y += rv1126.o diff --git a/arch/arm/mach-rockchip/rv1109/rv1109.c b/arch/arm/mach-rockchip/rv1126/rv1126.c similarity index 100% rename from arch/arm/mach-rockchip/rv1109/rv1109.c rename to arch/arm/mach-rockchip/rv1126/rv1126.c diff --git a/arch/arm/mach-rockchip/rv1109/syscon_rv1109.c b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c similarity index 52% rename from arch/arm/mach-rockchip/rv1109/syscon_rv1109.c rename to arch/arm/mach-rockchip/rv1126/syscon_rv1126.c index 0b0e663565..964d6d43c4 100644 --- a/arch/arm/mach-rockchip/rv1109/syscon_rv1109.c +++ b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c @@ -9,14 +9,14 @@ #include #include -static const struct udevice_id rv1109_syscon_ids[] = { - { .compatible = "rockchip,rv1109-grf", .data = ROCKCHIP_SYSCON_GRF }, +static const struct udevice_id rv1126_syscon_ids[] = { + { .compatible = "rockchip,rv1126-grf", .data = ROCKCHIP_SYSCON_GRF }, { } }; -U_BOOT_DRIVER(syscon_rv1109) = { - .name = "rv1109_syscon", +U_BOOT_DRIVER(syscon_rv1126) = { + .name = "rv1126_syscon", .id = UCLASS_SYSCON, - .of_match = rv1109_syscon_ids, + .of_match = rv1126_syscon_ids, }; diff --git a/include/configs/evb_rv1109.h b/include/configs/evb_rv1126.h similarity index 85% rename from include/configs/evb_rv1109.h rename to include/configs/evb_rv1126.h index 43129fd170..b29d8dc8a6 100644 --- a/include/configs/evb_rv1109.h +++ b/include/configs/evb_rv1126.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __EVB_RV1109_H -#define __EVB_RV1109_H +#ifndef __EVB_RV1126_H +#define __EVB_RV1126_H -#include +#include #define CONFIG_SUPPORT_EMMC_RPMB #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/rv1109_common.h b/include/configs/rv1126_common.h similarity index 94% rename from include/configs/rv1109_common.h rename to include/configs/rv1126_common.h index 31eb414445..3c2d9b4c5d 100644 --- a/include/configs/rv1109_common.h +++ b/include/configs/rv1126_common.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_RV1109_COMMON_H -#define __CONFIG_RV1109_COMMON_H +#ifndef __CONFIG_RV1126_COMMON_H +#define __CONFIG_RV1126_COMMON_H #include "rockchip-common.h"