diff --git a/payloads/libpayload/arch/arm/Kconfig b/payloads/libpayload/arch/arm/Kconfig
index acaf167d5d..8e2f41ade3 100644
--- a/payloads/libpayload/arch/arm/Kconfig
+++ b/payloads/libpayload/arch/arm/Kconfig
@@ -26,10 +26,5 @@
 ## SUCH DAMAGE.
 ##
 
-if ARCH_ARM
-
-config ARCH_SPECIFIC_OPTIONS
-	def_bool y
+config ARCH_ARM
 	select LITTLE_ENDIAN
-
-endif
diff --git a/payloads/libpayload/arch/arm64/Kconfig b/payloads/libpayload/arch/arm64/Kconfig
index 18f37706fe..e354d884ea 100644
--- a/payloads/libpayload/arch/arm64/Kconfig
+++ b/payloads/libpayload/arch/arm64/Kconfig
@@ -26,12 +26,11 @@
 ## SUCH DAMAGE.
 ##
 
-if ARCH_ARM64
-
-config ARCH_SPECIFIC_OPTIONS
-	def_bool y
+config ARCH_ARM64
 	select LITTLE_ENDIAN
 
+if ARCH_ARM64
+
 config ARM64_A53_ERRATUM_843419
 	bool "Enable Cortex-A53 erratum 843419 linker workaround"
 	default n
diff --git a/payloads/libpayload/arch/mock/Kconfig b/payloads/libpayload/arch/mock/Kconfig
index 3903a76005..030f310337 100644
--- a/payloads/libpayload/arch/mock/Kconfig
+++ b/payloads/libpayload/arch/mock/Kconfig
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config ARCH_MOCK
+	select LITTLE_ENDIAN if !ARCH_MOCK_BIG_ENDIAN
+	select BIG_ENDIAN if ARCH_MOCK_BIG_ENDIAN
+
 if ARCH_MOCK
 
 config ARCH_MOCK_BIG_ENDIAN
@@ -8,9 +12,4 @@ config ARCH_MOCK_BIG_ENDIAN
 	help
 	  This option enables big-endinan support in the code.
 
-config ARCH_SPECIFIC_OPTIONS
-	def_bool y
-	select LITTLE_ENDIAN if !ARCH_MOCK_BIG_ENDIAN
-	select BIG_ENDIAN if ARCH_MOCK_BIG_ENDIAN
-
 endif
diff --git a/payloads/libpayload/arch/x86/Kconfig b/payloads/libpayload/arch/x86/Kconfig
index f590d58326..37a5a696c0 100644
--- a/payloads/libpayload/arch/x86/Kconfig
+++ b/payloads/libpayload/arch/x86/Kconfig
@@ -26,13 +26,12 @@
 ## SUCH DAMAGE.
 ##
 
-if ARCH_X86
-
-config ARCH_SPECIFIC_OPTIONS
-	def_bool y
+config ARCH_X86
 	select LITTLE_ENDIAN
 	select IO_ADDRESS_SPACE
 
+if ARCH_X86
+
 config ENABLE_APIC
 	bool "Enables the Local APIC"