From c3b024e99baf8d27ae1554b0dd0ef061f82b64ee Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 15 Aug 2016 14:13:05 -0500 Subject: Revert "Kconfig: separate memory mapped boot device from SPI" This reverts commit a83bbf58541cf41ea7a97dedbc8c02dffa59e86d. This was submitted out of order. Change-Id: Ic5a28faf94c1f1901a72e46343722eb4224c5086 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/16226 Reviewed-by: Paul Menzel Reviewed-by: Nico Huber --- src/soc/intel/apollolake/romstage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/soc/intel/apollolake/romstage.c') diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 067d654b25..8f17fddd69 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -160,8 +160,7 @@ void platform_fsp_memory_init_params_cb(struct FSPM_UPD *mupd) * state machine transition to next boot state, so that it can function * as designed. */ - mupd->FspmConfig.SkipCseRbp = - IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED); + mupd->FspmConfig.SkipCseRbp = IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED); } __attribute__ ((weak)) -- cgit v1.2.3