[coreboot-gerrit] New patch to review for coreboot: soc/apollolake: Override default mmap_boot.c for all stages

[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/13320

-gerrit

commit b8bcda5c8133333bc1598d85d278eb972ce5a7e2
Author: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
Date:   Tue Oct 27 10:31:26 2015 -0700

    soc/apollolake: Override default mmap_boot.c for all stages
    
    The Apollolake-specific mmap_boot.c implementation was only compiled
    for the bootblock. This worked because the generic one was never
    included in the bootblock, so we didn't get duplicate symbol.
    
    However, the default mmap_boot won't work on this SOC, so we need to
    override it for all stages where it is used.
    
    Change-Id: If633349e0700437d8adfe6af9da045e80c9f02c5
    Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
---
 src/soc/intel/apollolake/Kconfig      | 4 ++++
 src/soc/intel/apollolake/Makefile.inc | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 89d01e5..7851463 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -34,6 +34,10 @@ config CPU_SPECIFIC_OPTIONS
 	select UDELAY_TSC
 	select TSC_CONSTANT_RATE
 
+config X86_TOP4G_BOOTMEDIA_MAP
+	bool
+	default n
+
 config MMCONF_BASE_ADDRESS
 	hex "PCI MMIO Base Address"
 	default 0xe0000000
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 0af3f36..4b0b31d 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -12,15 +12,17 @@ bootblock-y += cpu.c
 bootblock-y += gpio.c
 bootblock-y += bootblock/cache_as_ram.S
 bootblock-y += bootblock/early_chipset_config.S
-bootblock-y += uart_early.c
 bootblock-y += mmap_boot.c
+bootblock-y += uart_early.c
 
 romstage-y += cpu.c
 romstage-y += gpio.c
+romstage-y += mmap_boot.c
 romstage-y += uart_early.c
 
 ramstage-y += cpu.c
 ramstage-y += gpio.c
+ramstage-y += mmap_boot.c
 ramstage-y += uart.c
 
 romstage-y += placeholders.c