Revert "Kconfig: separate memory mapped boot device from SPI"
This reverts commit a83bbf5854
.
This was submitted out of order.
Change-Id: Ic5a28faf94c1f1901a72e46343722eb4224c5086
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16226
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
parent
edd79590b0
commit
c3b024e99b
|
@ -471,13 +471,6 @@ endmenu
|
|||
|
||||
source "src/acpi/Kconfig"
|
||||
|
||||
config BOOT_DEVICE_MEMORY_MAPPED
|
||||
bool
|
||||
default y if ARCH_X86 && BOOT_DEVICE_SPI_FLASH
|
||||
default n
|
||||
help
|
||||
Inform system if SPI is memory-mapped or not.
|
||||
|
||||
config RTC
|
||||
bool
|
||||
default n
|
||||
|
|
|
@ -586,8 +586,8 @@ static int elog_shrink(void)
|
|||
*/
|
||||
static inline u8 *elog_flash_offset_to_address(void)
|
||||
{
|
||||
/* Only support memory-mapped devices. */
|
||||
if (!IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED))
|
||||
/* Only support memory-mapped SPI devices. */
|
||||
if (!IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED))
|
||||
return NULL;
|
||||
|
||||
if (!elog_spi)
|
||||
|
|
|
@ -37,6 +37,13 @@ config SPI_ATOMIC_SEQUENCING
|
|||
in the SPI controller. Hardware manages the transaction instead of
|
||||
software. This is common on x86 platforms.
|
||||
|
||||
config SPI_FLASH_MEMORY_MAPPED
|
||||
bool
|
||||
default y if ARCH_X86
|
||||
default n if !ARCH_X86
|
||||
help
|
||||
Inform system if SPI is memory-mapped or not.
|
||||
|
||||
config SPI_FLASH_SMM
|
||||
bool "SPI flash driver support in SMM"
|
||||
default n
|
||||
|
|
|
@ -193,7 +193,7 @@ int cbfs_prog_stage_load(struct prog *pstage)
|
|||
/* Hacky way to not load programs over read only media. The stages
|
||||
* that would hit this path initialize themselves. */
|
||||
if (ENV_VERSTAGE && !IS_ENABLED(CONFIG_NO_XIP_EARLY_STAGES) &&
|
||||
IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)) {
|
||||
IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED)) {
|
||||
void *mapping = rdev_mmap(fh, foffset, fsize);
|
||||
rdev_munmap(fh, mapping);
|
||||
if (mapping == load)
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue