diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 2208ef17b5e9..1b201c2506bb 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -653,6 +653,9 @@ CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
 CONFIG_RK_CONSOLE_THREAD=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_CPU_RK312X=y
+CONFIG_CPU_RK3288=y
+CONFIG_CPU_RK322X=y
 CONFIG_ANDROID_VERSION=0x08000000
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_PVTM=y
diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 281e38d831e0..a67ec6843f6c 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -748,6 +748,10 @@ CONFIG_RK3368_SCPI_PROTOCOL=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_RK_IOMMU=y
 CONFIG_RK_IOVMM=y
+CONFIG_CPU_PX30=y
+CONFIG_CPU_RK3328=y
+CONFIG_CPU_RK3368=y
+CONFIG_CPU_RK3399=y
 CONFIG_ANDROID_VERSION=0x08000000
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_PVTM=y
diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu
index ca06dbc866cb..035c354037f2 100644
--- a/drivers/soc/rockchip/Kconfig.cpu
+++ b/drivers/soc/rockchip/Kconfig.cpu
@@ -6,32 +6,26 @@ menu "Rockchip CPU selection"
 config CPU_RK312X
 	bool "RK3126/8"
 	depends on ARM
-	default y
 
 config CPU_RK3036
 	bool "RK3036"
 	depends on ARM
-	default y
 
 config CPU_RK30XX
 	bool "RK3066/8"
 	depends on ARM
-	default y
 
 config CPU_RK3188
 	bool "RK3188"
 	depends on ARM
-	default y
 
 config CPU_RK3288
 	bool "RK3288"
 	depends on ARM
-	default y
 
 config CPU_RK322X
 	bool "RK3228/9"
 	depends on ARM
-	default y
 
 config CPU_RV110X
 	bool "RV1107/8"
@@ -39,7 +33,6 @@ config CPU_RV110X
 
 config CPU_PX30
 	bool "PX30"
-	default y if ARM64
 
 config CPU_RK1808
 	bool "RK1808"
@@ -49,17 +42,14 @@ config CPU_RK3308
 
 config CPU_RK3328
 	bool "RK3328"
-	default y if ARM64
 
 config CPU_RK3366
 	bool "RK3366"
 
 config CPU_RK3368
 	bool "RK3368"
-	default y if ARM64
 
 config CPU_RK3399
 	bool "RK3399"
-	default y if ARM64
 
 endmenu