summaryrefslogtreecommitdiff
path: root/src/drivers/intel
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2015-10-15 17:17:09 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-10-27 15:19:23 +0100
commitd5855ec5326f7696a22e0da776a63cc350c2dd16 (patch)
tree626297818fb081a4024ad1c74830710b5b4bbf0f /src/drivers/intel
parent66208bd3d5203ccaf052c3e3663df702d367e4a7 (diff)
downloadcoreboot-d5855ec5326f7696a22e0da776a63cc350c2dd16.tar.xz
FSP1_1: Always use common code
Always use the common FSP code. Remove the FSP_RAM_INIT, FSP_ROMSTAGE, FSP_STACK and FSP_STAGE_CACHE Kconfig values. BRANCH=none BUG=None TEST=Build and run on Kunimitsu Change-Id: Ib3d015cb2dc257e46c2340cc7bc09cf0ffb0492c Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 5197b1354d138759dfaa428c665de6cbfb8e8911 Original-Change-Id: I3e3c1c9e6f73009a099c1ec3688dbd8c326fc766 Original-Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com> Original-Reviewed-on: https://chromium-review.googlesource.com/306142 Original-Commit-Ready: Leroy P Leahy <leroy.p.leahy@intel.com> Original-Tested-by: Leroy P Leahy <leroy.p.leahy@intel.com> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/12158 Tested-by: build bot (Jenkins) Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com>
Diffstat (limited to 'src/drivers/intel')
-rw-r--r--src/drivers/intel/fsp1_1/Kconfig17
-rw-r--r--src/drivers/intel/fsp1_1/Makefile.inc10
2 files changed, 5 insertions, 22 deletions
diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig
index d0683370e8..1e1ef18beb 100644
--- a/src/drivers/intel/fsp1_1/Kconfig
+++ b/src/drivers/intel/fsp1_1/Kconfig
@@ -116,22 +116,6 @@ config DISPLAY_UPD_DATA
Display the user specified product data prior to memory
initialization.
-config FSP_RAM_INIT
- bool
- default n
-
-config FSP_ROMSTAGE
- bool
- default n
-
-config FSP_STACK
- bool
- default n
-
-config FSP_STAGE_CACHE
- bool
- default n
-
config FSP_USES_UPD
bool
default n
@@ -146,7 +130,6 @@ config GOP_SUPPORT
config ROMSTAGE_RAM_STACK_SIZE
hex "Size of the romstage RAM stack in bytes"
default 0x5000
- depends on FSP_STACK
config USE_GENERIC_FSP_CAR_INC
bool
diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index 19bee827e5..bf8f6a9f96 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -25,18 +25,18 @@ verstage-y += verstage.c
romstage-y += car.c
romstage-y += fsp_util.c
romstage-y += hob.c
-romstage-$(CONFIG_FSP_RAM_INIT) += raminit.c
-romstage-$(CONFIG_FSP_ROMSTAGE) += romstage.c
+romstage-y += raminit.c
+romstage-y += romstage.c
romstage-$(CONFIG_SEPARATE_VERSTAGE) += romstage_after_verstage.S
-romstage-$(CONFIG_FSP_STACK) += stack.c
-romstage-$(CONFIG_FSP_STAGE_CACHE) += stage_cache.c
+romstage-y += stack.c
+romstage-y += stage_cache.c
ramstage-$(CONFIG_GOP_SUPPORT) += fsp_gop.c
ramstage-y += fsp_relocate.c
ramstage-y += fsp_util.c
ramstage-y += hob.c
ramstage-y += ramstage.c
-ramstage-$(CONFIG_FSP_STAGE_CACHE) += stage_cache.c
+ramstage-y += stage_cache.c
ramstage-$(CONFIG_GOP_SUPPORT) += vbt.c
CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include