From 8d4d61be7d722a8748e66f800535cf23681f9019 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Fri, 1 Nov 2013 15:44:50 -0700 Subject: [PATCH] Fix the reg_script stuff to not be used in ARM builds and not break them. The reg_script stuff only makes sense for those platforms that need it: ARM V8 and all x86. Have its usage controlled by a config variable. BUG=None TEST=the broken nyan build is fixed. BRANCH=None Change-Id: Iad54773f412e2d829e68b98fd845cd72ae408ee1 Signed-off-by: Ronald G. Minnich Reviewed-on: https://chromium-review.googlesource.com/175530 Reviewed-by: Gabe Black Commit-Queue: Gabe Black Tested-by: Gabe Black --- src/Kconfig | 7 +++++++ src/lib/Makefile.inc | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index bde71a3341..05ac44c642 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1059,4 +1059,11 @@ config POWER_BUTTON_IS_OPTIONAL help Internal option that controls ENABLE_POWER_BUTTON visibility. +config REG_SCRIPT + bool + default y if ARCH_X86 + default n + help + Internal option that controls whether we compile in register scripts. + source src/vendorcode/Kconfig diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 3166334641..fa00ba9c18 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -111,8 +111,8 @@ ramstage-y += cbmem_info.c ramstage-y += hexdump.c romstage-y += hexdump.c -ramstage-y += reg_script.c -romstage-y += reg_script.c +ramstage-$(CONFIG_REG_SCRIPT) += reg_script.c +romstage-$(CONFIG_REG_SCRIPT) += reg_script.c ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c