3 files changed, 22 insertions, 18 deletions
diff --git a/src/mainboard/google/gale/bootblock.c b/src/mainboard/google/gale/bootblock.c
index 8313501eff..63167cc620 100644
--- a/src/mainboard/google/gale/bootblock.c
+++ b/src/mainboard/google/gale/bootblock.c
@@ -40,8 +40,8 @@ void bootblock_mainboard_init(void)
 
 	setup_mmu(DRAM_NOT_INITIALIZED);
 
-	if (((uintptr_t)maskrom_param < (uintptr_t)&_sram) ||
-	    ((uintptr_t)maskrom_param > (uintptr_t)&_esram)) {
+	if (((uintptr_t)maskrom_param < (uintptr_t)&_wifi_imem_0) ||
+	    ((uintptr_t)maskrom_param > (uintptr_t)&_ewifi_imem_0)) {
 		printk(BIOS_INFO, "No uber-sbl parameter detected\n");
 		return;
 	}
diff --git a/src/mainboard/google/gale/mmu.c b/src/mainboard/google/gale/mmu.c
index 4d2e9a0123..65797e7463 100644
--- a/src/mainboard/google/gale/mmu.c
+++ b/src/mainboard/google/gale/mmu.c
@@ -14,15 +14,14 @@
 #include <symbols.h>
 #include "mmu.h"
 
-/* convenient shorthand (in MB) */
-#define RPM_START           ((uintptr_t)_rpm / KiB)
-#define RPM_END             ((uintptr_t)_erpm / KiB)
-#define RPM_SIZE            (RPM_END - RPM_START)
-#define SRAM_START          ((uintptr_t)_sram / KiB)
-#define SRAM_END            ((uintptr_t)_esram / KiB)
-#define DRAM_START          ((uintptr_t)_dram / MiB)
-#define DRAM_SIZE           (CONFIG_DRAM_SIZE_MB)
-#define DRAM_END            (DRAM_START + DRAM_SIZE)
+#define WIFI_IMEM_0_START	((uintptr_t)_wifi_imem_0 / KiB)
+#define WIFI_IMEM_0_END		((uintptr_t)_ewifi_imem_0 / KiB)
+#define WIFI_IMEM_1_START	((uintptr_t)_wifi_imem_1 / KiB)
+#define WIFI_IMEM_1_END		((uintptr_t)_ewifi_imem_1 / KiB)
+
+#define DRAM_START		((uintptr_t)_dram / MiB)
+#define DRAM_SIZE		(CONFIG_DRAM_SIZE_MB)
+#define DRAM_END		(DRAM_START + DRAM_SIZE)
 
 /* DMA memory for drivers */
 #define DMA_START            ((uintptr_t)_dma_coherent / MiB)
@@ -45,14 +44,19 @@ void setup_mmu(enum dram_state dram)
 {
 	dcache_mmu_disable();
 
+	mmu_init();
+
 	/* start with mapping everything as strongly ordered. */
 	mmu_config_range(0, 4096, DCACHE_OFF);
 
 	/* Map Device memory. */
-	mmu_config_range_kb(RPM_START, RPM_SIZE, DCACHE_OFF);
+	mmu_config_range_kb(WIFI_IMEM_0_START,
+				WIFI_IMEM_0_END - WIFI_IMEM_0_START,
+				DCACHE_WRITEBACK);
 
-	mmu_config_range_kb(SRAM_START, SRAM_END - SRAM_START,
-		DCACHE_WRITEBACK);
+	mmu_config_range_kb(WIFI_IMEM_1_START,
+				WIFI_IMEM_1_END - WIFI_IMEM_1_START,
+				DCACHE_WRITEBACK);
 
 	/* Map DRAM memory */
 	setup_dram_mappings(dram);
@@ -62,7 +66,5 @@ void setup_mmu(enum dram_state dram)
 	/* disable Page 0 for trapping NULL pointer references. */
 	mmu_disable_range_kb(0, 1);
 
-	mmu_init();
-
 	dcache_mmu_enable();
 }
diff --git a/src/mainboard/google/gale/mmu.h b/src/mainboard/google/gale/mmu.h
index 956553d2c3..e3347c8c2f 100644
--- a/src/mainboard/google/gale/mmu.h
+++ b/src/mainboard/google/gale/mmu.h
@@ -12,8 +12,10 @@
 
 #include <types.h>
 
-extern u8 _rpm[];
-extern u8 _erpm[];
+extern u8 _wifi_imem_0[];	/* Linker script supplied */
+extern u8 _ewifi_imem_0[];
+extern u8 _wifi_imem_1[];
+extern u8 _ewifi_imem_1[];
 
 enum dram_state {
 	DRAM_INITIALIZED = 0,