diff --git a/src/soc/nvidia/tegra210/include/soc/memlayout.ld b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
index 5d7481b7bb..6d74ab928f 100644
--- a/src/soc/nvidia/tegra210/include/soc/memlayout.ld
+++ b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
@@ -29,17 +29,17 @@ SECTIONS
 {
 	SRAM_START(0x40000000)
 	PRERAM_CBMEM_CONSOLE(0x40000000, 2K)
-	PRERAM_CBFS_CACHE(0x40000800, 32K)
-	VBOOT2_WORK(0x40008800, 12K)
-	VBOOT2_TPM_LOG(0x4000B800, 2K)
+	PRERAM_CBFS_CACHE(0x40000800, 30K)
+	VBOOT2_WORK(0x40008000, 12K)
+	VBOOT2_TPM_LOG(0x4000B000, 2K)
 #if ENV_ARM64
-	STACK(0x4000C000, 3K)
+	STACK(0x4000B800, 3K)
 #else	/* AVP gets a separate stack to avoid any chance of handoff races. */
-	STACK(0x4000CC00, 3K)
+	STACK(0x4000C400, 3K)
 #endif
-	TIMESTAMP(0x4000D800, 2K)
-	BOOTBLOCK(0x4000E000, 30K)
-	VERSTAGE(0x40015800, 66K)
+	TIMESTAMP(0x4000D000, 2K)
+	BOOTBLOCK(0x4000D800, 30K)
+	VERSTAGE(0x40015000, 68k)
 	ROMSTAGE(0x40026000, 104K)
 	SRAM_END(0x40040000)