[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: Override default to_flash_offset implementation

[Andrey Petrov (andrey.petrov@intel.com)]

Andrey Petrov (andrey.petrov at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14248

-gerrit

commit 680565150c7cfd853fb83a4f56e29ffd5c05a7d4
Author: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
Date:   Thu Mar 3 13:16:36 2016 -0800

    soc/intel/apollolake: Override default to_flash_offset implementation
    
    The default nvm_mmio_to_flash_offset() implementation used by NVM code
    in intel/common does not work on apollolake. As a result, provide the
    correct override.
    
    Change-Id: I01a94f90dfdd33586a4aac5c05dd8c73e8804437
    Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/soc/intel/apollolake/mmap_boot.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/soc/intel/apollolake/mmap_boot.c b/src/soc/intel/apollolake/mmap_boot.c
index 3625924..a618d4a 100644
--- a/src/soc/intel/apollolake/mmap_boot.c
+++ b/src/soc/intel/apollolake/mmap_boot.c
@@ -16,6 +16,7 @@
 #include <commonlib/region.h>
 #include <console/console.h>
 #include <fmap.h>
+#include <soc/intel/common/nvm.h>
 
 /* The 128 KiB right below 4G are decoded by readonly SRAM, not boot media */
 #define IFD_BIOS_MAX_MAPPED	(CONFIG_IFD_BIOS_END - 128 * KiB)
@@ -72,3 +73,10 @@ const struct cbfs_locator cbfs_master_header_locator = {
 	.name = "IAFW Locator",
 	.locate = iafw_boot_region_properties,
 };
+
+uint32_t nvm_mmio_to_flash_offset(void *p)
+{
+	uintptr_t xlate_base;
+	xlate_base = VIRTUAL_ROM_BASE;
+	return (uintptr_t)p - xlate_base + CONFIG_IFD_BIOS_START;
+}