diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index dcb1f4e721..5a5bce2a64 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -157,6 +157,14 @@ config BASE_ADDRESS
 
 endmenu
 
+config USE_MARCH_586
+	bool "Use march=586 qualifier to build"
+	default n
+	depends on ARCH_X86
+	help
+	  Allow a platform or processor to select to be compiled using
+	  the '-march=i586' option instead of the typical '-march=i686'
+
 menu "Standard Libraries"
 
 config LIBC
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 63f1ca9cf5..7e2d6b3480 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -239,7 +239,7 @@ EOF
 if [ "${TARCH}" = "x86_64" ] || [ "${TARCH}" = "x86_32" ]; then
 cat <<EOF
 
-ifeq (\$(CONFIG_USE_MARCH_586),y)
+ifneq (\$(CONFIG_USE_MARCH_586)\$(CONFIG_LP_USE_MARCH_586),)
 	GCC_CFLAGS_${TARCH} += -march=i586
 else
 	GCC_CFLAGS_${TARCH} += -march=i686