diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index c54b65251c..a53984e4a3 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -87,6 +87,7 @@ postcar-$(CONFIG_STONEYRIDGE_UART) += uart.c
 postcar-y += ramtop.c
 postcar-y += sb_util.c
 postcar-y += nb_util.c
+postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += i2c.c
 
 ramstage-y += BiosCallOuts.c
 ramstage-y += i2c.c
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 6168f86449..19ebe7c55b 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -75,6 +75,7 @@ postcar-y += i2c.c
 postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += heci.c
 postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += reset.c
 postcar-$(CONFIG_UART_DEBUG) += uart.c
+postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += gspi.c
 
 verstage-y += car.c
 verstage-y += i2c.c
diff --git a/src/soc/nvidia/tegra210/include/soc/memlayout.ld b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
index c1c581bf71..d807c06599 100644
--- a/src/soc/nvidia/tegra210/include/soc/memlayout.ld
+++ b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
@@ -28,18 +28,18 @@
 SECTIONS
 {
 	SRAM_START(0x40000000)
-	PRERAM_CBMEM_CONSOLE(0x40000000, 8K)
-	PRERAM_CBFS_CACHE(0x40002000, 36K)
-	VBOOT2_WORK(0x4000B000, 12K)
+	PRERAM_CBMEM_CONSOLE(0x40000000, 4K)
+	PRERAM_CBFS_CACHE(0x40001000, 36K)
+	VBOOT2_WORK(0x4000A000, 12K)
 #if ENV_ARM64
-	STACK(0x4000E000, 3K)
+	STACK(0x4000D000, 3K)
 #else	/* AVP gets a separate stack to avoid any chance of handoff races. */
-	STACK(0x4000EC00, 3K)
+	STACK(0x4000DC00, 3K)
 #endif
-	TIMESTAMP(0x4000F800, 2K)
-	BOOTBLOCK(0x40010000, 28K)
-	VERSTAGE(0x40017000, 64K)
-	ROMSTAGE(0x40027000, 100K)
+	TIMESTAMP(0x4000E800, 2K)
+	BOOTBLOCK(0x4000F000, 28K)
+	VERSTAGE(0x40016000, 64K)
+	ROMSTAGE(0x40026000, 104K)
 	SRAM_END(0x40040000)
 
 	DRAM_START(0x80000000)
diff --git a/src/soc/rockchip/rk3288/include/soc/memlayout.ld b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
index fc3758b1fa..6320fadcba 100644
--- a/src/soc/rockchip/rk3288/include/soc/memlayout.ld
+++ b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
@@ -31,9 +31,9 @@ SECTIONS
 	SRAM_START(0xFF700000)
 	TTB(0xFF700000, 16K)
 	BOOTBLOCK(0xFF704004, 20K - 4)
-	PRERAM_CBMEM_CONSOLE(0xFF709000, 3K)
-	VBOOT2_WORK(0xFF709C00, 12K)
-	OVERLAP_VERSTAGE_ROMSTAGE(0xFF70CC00, 41K)
+	PRERAM_CBMEM_CONSOLE(0xFF709000, 2K)
+	VBOOT2_WORK(0xFF709800, 12K)
+	OVERLAP_VERSTAGE_ROMSTAGE(0xFF70C800, 42K)
 	PRERAM_CBFS_CACHE(0xFF717000, 1K)
 	TIMESTAMP(0xFF717400, 0x180)
 	STACK(0xFF717580, 3K - 0x180)