summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/intel/fsp1_1/Kconfig17
-rw-r--r--src/drivers/intel/fsp1_1/Makefile.inc10
-rw-r--r--src/soc/intel/braswell/Kconfig4
-rw-r--r--src/soc/intel/skylake/Kconfig4
4 files changed, 5 insertions, 30 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
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index e6f22755ad..11d946aa27 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -17,10 +17,6 @@ config CPU_SPECIFIC_OPTIONS
select COLLECT_TIMESTAMPS
select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
- select FSP_RAM_INIT
- select FSP_ROMSTAGE
- select FSP_STACK
- select FSP_STAGE_CACHE
select HAS_PRECBMEM_TIMESTAMP_REGION
select HAVE_MONOTONIC_TIMER
select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index d63fa70d9a..b67faab923 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -19,10 +19,6 @@ config CPU_SPECIFIC_OPTIONS
select COLLECT_TIMESTAMPS
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_MICROCODE_IN_CBFS
- select FSP_RAM_INIT
- select FSP_ROMSTAGE
- select FSP_STACK
- select FSP_STAGE_CACHE
select GENERIC_GPIO_LIB
select HAS_PRECBMEM_TIMESTAMP_REGION
select HAVE_HARD_RESET