diff --git a/Makefile b/Makefile
index 2858e74ed9fd..cdea6ae34110 100644
--- a/Makefile
+++ b/Makefile
@@ -756,7 +756,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
   stackp-flag := -fstack-protector
   stackp-name := REGULAR
 else
-ifdef CONFIG_CC_STACKPROTECTOR_STRONG
+ifdef CONFIG_CC_STACKPROTECTOR_STRONG_AMLOGIC
   stackp-flag := -fstack-protector-strong
   stackp-name := STRONG
 else
diff --git a/arch/Kconfig b/arch/Kconfig
index 0847b5d47da7..c73487497980 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -447,6 +447,11 @@ config CC_STACKPROTECTOR_REGULAR
 	  by about 0.3%.
 
 config CC_STACKPROTECTOR_STRONG
+	bool "Strong"
+	help
+	  Since this config will increase stack size. We repleace it
+
+config CC_STACKPROTECTOR_STRONG_AMLOGIC
 	bool "Strong"
 	select CC_STACKPROTECTOR
 	help
diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 54b86a88b2fd..f5191cbad37e 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -30,6 +30,7 @@ CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_JUMP_LABEL=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y