Revert "Re-factor 'to_flash_offset()' into 'spi_flash.h'"
This reverts commit 9270553fff
.
Change-Id: I195f721ce7a18aac6c1aa6f4e0f9284455d531b0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8138
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
committed by
Edward O'Callaghan
parent
6355cbff51
commit
9b29aad526
@@ -31,6 +31,15 @@
|
||||
#include <lib.h> // hexdump
|
||||
#include "fsp_util.h"
|
||||
|
||||
#ifndef CONFIG_VIRTUAL_ROM_SIZE
|
||||
#error "CONFIG_VIRTUAL_ROM_SIZE must be set."
|
||||
#endif
|
||||
|
||||
/* convert a pointer to flash area into the offset inside the flash */
|
||||
static inline u32 to_flash_offset(void *p) {
|
||||
return ((u32)p + CONFIG_VIRTUAL_ROM_SIZE);
|
||||
}
|
||||
|
||||
static struct mrc_data_container *next_mrc_block(
|
||||
struct mrc_data_container *mrc_cache)
|
||||
{
|
||||
@@ -196,7 +205,7 @@ void update_mrc_cache(void *unused)
|
||||
"Need to erase the MRC cache region of %d bytes at %p\n",
|
||||
cache_size, cache_base);
|
||||
|
||||
flash->erase(flash, to_flash_offset(flash, cache_base), cache_size);
|
||||
flash->erase(flash, to_flash_offset(cache_base), cache_size);
|
||||
|
||||
/* we will start at the beginning again */
|
||||
cache = cache_base;
|
||||
@@ -204,7 +213,7 @@ void update_mrc_cache(void *unused)
|
||||
/* 4. write mrc data with flash->write() */
|
||||
printk(BIOS_DEBUG, "Write MRC cache update to flash at %p\n",
|
||||
cache);
|
||||
flash->write(flash, to_flash_offset(flash, cache),
|
||||
flash->write(flash, to_flash_offset(cache),
|
||||
current->mrc_data_size + sizeof(*current), current);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user