diff --git a/arch/arm64/configs/odroidc4_android_defconfig b/arch/arm64/configs/odroidc4_android_defconfig
index d3e842553779..f6d604bc3a23 100644
--- a/arch/arm64/configs/odroidc4_android_defconfig
+++ b/arch/arm64/configs/odroidc4_android_defconfig
@@ -43,7 +43,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 # General setup
 #
-CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_INIT_ENV_ARG_LIMIT=64
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
diff --git a/arch/arm64/configs/odroidn2_android_defconfig b/arch/arm64/configs/odroidn2_android_defconfig
index 33270d1d5d79..fc27f8ee0677 100644
--- a/arch/arm64/configs/odroidn2_android_defconfig
+++ b/arch/arm64/configs/odroidn2_android_defconfig
@@ -43,7 +43,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 # General setup
 #
-CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_INIT_ENV_ARG_LIMIT=64
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
diff --git a/init/Kconfig b/init/Kconfig
index b3cac77ec17a..81a66306dbc4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -48,7 +48,7 @@ config BROKEN_ON_SMP
 
 config INIT_ENV_ARG_LIMIT
 	int
-	default 32 if !UML
+	default 64 if !UML
 	default 128 if UML
 	help
 	  Maximum of each of the number of arguments and environment